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

30977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andy Wilkinson
e6130c6ce0 Upgrade to Spring Integration 5.3.7.RELEASE 
Closes gh-26112
 2021-04-14 17:24:22 +01:00
Stephane Nicoll
401ebc672b Merge branch '2.3.x' into 2.4.x 
Closes gh-26110
 2021-04-14 15:43:57 +02:00
Stephane Nicoll
ab785d9417 Document limitations of using deferred JPA bootstrap 
Closes gh-24027
 2021-04-14 15:38:34 +02:00
Stephane Nicoll
0d81b4d07e Merge branch '2.3.x' into 2.4.x 
Closes gh-26108
 2021-04-14 15:04:28 +02:00
Stephane Nicoll
0fb482579b Harmonize Neo4jContainer startup options 
Closes gh-26084
 2021-04-14 14:50:04 +02:00
Stephane Nicoll
0cedbf6e06 Upgrade to Spring Data 2020.0.8 
Closes gh-25910
 2021-04-14 13:37:24 +02:00
Stephane Nicoll
ec0ade6322 Merge branch '2.3.x' into 2.4.x 2021-04-14 13:36:50 +02:00
Stephane Nicoll
1de2dd9ecb Upgrade to Spring Data Neumann-SR9 
Closes gh-25905
 2021-04-14 13:31:16 +02:00
Stephane Nicoll
62a70475c2 Fix class condition on deprecated class 
Closes gh-26107
 2021-04-14 13:30:20 +02:00
Stephane Nicoll
6a1f6ad6bb Merge pull request #26085 from rehevkor5 
* pr/26085:
  Polish "Document spring.config.additional-location should be used early"
  Document spring.config.additional-location should be used early

Closes gh-26085
 2021-04-14 10:06:31 +02:00
Stephane Nicoll
1855f96d07 Polish "Document spring.config.additional-location should be used early" 
See gh-26085
 2021-04-14 10:06:06 +02:00
Shannon Carey
b0b1c04fc4 Document spring.config.additional-location should be used early 
See gh-26085
 2021-04-14 10:03:56 +02:00
Stephane Nicoll
8b7c512974 Merge branch '2.3.x' into 2.4.x 2021-04-14 09:08:00 +02:00
Stephane Nicoll
90fccd7097 Upgrade to SAAJ Impl 1.5.3 
Closes gh-26104
 2021-04-14 08:47:27 +02:00
Stephane Nicoll
54d23bac9d Upgrade to Micrometer 1.6.6 
Closes gh-26103
 2021-04-14 08:47:26 +02:00
Stephane Nicoll
3a8736a112 Upgrade to Lettuce 6.0.4.RELEASE 
Closes gh-26102
 2021-04-14 08:47:25 +02:00
Stephane Nicoll
0429ab4b88 Upgrade to HSQLDB 2.5.2 
Closes gh-26101
 2021-04-14 08:47:24 +02:00
Stephane Nicoll
00b53b5bdb Upgrade to Glassfish JAXB 2.3.4 
Closes gh-26100
 2021-04-14 08:47:22 +02:00
Stephane Nicoll
cb2a7dd4cb Upgrade to SAAJ Impl 1.5.3 
Closes gh-26099
 2021-04-14 08:28:19 +02:00
Stephane Nicoll
cb1d7a3bc8 Upgrade to Micrometer 1.5.13 
Closes gh-26098
 2021-04-14 08:28:18 +02:00