Commit Graph

16008 Commits

Author SHA1 Message Date
Stephane Nicoll
527fca8bdb Revert change in toString
This commit reverts the change in test as it only applies to the
snapshot of Spring Framework.
2022-02-13 18:44:04 +01:00
Stephane Nicoll
686591bf24 Merge branch '2.7.x' 2022-02-13 18:16:03 +01:00
Stephane Nicoll
00279b6928 Merge branch '2.6.x' into 2.7.x 2022-02-13 18:15:57 +01:00
Stephane Nicoll
bd6cb5c915 Merge branch '2.5.x' into 2.6.x 2022-02-13 18:15:48 +01:00
Stephane Nicoll
1f01345057 Fix assertion due to toString change in Spring Framework 2022-02-13 18:01:00 +01:00
Scott Frederick
85ea6a1b8f Merge branch '2.7.x' into main 2022-02-11 15:31:33 -06:00
Scott Frederick
db6ef0e802 Exclude duplicate properties file when building a jar from jars
See gh-29670 and gh-23955
2022-02-11 15:31:20 -06:00
Scott Frederick
79e5d3a2d0 Merge branch '2.7.x' into main 2022-02-11 14:45:00 -06:00
Scott Frederick
f80490bafb Precompute Spring Boot version at build time
Closes gh-29670
2022-02-11 14:44:28 -06:00
Andy Wilkinson
2dcd5e12ce Merge branch '2.7.x' 2022-02-11 15:37:45 +00:00
Andy Wilkinson
76510fae48 Merge branch '2.6.x' into 2.7.x
Closes gh-29752
2022-02-11 15:37:32 +00:00
Andy Wilkinson
09f51f38d6 Update docs to reflect use of CamelCaseToUnderscoresNamingStrategy
Closes gh-29743
2022-02-11 15:37:10 +00:00
Andy Wilkinson
a41316d386 Merge branch '2.7.x' 2022-02-11 14:15:13 +00:00
Andy Wilkinson
197112e1bc Merge branch '2.6.x' into 2.7.x
Closes gh-29751
2022-02-11 14:14:59 +00:00
Andy Wilkinson
4b33ea733e Merge branch '2.5.x' into 2.6.x
Closes gh-29750
2022-02-11 14:14:43 +00:00
Andy Wilkinson
387795d4db Remove trailing space from media type for ots mapping
The regular expression in the new test is intended to match the
documented [1] ABNF for a media type:

    type-name = reg-name
    subtype-name = reg-name

    reg-name = 1*127reg-name-chars
    reg-name-chars = ALPHA / DIGIT / "!" /
                     "#" / "$" / "&" / "." /
                     "+" / "-" / "^" / "_"

Closes gh-29746

[1] https://datatracker.ietf.org/doc/html/rfc4288#section-4.2
2022-02-11 14:09:53 +00:00
Andy Wilkinson
68bdef2cd0 Merge branch '2.7.x' 2022-02-11 13:35:03 +00:00
Andy Wilkinson
da61545925 Merge branch '2.6.x' into 2.7.x
Closes gh-29749
2022-02-11 13:34:51 +00:00
Andy Wilkinson
646bb05c8d Merge branch '2.5.x' into 2.6.x
Closes gh-29748
2022-02-11 13:34:40 +00:00
Andy Wilkinson
c3eee4ad68 Align Gradle's plugin's META-INF repackaging with Maven plugin's
Closes gh-28562
2022-02-11 13:32:52 +00:00
Andy Wilkinson
d9acde2961 Merge branch '2.7.x' 2022-02-11 12:28:22 +00:00
Andy Wilkinson
0c15fab881 Merge branch '2.6.x' into 2.7.x
Closes gh-29744
2022-02-11 12:26:15 +00:00
Andy Wilkinson
b74f668254 Only auto-configure WebSessionIdResolver in reactive web app
Closes gh-29669
2022-02-11 12:09:45 +00:00
Andy Wilkinson
558f1d40a7 Merge branch '2.7.x' 2022-02-11 11:36:24 +00:00
Andy Wilkinson
480904f4dc Merge branch '2.6.x' into 2.7.x
Closes gh-29742
2022-02-11 11:36:12 +00:00
Andy Wilkinson
bb7fa9f545 Merge branch '2.5.x' into 2.6.x
Closes gh-29741
2022-02-11 11:35:47 +00:00
Andy Wilkinson
c46b45a1e3 Add dependency management for liquibase-cdi
Closes gh-29676
2022-02-11 11:34:51 +00:00
Stephane Nicoll
d8454f8758 Start building against Spring Session 2021.1.2 snapshots
See gh-29725
2022-02-11 10:10:12 +01:00
Stephane Nicoll
9006fdec50 Start building against Spring Batch 4.3.5 snapshots
See gh-29724
2022-02-11 10:10:12 +01:00
Stephane Nicoll
56ed5fb68c Start building against Spring Security 5.6.2
See gh-29723
2022-02-11 10:10:12 +01:00
Stephane Nicoll
1ce07cfe2b Start building against Spring Data 2021.1.2 snapshots
See gh-29721
2022-02-11 09:35:25 +01:00
Stephane Nicoll
2b87d8364d Start building against Spring LDAP 2.3.6 snapshots
See gh-29720
2022-02-11 09:35:01 +01:00
Stephane Nicoll
f6cf198767 Start building against Spring Framework 5.3.16 snapshots
See gh-29719
2022-02-11 09:34:35 +01:00
Stephane Nicoll
cebba5a6d0 Start building against Micrometer 1.8.3 snapshots
See gh-29718
2022-02-11 09:34:14 +01:00
Stephane Nicoll
0297437fc5 Start building against Reactor 2020.0.16 snapshots
See gh-29717
2022-02-11 09:33:13 +01:00
Stephane Nicoll
e242dc5ce8 Start building against Spring Session 2021.0.5 snapshots
See gh-29715
2022-02-11 09:29:06 +01:00
Stephane Nicoll
7afd33589f Start building against Spring Batch 4.3.5 snapshots
See gh-29714
2022-02-11 09:28:41 +01:00
Stephane Nicoll
3c3ebafa31 Start building against Spring Security 5.5.5 snapshots
See gh-29713
2022-02-11 09:28:17 +01:00
Stephane Nicoll
b892bb4415 Start building against Spring Kafka 2.7.11 snapshots
See gh-29712
2022-02-11 09:27:52 +01:00
Stephane Nicoll
cd94b27f2d Start building against Spring Data 2021.0.9 snapshots
See gh-29711
2022-02-11 09:27:28 +01:00
Stephane Nicoll
29d502da5b Start building against Spring LDAP 2.3.6 snapshots
See gh-29710
2022-02-11 09:27:05 +01:00
Stephane Nicoll
d15149c1a3 Start building against Spring Framework 5.3.16 snapshots
See gh-29709
2022-02-11 09:26:35 +01:00
Stephane Nicoll
0f630debb3 Start building against Micrometer 1.7.9 snapshots
See gh-29708
2022-02-11 09:26:11 +01:00
Stephane Nicoll
5767e1fda1 Start building against Reactor 2020.0.16 snapshots
See gh-29707
2022-02-11 09:25:38 +01:00
Andy Wilkinson
fc23310144 Merge branch '2.6.x' into 2.7.x
Closes gh-29734
2022-02-10 17:13:56 +00:00
Andy Wilkinson
d14450dc88 Merge branch '2.7.x' 2022-02-10 17:13:39 +00:00
Andy Wilkinson
fc5ede7b94 Polish "Auto-configure Spring rather than Nimbus opaque token introspectors"
See gh-29572
2022-02-10 17:11:04 +00:00
Andy Wilkinson
d6ebce4ccf Merge branch '2.5.x' into 2.6.x
Closes gh-29733
2022-02-10 17:02:39 +00:00
Andy Wilkinson
6901f6dab2 Test our Gradle plugin against Gradle 7.4
Closes gh-29673
2022-02-10 16:57:13 +00:00
Lukas Kuster
131ea706c7 Auto-configure Spring rather than Nimbus opaque token introspectors
See gh-29572
2022-02-10 16:50:06 +00:00