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
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
cb3a41c4db
Merge branch '2.5.x'
...
Closes gh-27064
2021-06-23 21:36:28 -07: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
6b241d04c0
Merge branch '2.5.x'
...
Closes gh-27063
2021-06-23 21:13:18 -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
6102f10639
Merge branch '2.5.x'
2021-06-23 21:02:36 -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
b141fcf51d
Merge branch '2.5.x'
...
Closes gh-27061
2021-06-23 21:01:05 -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
1e585f1152
Merge branch '2.5.x'
...
Closes gh-27052
2021-06-23 17:54:59 -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
fe95c2a80c
Merge branch '2.5.x'
...
Closes gh-27059
2021-06-23 17:47:19 -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