root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
33,247 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

33247 Commits

Author SHA1 Message Date
Phillip Webb 0c99bc874e Merge branch '2.4.x' into 2.5.x 
Closes gh-27096
 2021-06-24 18:50:22 -07:00
Phillip Webb 618c1e42e2 Merge branch '2.3.x' into 2.4.x 
Closes gh-27095
 2021-06-24 18:49:56 -07:00
Phillip Webb 7b14d5bb08 Protect against NPE in isAlreadyPromoted 
Fixes gh-27094
 2021-06-24 18:48:22 -07:00
Spring Buildmaster 6f453e3fbe Next development version (v2.5.3-SNAPSHOT) 2021-06-24 22:58:04 +00:00
Phillip Webb d00db60bab Merge branch '2.5.x' 2021-06-24 14:06:25 -07:00
Phillip Webb dfbd82b838 Fix Kotlin 1.5.20 classpath issues 
See gh-27086
 2021-06-24 14:05:36 -07:00
Phillip Webb 716e8ab717 Merge branch '2.5.x' 2021-06-24 11:31:33 -07:00
Phillip Webb d44207161f Suppress Kotlin 1.5.20 deprecation warning 
See gh-27086
 2021-06-24 11:30:58 -07:00
Phillip Webb 674b9fb8fb Merge branch '2.5.x' 
Closes gh-27088
 2021-06-24 10:45:25 -07:00
Phillip Webb 8f9652c011 Upgrade to Kotlin 1.5.20 
Closes gh-27086
 2021-06-24 10:43:22 -07:00
Madhura Bhave e67609959b Merge branch '2.5.x' into main 2021-06-24 09:53:26 -07:00
Madhura Bhave b4346f0dda Merge branch '2.4.x' into 2.5.x 2021-06-24 09:53:03 -07:00
Madhura Bhave fb008a4b71 Merge branch '2.3.x' into 2.4.x 2021-06-24 09:52:44 -07:00
Madhura Bhave 82963a39be Fix typo 2021-06-24 09:52:26 -07:00
Andy Wilkinson bd192238ef Merge branch '2.5.x' 
Closes gh-27083
 2021-06-24 17:02:48 +01:00
Andy Wilkinson c150a9124a Merge branch '2.4.x' into 2.5.x 
Closes gh-27082
 2021-06-24 17:02:31 +01:00
Andy Wilkinson 2ea836752e Merge branch '2.3.x' into 2.4.x 
Closes gh-27081
 2021-06-24 17:02:14 +01:00
Andy Wilkinson 7617f0df60 Do not publish to Sonatype when already published 
Closes gh-27080
 2021-06-24 17:01:06 +01:00
Andy Wilkinson 8b9991fcc7 Merge branch '2.5.x' 
Closes gh-27076
 2021-06-24 14:07:17 +01:00
Andy Wilkinson 5a9fa3c8f1 Only close context that is active 
Previously, SpringApplicationShutdownHook would call close() on any
registered application context even if it wasn't active as it had
already been closed. This could lead to deadlock if the context was
closed and System.exit was called during application context refresh.

This commit updates SpringApplicationShutdownHook so that it only
calls close() on active contexts. This prevents deadlock as it avoids
trying to sychronize on the context's startupShutdownMonitor on
the shutdown hook thread while it's still held on the main thread
which called System.exit and is waiting for all of the shutdown hooks
to complete.

Fixes gh-27049
 2021-06-24 14:07:02 +01:00
Andy Wilkinson 0c01a08bba Merge branch '2.5.x' 2021-06-24 14:06:50 +01:00
Andy Wilkinson 05b041bc86 Merge branch '2.4.x' into 2.5.x 2021-06-24 14:06:35 +01:00
Spring Buildmaster 99a840937b Next development version (v2.4.9-SNAPSHOT) 2021-06-24 11:23:49 +00:00
Andy Wilkinson d56ddb0f60 Merge branch '2.5.x' 
See gh-27050
 2021-06-24 11:21:30 +01:00
Andy Wilkinson 4572ae5430 Use reflection to extract Netty's default level 
See gh-27046
 2021-06-24 11:20:56 +01:00
Andy Wilkinson fcf7240f3c Merge branch '2.5.x' 
See gh-27047
 2021-06-24 10:03:44 +01:00
Andy Wilkinson f7140d0401 Merge branch '2.4.x' into 2.5.x 
See gh-27045
 2021-06-24 10:03:17 +01:00
Andy Wilkinson 316d2cce89 Don't offer upgrade for version that is already aligned 
See gh-27044
 2021-06-24 10:02:14 +01:00
Andy Wilkinson 9b91c18163 Merge branch '2.5.x' 
See gh-27073
 2021-06-24 09:53:20 +01:00
Andy Wilkinson e2d68aa8b2 Merge branch '2.4.x' into 2.5.x 
See gh-27072
 2021-06-24 09:53:04 +01:00
Andy Wilkinson a7872f47da Minimize Instantiator's public API 
See gh-27043
 2021-06-24 09:27:08 +01:00
Phillip Webb 6686a49b1f Merge branch '2.5.x' 
Closes gh-27074
 2021-06-24 00:04:44 -07:00
Phillip Webb b093db104c Pass ResourceLoader.getClassLoader() to Instantiator 
Update calls to `Instantiator` to that they also include
`ResourceLoader.getClassLoader()`.

Closes gh-27071
 2021-06-24 00:03:16 -07:00
Phillip Webb fe34bcdd52 Merge branch '2.5.x' 
Closes gh-27073
 2021-06-23 23:33:18 -07:00
Phillip Webb 641dfbdf98 Merge branch '2.4.x' into 2.5.x 
Fixes gh-27072
 2021-06-23 23:32:50 -07:00
Phillip Webb 5088927f80 Pass ClassLoader to Instantiator 
Update `Instantiator` so that it can accept a `ClassLoader` when
creating instances and rework `EnvironmentPostProcessorsFactory` to
use the new methods.

Prior to this commit we would use the `ClassLoader` to get the class
names from `SpringFactories` but not when actually creating the
instances.

Fixes gh-27043
 2021-06-23 23:30:53 -07:00
Stephane Nicoll 7d8e7468bf Merge branch '2.5.x' 
See gh-27065
 2021-06-24 08:22:02 +02:00
Stephane Nicoll d079db1dce Polish 
See gh-26978
 2021-06-24 08:20:11 +02:00
Stephane Nicoll 0ca259abba Merge branch '2.5.x' 2021-06-24 08:17:41 +02:00
Stephane Nicoll 2dc5bc482b Merge branch '2.4.x' into 2.5.x 2021-06-24 08:17:27 +02:00
Stephane Nicoll 57f5030397 Upgrade to Netty tcNative 2.0.40.Final 
Closes gh-27070
 2021-06-24 07:49:33 +02:00
Stephane Nicoll 43f6393e9a Upgrade to Hazelcast 4.1.4 
Closes gh-27069
 2021-06-24 07:49:32 +02:00
Stephane Nicoll 6889d2adda Upgrade to Nimbus JOSE JWT 8.22 
Closes gh-27068
 2021-06-24 07:27:08 +02:00
Stephane Nicoll d4039648c7 Upgrade to OAuth2 OIDC SDK 8.36.2 
Closes gh-27067
 2021-06-24 07:27:06 +02:00
Stephane Nicoll 1f53e93b8d Upgrade to Netty tcNative 2.0.40.Final 
Closes gh-27066
 2021-06-24 07:27:05 +02:00
Stephane Nicoll 8e6f3ab953 Merge branch '2.5.x' 
Closes gh-27065
 2021-06-24 07:20:22 +02:00
Stephane Nicoll d4fa46f1b9 Polish startup endpoint description in reference doc 
Closes gh-26978
 2021-06-24 07:19:58 +02:00
Stephane Nicoll 3dc605b98e Merge branch '2.5.x' 2021-06-24 07:01:07 +02:00
Stephane Nicoll 6f11d01506 Merge branch '2.4.x' into 2.5.x 2021-06-24 07:00:58 +02:00
Stephane Nicoll 32d6b52980 Upgrade to Spring Integration 5.5.1 
Closes gh-26974
 2021-06-24 06:40:59 +02:00