root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
35,990 Commits 23 Branches 348 Tags 291 MiB
Commit Graph

35990 Commits

Author SHA1 Message Date
Stephane Nicoll 3b4832445b Merge branch '2.7.x' 2022-02-05 14:02:00 +01: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 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 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 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 8ed5d15cd3 Merge branch '2.7.x' 2022-02-04 16:08:29 -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
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
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 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
Stephane Nicoll 3b33448541 Merge branch '2.7.x' 2022-02-03 08:41:16 +01:00
Stephane Nicoll ddc481136b Upgrade Java 17 version in CI image 
Closes gh-29631
 2022-02-03 08:41:02 +01:00
Stephane Nicoll 2427431f2b Upgrade Ubuntu version in CI images 
Closes gh-29630
 2022-02-03 08:40:27 +01: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
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 a282f912e6 Organize imports 
Organize imports according to updated checkstyle rules.
 2022-02-02 19:16:13 -08:00
Phillip Webb a726210afc Merge branch '2.7.x' 2022-02-02 19:05:39 -08:00
Phillip Webb 546cad06db Merge branch '2.6.x' into 2.7.x 
Closes gh-29635
 2022-02-02 19:01:29 -08:00
Phillip Webb c01cee18b5 Merge branch '2.5.x' into 2.6.x 
Closes gh-29634
 2022-02-02 19:01:09 -08:00