Commit Graph

35359 Commits

Author SHA1 Message Date
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
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 92578f1cbe Merge pull request #29333 from terminux
* gh-29333:
  Polish "Configure ForwardedHeaderFilter with Tomcat's use relative redirects"
  Configure ForwardedHeaderFilter with Tomcat's use relative redirects

Closes gh-29333
2022-02-10 15:02:12 +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 59799c81b0 Merge pull request #29683 from mhalbritter
* pr-29683:
  Add documentation for WebMvc.fn

Closes gh-29683
2022-02-10 13:17:23 +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 430d510a33 Merge pull request #29675 from mhalbritter
* gh-29675:
  Ignore invalid stream types when reading log update events

Closes gh-29675
2022-02-09 14:08:54 +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
Andy Wilkinson 43dc378adc Merge pull request #29667 from mhalbritter
* gh-29667:
  Move appendix subsections under appendix section

Closes gh-29667
2022-02-09 12:04:24 +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
Andy Wilkinson 3a5bf49e24 Merge pull request #29611 from halcyon22
* gh-29611:
  Replace use of classifier with archiveClassifier

Closes gh-29611
2022-02-09 11:32:24 +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
Phillip Webb 05c58a18df Merge branch '2.5.x' into 2.6.x
Closes gh-29657
2022-02-04 19:44:05 -08:00
Phillip Webb 12a33a2eaf Upgrade to spring-asciidoctor-backends 0.0.3
Closes gh-29656
2022-02-04 19:43:47 -08:00
Stephane Nicoll 03d393bc4c Merge branch '2.5.x' into 2.6.x
Closes gh-29649
2022-02-04 09:50:47 +01:00
Stephane Nicoll 48649192cb Fix schema file name for Batch auto-configuration tests
Closes gh-29648
2022-02-04 09:49:15 +01:00
Stephane Nicoll 77b4b6a331 Merge branch '2.5.x' into 2.6.x 2022-02-03 08:38:13 +01:00
Stephane Nicoll 175af609a5 Upgrade Java 17 version in CI image
Closes gh-29625
2022-02-03 08:37:43 +01:00
Stephane Nicoll cb1b33b57e Upgrade Ubuntu version in CI images
Closes gh-29627
2022-02-03 08:37:07 +01:00
Stephane Nicoll 080de85e2e Upgrade Java 17 version in CI image
Closes gh-29626
2022-02-03 08:36:03 +01:00
Stephane Nicoll 57cd1ff07f Upgrade Ubuntu version in CI images
Closes gh-29628
2022-02-03 08:35:16 +01:00
Phillip Webb c01cee18b5 Merge branch '2.5.x' into 2.6.x
Closes gh-29634
2022-02-02 19:01:09 -08:00
Phillip Webb 79fc77fade Upgrade to spring-javaformat 0.0.31
Closes gh-29633
2022-02-02 19:00:28 -08:00
Phillip Webb 50e0e28155 Merge branch '2.5.x' into 2.6.x 2022-02-02 10:37:32 -08:00
Phillip Webb 2b40ce09d8 Update copyright year of changed files 2022-02-02 10:35:40 -08:00
Phillip Webb 5975cdc5ed Polish formatting 2022-02-02 10:35:10 -08:00
Stephane Nicoll d130819fb4 Merge branch '2.5.x' into 2.6.x
Closes gh-29616
2022-02-01 16:35:19 +01:00
Stephane Nicoll 30e927adae Merge pull request #29276 from mihailcornescu
* pr/29276:
  Polish "Add a note on early init with @ConditionalOnExpression"
  Add a note on early init with @ConditionalOnExpression

Closes gh-29276
2022-02-01 16:35:01 +01:00
Stephane Nicoll 5fe6176966 Polish "Add a note on early init with @ConditionalOnExpression"
See gh-29276
2022-02-01 16:32:27 +01:00
Mihail Cornescu fce3cd1684 Add a note on early init with @ConditionalOnExpression
See gh-29276
2022-02-01 16:24:13 +01:00