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
Moritz Halbritter
94d095ce1a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29692
2022-02-09 14:10:41 +01: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
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
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
665e1f665e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29688
2022-02-09 11:35:03 +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
1e16c2f229
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29686
2022-02-09 11:32:43 +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
41863d4b80
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29680
2022-02-08 19:21:59 +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
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
1d153fde37
Merge branch 'gh-28524' into 2.7.x
...
Closes gh-28524
2022-02-05 13:37:49 +01:00
Stephane Nicoll
098a57affb
Upgrade to R2DBC Borca-RELEASE
...
See gh-28524
2022-02-05 13:37:20 +01:00
Stephane Nicoll
8c8c9c5f28
Upgrade to H2 2.1.210
...
H2 2.x contains several important changes such as moving the primary key
generation mechanism to a sequence-based identifier. This commit fixes
a number of tests that were failing.
Closes gh-29651
Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com >
2022-02-05 13:36:53 +01:00
Stephane Nicoll
5f7657508f
Start building against Spring Batch 4.3.5 snapshots
...
See gh-29652
2022-02-05 13:36:38 +01: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
4ab858a689
Merge pull request #29499 from p7nov
...
* gh-29499:
Polish 'Add Kotlin alternatives to Java documentation samples'
Add Kotlin alternatives to Java documentation samples
Closes gh-29499
2022-02-04 20:04:11 -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
0e906dc6e2
Use convention based code imports
...
Closes gh-29647
2022-02-04 19:46:44 -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
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
d33d92dfce
Polish KotlinConventions
2022-02-04 16:08:08 -08:00
Phillip Webb
f8c2bff825
Use Kotlin 1.6 for API and language version
...
Closes gh-29654
2022-02-04 16:07:37 -08:00
Stephane Nicoll
ae941c0996
Merge pull request #29200 from hpoettker
...
* pr/29200:
Adjust IDENTITY in DDLs for H2 2.x compatibility
Closes gh-29200
2022-02-04 10:10:23 +01:00
Henning Poettker
e3d0f1feee
Adjust IDENTITY in DDLs for H2 2.x compatibility
...
See gh-29200
2022-02-04 09:57:59 +01:00
Stephane Nicoll
37c1f47902
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29650
2022-02-04 09:53:42 +01: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
Phillip Webb
4919683354
Use consistent packages for doc samples
...
Closes gh-29646
2022-02-03 22:50:47 -08:00
Stephane Nicoll
d8d5091038
Merge branch '2.6.x' into 2.7.x
2022-02-03 08:40:02 +01:00
Stephane Nicoll
42a6bbd15a
Upgrade Java 17 version in CI image
...
Closes gh-29629
2022-02-03 08:39:30 +01:00
Stephane Nicoll
81a34fbb73
Upgrade Ubuntu version in CI images
...
Closes gh-29632
2022-02-03 08:38:52 +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