Moritz Halbritter
cb08065ece
Merge branch '2.7.x'
2022-02-16 11:55:46 +01:00
Moritz Halbritter
100f80d073
Add @AutoConfiguration annotation
...
This annotation can be used to mark auto-configurations with a dedicated
annotation. Under the hood, it's a standard @Configuration with
proxyBeanMethods set to false.
Closes gh-29870
2022-02-16 11:53:46 +01:00
Andy Wilkinson
638b5a9256
Merge branch '2.7.x'
2022-02-14 14:58:21 +00:00
Andy Wilkinson
15f4b6c263
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29808
2022-02-14 14:48:49 +00:00
Andy Wilkinson
64e24a0e11
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29807
2022-02-14 14:48:30 +00:00
dreis2211
39394b9c2b
Link to Integration section of the appendix for Kafka properties
...
See gh-29758
2022-02-14 14:25:40 +00:00
Henning Poettker
7d83dfc0c7
Reinstate support for H2 Console
...
See gh-29755
Closes gh-29755
2022-02-14 13:24:57 +00:00
Stephane Nicoll
15e14e23c9
Start building against Spring Kafka 2.8.3 snapshots
...
See gh-29759
2022-02-14 08:22:13 +01: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
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