Commit Graph

33172 Commits

Author SHA1 Message Date
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
Stephane Nicoll
0e4a6a4606 Merge branch '2.5.x' 2021-06-23 08:39:59 +02:00
Stephane Nicoll
7b3eb1dece Merge branch '2.4.x' into 2.5.x 2021-06-23 08:39:49 +02:00
Stephane Nicoll
f89675a3f1 Upgrade to Neo4j Java Driver 4.2.7
Closes gh-27037
2021-06-23 08:22:15 +02:00
Stephane Nicoll
1a9e3bcbd6 Upgrade to Lettuce 6.1.3.RELEASE
Closes gh-27036
2021-06-23 08:22:14 +02:00
Stephane Nicoll
763870bd45 Upgrade to Dropwizard Metrics 4.1.24
Closes gh-27035
2021-06-23 08:22:12 +02:00
Stephane Nicoll
fb1cd82061 Upgrade to OAuth2 OIDC SDK 8.36.2
Closes gh-27034
2021-06-23 07:58:19 +02:00
Stephane Nicoll
ded6b26ea5 Upgrade to Neo4j Java Driver 4.1.4
Closes gh-27033
2021-06-23 07:58:18 +02:00
Stephane Nicoll
6db9fe2e36 Upgrade to Lettuce 6.0.6.RELEASE
Closes gh-27032
2021-06-23 07:58:17 +02:00
Stephane Nicoll
9bc1c4dff2 Upgrade to Dropwizard Metrics 4.1.24
Closes gh-27031
2021-06-23 07:58:16 +02:00
Stephane Nicoll
92ea90af45 Merge branch '2.5.x' 2021-06-22 19:23:09 +02:00
Stephane Nicoll
9281dcf751 Upgrade to Spring Data 2021.0.2
Closes gh-26970
2021-06-22 19:22:51 +02:00
Stephane Nicoll
47a9a94376 Upgrade to Spring HATEOAS 1.3.2
Closes gh-26969
2021-06-22 19:22:28 +02:00
Stephane Nicoll
cd8493a9c4 Merge branch '2.4.x' into 2.5.x 2021-06-22 19:22:00 +02:00
Stephane Nicoll
7e09c1d8dc Upgrade to Spring Data 2020.0.10
Closes gh-26963
2021-06-22 19:21:42 +02:00
Stephane Nicoll
58320c6af9 Upgrade to Spring HATEOAS 1.2.7
Closes gh-27013
2021-06-22 19:21:12 +02:00
Stephane Nicoll
f244bec53d Merge branch '2.5.x' 2021-06-22 14:54:40 +02:00
Stephane Nicoll
c309f3428c Upgrade to Reactor 2020.0.8
Closes gh-27027
2021-06-22 14:54:30 +02:00
Stephane Nicoll
cf3413e443 Merge branch '2.4.x' into 2.5.x 2021-06-22 14:54:13 +02:00
Stephane Nicoll
7ca9794f3c Upgrade to Reactor 2020.0.8
Closes gh-26968
2021-06-22 14:53:10 +02:00
Stephane Nicoll
c21099b142 Upgrade to Reactor 2020.0.8
Closes gh-26962
2021-06-22 14:52:39 +02:00
Andy Wilkinson
4290193a65 Merge branch '2.5.x'
Closes gh-27025
2021-06-22 13:20:11 +01:00