Commit Graph

1411 Commits

Author SHA1 Message Date
Stephane Nicoll fe95c26a14 Upgrade Java 17 version in CI image and .sdkmanrc
Closes gh-36459
2023-07-24 12:46:49 +02:00
Stephane Nicoll 09fc2614cf Merge branch '3.1.x'
Closes gh-36389
2023-07-13 16:20:13 +02:00
Stephane Nicoll 56a7eddb9c Merge branch '3.0.x' into 3.1.x
Closes gh-36391
2023-07-13 16:19:50 +02:00
Stephane Nicoll b3244d19c4 Merge branch '2.7.x' into 3.0.x
Closes gh-36392
2023-07-13 16:19:24 +02:00
Stephane Nicoll 1c55673405 Upgrade CI to Docker 24.0.4
Closes gh-36390
2023-07-13 16:18:38 +02:00
Andy Wilkinson 46aeeab148 Merge branch '3.1.x'
Closes gh-36244
2023-07-06 12:31:17 +01:00
Andy Wilkinson ea91b2f861 Merge branch '3.0.x' into 3.1.x
Closes gh-36247
2023-07-06 12:30:09 +01:00
Andy Wilkinson 7ae030adad Merge branch '2.7.x' into 3.0.x
Closes gh-36245
2023-07-06 12:29:38 +01:00
Andy Wilkinson 76cd102aa6 Upgrade CI images to ubuntu:jammy-20230624
Closes gh-36246
2023-07-06 12:28:22 +01:00
Andy Wilkinson ce8253ea95 Merge branch '3.1.x'
Closes gh-36238
2023-07-05 09:51:35 +01:00
Andy Wilkinson c9f8d92656 Merge branch '3.0.x' into 3.1.x
Closes gh-36237
2023-07-05 09:47:43 +01:00
Johnny Lim 0fa58c04e7 Use Stream.toList()
See gh-36167
2023-07-05 09:38:19 +01:00
Andy Wilkinson f0e1fdfd11 Merge branch '3.1.x'
Closes gh-36014
2023-06-27 14:33:18 +01:00
Andy Wilkinson 4d6c3bd804 Merge branch '3.0.x' into 3.1.x
Closes gh-36013
2023-06-27 14:32:17 +01:00
Andy Wilkinson 97773e5271 Merge branch '2.7.x' into 3.0.x
Closes gh-36011
2023-06-27 14:30:11 +01:00
Andy Wilkinson 15d6858db9 Upgrade CI images to ubuntu:jammy-20230605
Closes gh-36012
2023-06-27 14:28:44 +01:00
Andy Wilkinson 6f95900775 Merge branch '3.1.x' 2023-06-22 10:04:23 +01:00
Andy Wilkinson 5c53bda650 Merge branch '3.0.x' into 3.1.x
Closes gh-36025
2023-06-22 10:04:11 +01:00
Andy Wilkinson 1596f69601 Merge branch '2.7.x' into 3.0.x
Closes gh-36023
2023-06-22 10:03:46 +01:00
Andy Wilkinson fff30efed5 Configure timeouts on staging builds
Closes gh-36022
2023-06-22 10:02:53 +01:00
Andy Wilkinson 5d04a71f1d Merge branch '3.1.x' 2023-06-14 14:58:12 +01:00
Andy Wilkinson 9da1fbd3d0 Merge branch '3.0.x' into 3.1.x
Closes gh-35893
2023-06-14 14:57:13 +01:00
Andy Wilkinson ca5acaf1f2 Merge branch '2.7.x' into 3.0.x
Closes gh-35779
2023-06-14 14:56:47 +01:00
Andy Wilkinson 27b8ec8a3d Upgrade CI images to ubuntu:jammy-20230522
Closes gh-35778
2023-06-14 14:55:05 +01:00
Andy Wilkinson f562ced79a Add CI on JDK 21 2023-06-13 12:01:47 +01:00
Andy Wilkinson b9c2c289b3 Start working on Spring Boot 3.2
This commit also disables the creation of forward merge issues
when merging into main. Forward merge issues will be re-enabled
once 3.1.1 has been released.
2023-06-08 17:22:21 +01:00
Andy Wilkinson 409eb055bb Prepare 3.1.x branch 2023-06-08 10:19:32 +01:00
Stephane Nicoll 6176eaa018 Merge branch '3.0.x'
Closes gh-35695
2023-06-01 14:53:37 +02:00
Stephane Nicoll c0a6bf830b Merge branch '2.7.x' into 3.0.x
Closes gh-35688
2023-06-01 14:53:10 +02:00
Stephane Nicoll db03dc7743 Upgrade CI to Docker 24.0.2
Closes gh-35687
2023-06-01 14:52:41 +02:00
Phillip Webb 25a076178e Merge branch '3.0.x' 2023-05-24 17:31:17 -07:00
Phillip Webb 02217d35d2 Merge branch '2.7.x' into 3.0.x 2023-05-24 17:31:07 -07:00
Phillip Webb c88a768977 Merge branch '2.6.x' into 2.7.x 2023-05-24 17:30:52 -07:00
Phillip Webb f8c9fee3b0 Merge branch '2.5.x' into 2.6.x 2023-05-24 17:30:39 -07:00
Phillip Webb 6c4781086f Remove unused CI files 2023-05-24 17:30:12 -07:00
Phillip Webb 4d0ab5f1e9 Merge branch '3.0.x' 2023-05-24 17:28:41 -07:00
Phillip Webb 69fe1aa159 Merge branch '2.7.x' into 3.0.x 2023-05-24 17:28:13 -07:00
Phillip Webb 5d1fcfa472 Merge branch '2.6.x' into 2.7.x 2023-05-24 17:18:58 -07:00
Phillip Webb 12b09acc87 Merge branch '2.5.x' into 2.6.x 2023-05-24 17:18:14 -07:00
Phillip Webb 46c8b58eb5 Update CI pipeline 2023-05-24 17:17:35 -07:00
Scott Frederick 39d7dd283a Merge branch '3.0.x'
Closes gh-35623
2023-05-24 15:28:18 -05:00
Scott Frederick 7f35edb72a Merge branch '2.7.x' into 3.0.x
Closes gh-35624
2023-05-24 15:27:05 -05:00
Scott Frederick a5a5be37ec Upgrade CI to Docker 24.0.1
Closes gh-35622
2023-05-24 15:26:08 -05:00
Scott Frederick 0af455f29b Set LATEST_GA in CI pipeline to true
Closes gh-35557
2023-05-18 15:27:51 -05:00
Scott Frederick f0ed2a8e4c Set LATEST_GA to false in CI pipeline
Closes gh-35556
2023-05-18 15:24:08 -05:00
Scott Frederick 1e29053886 Merge branch '3.0.x'
Closes gh-35542
2023-05-17 16:56:38 -05:00
Scott Frederick 9245f3c25e Merge branch '2.7.x' into 3.0.x
Closes gh-35543
2023-05-17 16:56:13 -05:00
Scott Frederick c0797eea1d Upgrade CI to Docker 24.0.0
Closes gh-35506
2023-05-17 16:55:10 -05:00
Phillip Webb 60930c0285 Merge branch '2.5.x' into 2.6.x 2023-05-10 23:33:42 -07:00
Phillip Webb 9af19370a6 Backport build and CI concerns
Backport build and CI concerns primarily related to repo.spring.io
changes and Docker config.
2023-05-10 23:29:30 -07:00