Commit Graph

1427 Commits

Author SHA1 Message Date
Andy Wilkinson b1d26fe961 Revert "Upgrade default CNB builders to Paketo Jammy"
This reverts commit 6506208d29. The
upgrade to the Jammy builder was causing
failsWhenBuildImageIsInvokedOnMultiModuleProjectWithBuildImageGoal to
hang on CI.

See gh-36689
2023-08-07 12:10:27 +01:00
Scott Frederick 6506208d29 Upgrade default CNB builders to Paketo Jammy
Closes gh-36689
2023-08-02 19:06:16 -05:00
Andy Wilkinson 1dd3add5c5 Merge branch '3.1.x'
Closes gh-36600
2023-07-31 09:36:53 +01:00
Andy Wilkinson 0ead8d0314 Merge branch '3.0.x' into 3.1.x
Closes gh-36597
2023-07-31 09:36:25 +01:00
Andy Wilkinson 06cb28d306 Merge branch '2.7.x' into 3.0.x
Closes gh-36602
2023-07-31 09:35:58 +01:00
Andy Wilkinson abf2ae792f Upgrade Java 20 CI image to 20.0.2+10
Closes gh-36596
2023-07-31 09:35:33 +01:00
Andy Wilkinson d3ee69d32b Merge branch '3.1.x'
Closes gh-36601
2023-07-31 09:33:57 +01:00
Andy Wilkinson fd69477711 Merge branch '3.0.x' into 3.1.x
Closes gh-36598
2023-07-31 09:32:54 +01:00
Andy Wilkinson d3151cfb7e Merge branch '2.7.x' into 3.0.x
Closes gh-36599
2023-07-31 09:32:15 +01:00
Andy Wilkinson 3667813af9 Upgrade CI images to Docker 24.0.5
Closes gh-36595
2023-07-31 09:31:46 +01:00
Yanming Zhou b1ac64c7e2 Harmonize Stream.collect() usage
use Stream.toList() or collect(Collectors.toSet()) where possible.

See gh-36509
2023-07-26 11:15:08 +02:00
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 e869a9dafe Upgrade Java 17 version in CI image and .sdkmanrc
Closes gh-36458
2023-07-24 12:46:00 +02:00
Stephane Nicoll eb467f64bb Upgrade Java 17 version in CI image and .sdkmanrc
Closes gh-36457
2023-07-24 12:42:55 +02:00
Stephane Nicoll 33669909bd Upgrade Java 17 version in CI image
Closes gh-36460
2023-07-24 12:41:04 +02:00
Stephane Nicoll c0c0b9a0f2 Upgrade Java 11 version in CI image
Closes gh-36462
2023-07-24 12:40:32 +02:00
Stephane Nicoll 9112b581d6 Upgrade Java 8 version in CI image and .sdkmanrc
Closes gh-36461
2023-07-24 12:39:04 +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