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
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
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
Andy Wilkinson
e2d6516726
Remove dependency management for spring-boot-starter-jta-atomikos
...
Closes gh-29653
2022-02-04 13:06:27 +00:00
Stephane Nicoll
b22e3d51dc
Merge branch '2.7.x'
2022-02-04 10:10:29 +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
8885964a56
Merge branch '2.7.x'
2022-02-04 09:54:11 +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
Stephane Nicoll
d1225392d3
Remove dependency management for spring-boot-starter-activemq
...
Closes gh-29645
2022-02-04 09:08:03 +01: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
a05903b9d1
Polish GraphQL auto-configuration
2022-02-02 12:57:17 -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
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
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
b403877cc1
Merge branch '2.7.x'
2022-02-01 13:52:17 +01:00
Stephane Nicoll
067af65152
Fix formatting violations
2022-02-01 13:52:06 +01:00
Brian Clozel
b1c815830f
Upgrade to RxJava 3.x and remove older generations
...
As Spring Framework removed support for RxJava 1.x and 2.x, we should do
the same and only provide dependency management for RxJava 3.x.
Closes gh-28212
2022-02-01 11:38:50 +01:00
Stephane Nicoll
41fb9cf562
Merge branch '2.7.x'
2022-02-01 11:15:49 +01:00
Stephane Nicoll
f812b33cbd
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29613
2022-02-01 11:07:31 +01:00
Stephane Nicoll
136b5959c3
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29612
2022-02-01 10:59:08 +01:00
Stephane Nicoll
7f17f819a6
Polish "Enforce use of BDDMockito"
...
See gh-29178
2022-02-01 10:03:18 +01:00
Yanming Zhou
b49418aaaf
Enforce use of BDDMockito
...
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule
See gh-29178
2022-02-01 09:37:15 +01:00
