Commit Graph

2620 Commits

Author SHA1 Message Date
Moritz Halbritter 44beceffaf Merge branch '2.7.x' 2022-02-10 13:39:22 +01:00
Moritz Halbritter 96ce8d842e Merge branch '2.6.x' into 2.7.x
Closes gh-29729
2022-02-10 13:38:50 +01: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 067a8dd3ec Raise the minimum supported version of Gradle to 7.4
Closes gh-29674
2022-02-09 15:02:17 +00:00
Andy Wilkinson 819f40f81e Merge branch '2.7.x' 2022-02-09 13:39:28 +00:00
Andy Wilkinson e4b074f07b Merge branch '2.6.x' into 2.7.x 2022-02-09 13:37:50 +00:00
Andy Wilkinson f672a20f90 Polish appendix cross-references
See gh-29689
2022-02-09 13:24:05 +00:00
Andy Wilkinson 3b5e7ee0a8 Merge branch '2.7.x' 2022-02-09 12:19:21 +00:00
Andy Wilkinson 7e8d499333 Merge branch '2.6.x' into 2.7.x
Closes gh-29690
2022-02-09 12:18:57 +00: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
Phillip Webb ce6b12a024 Merge branch '2.7.x' 2022-02-05 10:16:48 -08:00
Phillip Webb 26dd6b826c Merge branch '2.6.x' into 2.7.x 2022-02-05 10:16:19 -08: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
Stephane Nicoll 3b4832445b Merge branch '2.7.x' 2022-02-05 14:02:00 +01:00
Stephane Nicoll 098a57affb Upgrade to R2DBC Borca-RELEASE
See gh-28524
2022-02-05 13:37:20 +01:00
Andy Wilkinson 977a0a8356 Merge branch '2.7.x' 2022-02-05 10:07:41 +00:00
Andy Wilkinson 2fec7b8562 Only use Kotlin 1.6 API and language versions in docs project
To preserve our existing Kotlin 1.3 baseline, we should compile our
Kotlin code with Kotlin 1.3 API and language versions. At the same
time, we want our documentation to use modern Kotlin. This commit
restores the 1.3 convention and overrides it to 1.6 in the docs
project. This maintains our Kotlin 1.3 baseline while also allowing
the Kotlin code examples to use 1.6 API and language features.

Closes gh-29654
2022-02-05 09:54:00 +00:00
Phillip Webb 4f8558f568 Upgrade Kotlin docs samples to Jakarta EE 9
See gh-29499
2022-02-04 21:51:21 -08:00
Phillip Webb a3615f4f77 Merge branch '2.7.x' 2022-02-04 20:04:28 -08:00
Phillip Webb d212243eef Polish 'Add Kotlin alternatives to Java documentation samples'
See gh-29499
2022-02-04 19:57:21 -08:00
Pavel Semyonov 197afff1d6 Add Kotlin alternatives to Java documentation samples
See gh-29499
2022-02-04 19:56:13 -08:00
Phillip Webb a301d8ed5d Merge branch '2.7.x' 2022-02-04 19:50:54 -08:00
Phillip Webb 0e906dc6e2 Use convention based code imports
Closes gh-29647
2022-02-04 19:46:44 -08:00
Phillip Webb a6b7ae2110 Merge branch '2.7.x' 2022-02-04 19:45:01 -08:00
Phillip Webb 71695d2162 Merge branch '2.6.x' into 2.7.x
Closes gh-29658
2022-02-04 19:44:31 -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
Phillip Webb 50047e6d8c Merge branch '2.7.x' 2022-02-04 16:10:50 -08:00
Phillip Webb 6c74e24147 Update copyright year of changed files 2022-02-04 16:09:35 -08:00
Phillip Webb b9e037b88f Polish 2022-02-04 16:09:22 -08:00
Phillip Webb 0083b767e6 Merge branch '2.7.x' 2022-02-03 22:53:15 -08:00
Phillip Webb 4919683354 Use consistent packages for doc samples
Closes gh-29646
2022-02-03 22:50:47 -08:00
Phillip Webb a282f912e6 Organize imports
Organize imports according to updated checkstyle rules.
2022-02-02 19:16:13 -08:00
Phillip Webb 501d174db0 Merge branch '2.7.x' 2022-02-02 10:38:46 -08:00
Phillip Webb ce08b519b1 Merge branch '2.6.x' into 2.7.x 2022-02-02 10:37:55 -08:00
Phillip Webb 50e0e28155 Merge branch '2.5.x' into 2.6.x 2022-02-02 10:37:32 -08:00
Phillip Webb 5975cdc5ed Polish formatting 2022-02-02 10:35:10 -08:00
Andy Wilkinson f88b502f7e Remove support for image banners
Closes gh-28883
2022-02-02 14:40:24 +00:00
Stephane Nicoll e749f30642 Merge branch '2.7.x' 2022-02-01 16:35:39 +01:00
Stephane Nicoll 9028ab33f2 Merge branch '2.6.x' into 2.7.x
Closes gh-29617
2022-02-01 16:35:28 +01: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 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
Stephane Nicoll 3a65d7b01e Merge branch '2.7.x' 2022-01-31 16:45:11 +01:00
Stephane Nicoll 19e671dd7b Merge branch '2.6.x' into 2.7.x 2022-01-31 16:45:04 +01:00
Stephane Nicoll 787a2f3d9b Merge branch '2.5.x' into 2.6.x 2022-01-31 16:44:39 +01:00
Stephane Nicoll ab0b29cb53 Polish "Make classloader customization easier to discover"
See gh-29438
2022-01-31 16:38:38 +01:00