Commit Graph

50613 Commits

Author SHA1 Message Date
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
fengyuanwei
b91c66b823 Fix typo in ConfigDataPropertiesTests
See gh-27017
2021-06-23 17:38:46 -07:00
Phillip Webb
e85b0c7012 Merge branch '2.5.x' 2021-06-23 17:29:41 -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
Phillip Webb
5fc0e1ca81 Merge branch '2.5.x'
Closes gh-27057
2021-06-23 17:23:25 -07:00
Phillip Webb
af37f59136 Merge branch '2.4.x' into 2.5.x
Closes gh-27056
2021-06-23 17:13:13 -07:00
Madhura Bhave
b790c82732 Apply exclusions to existing war entries
Update `RepackageMojo` and supporting classes so that `exclusions`
on the repackage goal apply to both the contributed libraries and any
existing jar entries already contained in the original war.

Prior to this commit, exclusions would apply to contributed jars (for
example, those in `WEB-INF/lib-provided`) but not jars that were
packaged directly into `WEB-INF/lib` by the war plugin

Fixes gh-15808

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-06-23 15:08:31 -07:00
Andy Wilkinson
aa3d72cb05 Merge branch '2.5.x'
See gh-27047
2021-06-23 19:52:04 +01:00
Andy Wilkinson
5139c79c4f Merge branch '2.4.x' into 2.5.x
See gh-27045
2021-06-23 19:51:40 +01:00