Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,997 Commits 23 Branches 0 Tags
df2f6a4b39fb89f6584f1093c1e084d11927f2ff
Commit Graph

30997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
df2f6a4b39 Upgrade Java 11 version in CI image 
Closes gh-26194
 2021-04-22 11:09:34 +02:00
Stephane Nicoll
4c6aece927 Upgrade Java 8 version in CI image 
Closes gh-26195
 2021-04-22 11:09:04 +02:00
Stephane Nicoll
db7460ddd5 Polish contribution based on Andy's review 
See gh-26188
 2021-04-21 17:23:21 +02:00
Stephane Nicoll
b1170efd3b Merge pull request #26188 from izeye 
* pr/26188:
  Polish

Closes gh-26188
 2021-04-21 17:18:53 +02:00
izeye
4be48d0d50 Polish 
See gh-26188
 2021-04-21 15:20:06 +02:00
Stephane Nicoll
8edeb2c7a9 Merge branch '2.3.x' into 2.4.x 
Closes gh-26185
 2021-04-21 10:03:32 +02:00
Stephane Nicoll
856e0d0535 Document that MeterFilters are only applied to a managed registry 
Closes gh-25610
 2021-04-21 10:02:57 +02:00
Stephane Nicoll
6fc803c5a2 Merge branch '2.3.x' into 2.4.x 
Closes gh-26181
 2021-04-20 17:58:14 +02:00
Stephane Nicoll
6f73fd6785 Upgrade to Testcontainers 1.15.3 
Closes gh-26179
 2021-04-20 17:05:58 +02:00
Andy Wilkinson
289ede6541 Merge branch '2.3.x' into 2.4.x 
Closes gh-26177
 2021-04-20 15:52:26 +01:00
Andy Wilkinson
2dce3abe84 Use main branch when working with Homebrew tap's git repo 
Closes gh-26173
 2021-04-20 15:51:06 +01:00
Andy Wilkinson
be99f386a8 Merge branch '2.3.x' into 2.4.x 
Closes gh-26175
 2021-04-20 15:47:38 +01:00
Andy Wilkinson
9e5f738f7a Make relative file references in checkstyle.xml more robust 
Closes gh-26174
 2021-04-20 15:47:08 +01:00
Stephane Nicoll
7cbae821b7 Merge branch '2.3.x' into 2.4.x 
Closes gh-26171
 2021-04-20 15:12:29 +02:00
Stephane Nicoll
823840dd21 Merge pull request #26167 from k163377 
* pr/26167:
  Use new update site for Spring Java Format's Eclipse plugin

Closes gh-26167
 2021-04-20 15:12:15 +02:00
wrongwrong
6ee72ff489 Use new update site for Spring Java Format's Eclipse plugin 
See gh-26167
 2021-04-20 15:11:03 +02:00
Andy Wilkinson
bc1a462143 Merge branch '2.3.x' into 2.4.x 
Closes gh-26168
 2021-04-20 11:19:10 +01:00
Andy Wilkinson
82198a99e0 Polish nohttp configuration 
Closes gh-26166
 2021-04-20 11:15:13 +01:00
Stephane Nicoll
52543b84c1 Fix sourceType for spring.profiles.include 
Closes gh-26163
 2021-04-20 10:23:42 +02:00
Stephane Nicoll
2bd4ccce8a Document spring.profiles.group in configuration metadata 
Closes gh-26127
 2021-04-20 10:22:43 +02:00
Stephane Nicoll
6bbd36c77a Merge branch '2.3.x' into 2.4.x 
Closes gh-26159
 2021-04-19 17:01:28 +02:00
Stephane Nicoll
57c199d4d1 Merge pull request #14928 from nicce 
* pr/14928:
  Polish "Enhance multiple entity manager factories how-to"
  Enhance multiple entity manager factories how-to

Closes gh-14928
 2021-04-19 17:01:09 +02:00
Stephane Nicoll
03b65f3260 Polish "Enhance multiple entity manager factories how-to" 
See gh-14928
 2021-04-19 16:59:31 +02:00
Niclas Fredriksson
0d9db46f68 Enhance multiple entity manager factories how-to 
See gh-14928
 2021-04-19 16:53:50 +02:00
Stephane Nicoll
54613c77d4 Exclude beans with scheduled methods from global lazy init 
This commit updates TaskSchedulingAutoConfiguration to contribute a
LazyInitializationExcludeFilter that processes beans that have
@Scheduled methods. This lets them be contributed to the context so
that scheduled methods are invoked as expected.

Closes gh-25315
 2021-04-19 14:04:03 +02:00
Andy Wilkinson
aa9d0bc421 Merge pull request #26149 from vsriram92 
* gh-26194:
  Polish "Use ConfigDataLocationResolvers' class loader to load resolver names"
  Use ConfigDataLocationResolvers' class loader to load resolver names

Closes gh-26149
 2021-04-19 10:23:41 +01:00
Andy Wilkinson
0c30a5930d Polish "Use ConfigDataLocationResolvers' class loader to load resolver names" 
See gh-26149
 2021-04-19 10:23:27 +01:00
Sriram
4268f8da84 Use ConfigDataLocationResolvers' class loader to load resolver names 
See gh-26149
 2021-04-19 10:06:07 +01:00
Stephane Nicoll
d3ca939aa8 Merge branch '2.3.x' into 2.4.x 2021-04-16 09:51:30 +02:00
Stephane Nicoll
a1a2f00b65 Upgrade CI to Docker 20.10.6 
Closes gh-26118
 2021-04-16 09:51:14 +02:00
Stephane Nicoll
23cd375e52 Upgrade CI to Docker 20.10.6 
Closes gh-26119
 2021-04-16 09:51:04 +02:00
Phillip Webb
302d500ee9 Add StandardConfigDataResource.getProfile method 
Add a `StandardConfigDataResource.getProfile()` method so that it's
possible to tell the profile used when reading a profile specific
resource.

Fixes gh-25940
 2021-04-15 12:01:34 -07:00
Spring Buildmaster
270bf0f937 Next development version (v2.4.6-SNAPSHOT) 2021-04-15 11:48:25 +00:00
Andy Wilkinson
c48a48f0a2 Merge branch '2.3.x' into 2.4.x 2021-04-15 11:48:12 +01:00
Spring Buildmaster
dea62c1734 Next development version (v2.3.11.BUILD-SNAPSHOT) 2021-04-15 09:52:11 +00:00
Andy Wilkinson
01fb599f6e Revert "Attempt to overcome Docker rate limiting on CI" 
This reverts commit 51d57e19d0.

See gh-25838
 2021-04-15 10:13:50 +01:00
Andy Wilkinson
bfe8e5ac19 Revert changes to make staging run Docker 
See gh-26130
 2021-04-15 10:11:43 +01:00
Andy Wilkinson
6073cf7063 Marking staging tasks as privileged so they can start Docker 
See gh-26130
 2021-04-15 09:30:14 +01:00
Andy Wilkinson
f74123038a Start Docker before running a staging build 
Closes gh-26130
 2021-04-15 09:09:15 +01:00
Stephane Nicoll
f814beacec Upgrade to Spring Session Dragonfruit-SR3 
Closes gh-25907
 2021-04-15 09:05:10 +02:00
Stephane Nicoll
1de185caa4 Merge branch '2.3.x' into 2.4.x 2021-04-15 09:04:48 +02:00
Stephane Nicoll
e8eb68a458 Upgrade to Spring Session Dragonfruit-SR3 
Closes gh-25907
 2021-04-15 09:01:55 +02:00
Phillip Webb
5b836f3aee Merge branch '2.3.x' into 2.4.x 
Closes gh-26124
 2021-04-14 17:42:38 -07:00
Phillip Webb
930c637b77 Merge pull request #25455 from nguyensach 
* pr/25455:
  Polish 'Don't detect CloudPlatform when property is set'
  Don't detect CloudPlatform when property is set

Closes gh-25455
 2021-04-14 17:41:03 -07:00
Phillip Webb
61ff3c98bf Polish 'Don't detect CloudPlatform when property is set' 
See gh-25455
 2021-04-14 17:29:30 -07:00
nguyensach
70f44d3a56 Don't detect CloudPlatform when property is set 
Update `CloudPlatform.isActive` to back-off from detection when any
`spring.main.cloud-platform` property is set.

See gh-25455
 2021-04-14 17:24:37 -07:00
Phillip Webb
fb3796dae8 Merge branch '2.3.x' into 2.4.x 
Closes gh-26121
 2021-04-14 15:02:58 -07:00
Phillip Webb
fcb2210a87 Include optional shade plugin in published pom 
Update `MavenPublishingConventions` to add a new `mavenOptional` feature
that allows us to declare optional dependencies that are also published
in the generated POM.

This change allows us to include the maven-shade-plugin in the
spring-boot-maven-plugin POM which fixes an issue with Eclipse m2e.

Fixes gh-21992
 2021-04-14 15:02:42 -07:00
Andy Wilkinson
1f0127036c Upgrade to Spring Integration 5.4.6 
Closes gh-26113
 2021-04-14 17:26:54 +01:00
Andy Wilkinson
bcbb1a4346 Merge branch '2.3.x' into 2.4.x 2021-04-14 17:25:53 +01:00