Commit Graph

32864 Commits

Author SHA1 Message Date
Phillip Webb
8f9652c011 Upgrade to Kotlin 1.5.20
Closes gh-27086
2021-06-24 10:43:22 -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
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
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
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
4572ae5430 Use reflection to extract Netty's default level
See gh-27046
2021-06-24 11:20:56 +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
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
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
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
d079db1dce Polish
See gh-26978
2021-06-24 08:20:11 +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
d4fa46f1b9 Polish startup endpoint description in reference doc
Closes gh-26978
2021-06-24 07:19:58 +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
Stephane Nicoll
dd63f98fcf Upgrade to Spring Kafka 2.7.3
Closes gh-26973
2021-06-24 06:40:34 +02:00
Stephane Nicoll
b5cdc84273 Upgrade to Spring AMQP 2.3.9
Closes gh-26972
2021-06-24 06:40:03 +02:00
Stephane Nicoll
006995fef7 Upgrade to Spring Integration 5.4.8
Closes gh-26967
2021-06-24 06:39:11 +02:00
Stephane Nicoll
6804ae849d Upgrade to Spring AMQP 2.3.9
Closes gh-26966
2021-06-24 06:38:42 +02:00
Phillip Webb
8d10e04ea3 Merge pull request #26930 from dreis2211
* pr/26930:
  Avoid illegal reflective access in CLI tests

Closes gh-26930
2021-06-23 21:36:12 -07:00
dreis2211
7a25e4edb8 Avoid illegal reflective access in CLI tests
See gh-26930
2021-06-23 21:34:54 -07:00
Phillip Webb
093e7f7e3b Merge branch '2.4.x' into 2.5.x
Closes gh-27062
2021-06-23 21:13:08 -07:00
Phillip Webb
1a7569056b Fix 'spring.datasource.name' property description
Closes gh-27026
2021-06-23 21:12:59 -07:00
Phillip Webb
2c518f1dff Merge branch '2.4.x' into 2.5.x 2021-06-23 21:02:05 -07:00
Phillip Webb
a76e5c043e Update copyright year of changed files 2021-06-23 21:01:45 -07:00
Phillip Webb
84fab65b9a Merge branch '2.4.x' into 2.5.x
Closes gh-27060
2021-06-23 21:00:46 -07:00
Phillip Webb
ea62967ef4 Improve "reason" message in BindFailureAnalyzer
Update `BindFailureAnalyzer` so that the "Reason" message includes
the root cause exception type and message.

Closes gh-27028
2021-06-23 20:54:01 -07:00
Phillip Webb
0e28e24123 Rethrow ConverterNotFoundException when possible
Update `BindConverter` to throw the first `ConversionFailedException`
rather than always throwing `ConverterNotFoundException`.

See gh-27028
2021-06-23 20:53:35 -07:00
Phillip Webb
e9d3e0d022 Merge branch '2.4.x' into 2.5.x
Closes gh-27053
2021-06-23 17:54:22 -07:00
Phillip Webb
9415678acd Merge branch '2.3.x' into 2.4.x
Closes gh-27055
2021-06-23 17:53:06 -07:00
Phillip Webb
0b2c86d122 Upgrade CI to Ubuntu Focal 20210609
Closes gh-27054
2021-06-23 17:52:06 -07:00
Phillip Webb
a77e116c03 Merge branch '2.4.x' into 2.5.x
Closes gh-27058
2021-06-23 17:47:08 -07:00
Phillip Webb
5cd48a11b7 Merge pull request #27017 from limo520
* pr/27017:
  Add additional ConfigDataProperties tests
  Fix typo in ConfigDataPropertiesTests

Closes gh-27017
2021-06-23 17:46:54 -07:00
Phillip Webb
93d316ddd1 Add additional ConfigDataProperties tests
Add more `isActive` tests to cover negative cases.

See gh-27017
2021-06-23 17:46:23 -07:00
fengyuanwei
b91c66b823 Fix typo in ConfigDataPropertiesTests
See gh-27017
2021-06-23 17:38:46 -07:00
Phillip Webb
fd83158fa5 Merge branch '2.4.x' into 2.5.x 2021-06-23 17:28:31 -07:00
Phillip Webb
63ed921554 Restore simple Library constructor
See gh-15808
2021-06-23 17:27:26 -07:00