16408 Commits

Author SHA1 Message Date
Stephane Nicoll
81aec09357 Upgrade to AppEngine SDK 1.9.94
Closes gh-29767
2022-02-14 13:43:22 +01:00
Andy Wilkinson
85d14cdb2c Merge branch '2.5.x' into 2.6.x
Closes gh-29805
2022-02-14 12:32:32 +00:00
Andy Wilkinson
1fd4a4d86b Remove code related to unsupported versions of Gradle
Closes gh-29681
2022-02-14 12:31:21 +00: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
Andy Wilkinson
09f51f38d6 Update docs to reflect use of CamelCaseToUnderscoresNamingStrategy
Closes gh-29743
2022-02-11 15:37:10 +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
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
b74f668254 Only auto-configure WebSessionIdResolver in reactive web app
Closes gh-29669
2022-02-11 12:09:45 +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
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
Andy Wilkinson
197ba9ebc9 Merge branch '2.5.x' into 2.6.x
Closes gh-29731
2022-02-10 15:04:58 +00:00
Andy Wilkinson
64ee54423a Polish "Configure ForwardedHeaderFilter with Tomcat's use relative redirects"
See gh-29333
2022-02-10 15:01:57 +00:00
Guirong Hu
cec69feb95 Configure ForwardedHeaderFilter with Tomcat's use relative redirects
Previously, when Tomcat was configured to use relative redirects
and the ForwardedHeaderFilter is in use, the filter would ignore
the use of the relative redirects.

This commit corrects this misalignment by applying Tomcat's use
relative redirects setting to the filter, but only when Tomcat is
being used as the servlet container.

See gh-29333
2022-02-10 15:01:56 +00:00
Moritz Halbritter
44ff29c4d4 Merge branch '2.5.x' into 2.6.x
Closes gh-29728
2022-02-10 13:28:15 +01:00
Moritz Halbritter
096ba72a39 Add documentation for WebMvc.fn
See gh-29683
2022-02-10 13:14:34 +01:00
Andy Wilkinson
f672a20f90 Polish appendix cross-references
See gh-29689
2022-02-09 13:24:05 +00:00
Moritz Halbritter
079ea41d6d Merge branch '2.5.x' into 2.6.x
Closes gh-29691
2022-02-09 14:09:33 +01:00
Moritz Halbritter
262db65a38 Ignore invalid stream types when reading log update events
See gh-29675
2022-02-09 14:03:02 +01:00
Andy Wilkinson
093e8a524d Merge branch '2.5.x' into 2.6.x
Closes gh-29689
2022-02-09 12:18:35 +00:00
Moritz Halbritter
52d9ba58d8 Move appendix subsections under appendix section
This involved a small code change to the generated configuration
properties snippets. The section id has to start with
'appendix.', otherwise the section-id asciidoctor extension
complains. To ensure that the anchors that are derived from the
section IDs remain backwards compatible, the anchor-rewrite
properties have been updated.

See gh-29667
2022-02-09 12:04:05 +00:00
Andy Wilkinson
b46eba16e6 Merge branch '2.5.x' into 2.6.x
Closes gh-29687
2022-02-09 11:34:51 +00:00
Andy Wilkinson
48fe1513fe Test documented build script snippets when they change
Closes gh-29684
2022-02-09 11:33:40 +00:00
Andy Wilkinson
c0664efa86 Merge branch '2.5.x' into 2.6.x
Closes gh-29685
2022-02-09 11:32:32 +00:00
Mike Partridge
2e9dcdd96d Replace use of classifier with archiveClassifier
classifier has been deprecated so the docs should be using its
replacement, archiveClassifier, instead.

See gh-29611
2022-02-09 11:31:22 +00:00
Andy Wilkinson
358cdb33f7 Merge branch '2.5.x' into 2.6.x
Closes gh-29679
2022-02-08 19:21:48 +00:00
Andy Wilkinson
43ca2d2cb0 Access classpath lazily to allow later changes to be picked up
Previously, the classpath of bootJar, bootWar, and bootRun was
configured directly as a FileCollection derived from the main source
set's runtime classpath. This direct configuration meant that
subsequent changes to the main source set's runtime classpath may not
have been picked up.

This commit changes the configuration of the classpath to use a
Callable. This indirection allows subsequent changes to the main
source set's runtime classpath to be picked up as long as they
occur before Gradle calls the callable.

Closes gh-29672
2022-02-08 19:21:37 +00:00
Phillip Webb
b3a82c9de6 Merge branch '2.5.x' into 2.6.x 2022-02-05 10:16:03 -08:00
Phillip Webb
52f1799c20 Polish formatting 2022-02-05 10:15:43 -08:00