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
Andy Wilkinson
4d694ddaa8
Fix bom plugin management versions
...
See gh-27044
2021-06-23 19:50:06 +01:00
Brian Clozel
7d720a63a5
Merge branch '2.5.x'
...
Closes gh-27050
2021-06-23 19:39:03 +02:00
Brian Clozel
bf17f50a1f
Align NettyProperties with Netty's defaults
...
Prior to this commit, `NettyProperties` would use `DISABLED` as the
default level for leak detection in Netty. This is not the default value
enforced by Netty, which is `SIMPLE`.
This commit changes the default configuration property value and ensures
that both stay in sync.
Fixes gh-27046
2021-06-23 19:36:40 +02:00
Andy Wilkinson
27daf0f035
Merge branch '2.5.x'
2021-06-23 18:07:46 +01:00
Andy Wilkinson
01f8cb7639
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27048
2021-06-23 18:07:33 +01:00
Andy Wilkinson
3746155916
Align Nimbus dependency versions with Spring Security
...
Closes gh-26820
2021-06-23 17:53:09 +01:00
Andy Wilkinson
5d6a612b4b
Merge branch '2.5.x'
...
Closes gh-27047
2021-06-23 17:39:06 +01:00
Andy Wilkinson
ec2a7b9a5b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27045
2021-06-23 17:10:50 +01:00
Andy Wilkinson
363de4cfa5
Add dependency lock and constraint version alignment to Bomr
...
Closes gh-27044
2021-06-23 17:09:24 +01:00
Stephane Nicoll
55d31f5fbf
Merge branch '2.5.x'
2021-06-23 17:50:55 +02:00
Stephane Nicoll
198c9873ac
Merge branch '2.4.x' into 2.5.x
2021-06-23 17:50:46 +02:00
Stephane Nicoll
e0e64e69c0
Upgrade to Micrometer 1.7.1
...
Closes gh-27015
2021-06-23 17:45:25 +02:00
Stephane Nicoll
d0f12392ab
Upgrade to Micrometer 1.6.8
...
Closes gh-27014
2021-06-23 17:41:25 +02:00
Stephane Nicoll
26b9b3e94d
Merge branch '2.5.x'
2021-06-23 15:58:39 +02:00
Stephane Nicoll
8e5ac1921f
Merge branch '2.4.x' into 2.5.x
2021-06-23 15:58:22 +02:00
Stephane Nicoll
6c2fc8471a
Upgrade to Spring Session 2021.0.1
...
Closes gh-26971
2021-06-23 15:56:28 +02:00
Stephane Nicoll
fb2ed6076f
Upgrade to Spring Session 2020.0.5
...
Closes gh-26964
2021-06-23 15:55:57 +02:00
Stephane Nicoll
07c9418b85
Merge branch '2.5.x'
2021-06-23 10:57:12 +02:00
Stephane Nicoll
254a29f9be
Upgrade to Nimbus JOSE JWT 9.10
...
Closes gh-27039
2021-06-23 10:40:06 +02:00
Stephane Nicoll
4a28e21047
Upgrade to OAuth2 OIDC SDK 9.9
...
Closes gh-27038
2021-06-23 10:39:48 +02:00