Andy Wilkinson
80cb21e800
Upgrade Java 17 CI image to 17.0.8.1+1
...
Closes gh-37149
2023-08-31 10:34:39 +01:00
Andy Wilkinson
e3e578f78a
Upgrade Java 11 CI image to 11.0.20.1+1
...
Closes gh-37150
2023-08-31 10:31:25 +01:00
Scott Frederick
1d244a671d
Merge branch '3.1.x'
...
Closes gh-37011
2023-08-16 15:44:20 -05:00
Scott Frederick
358717ce90
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37012
2023-08-16 15:40:51 -05:00
Scott Frederick
3907e40d16
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37010
2023-08-16 15:39:08 -05:00
Scott Frederick
da7eea49b1
Upgrade CI images to ubuntu:jammy-20230804
...
Closes gh-37009
2023-08-16 15:27:47 -05:00
Scott Frederick
eb45aab712
Upgrade default CNB builders to Paketo Jammy
...
Closes gh-36689
2023-08-14 13:29:42 -05:00
Phillip Webb
d73d8f8e4f
Merge branch '3.1.x'
2023-08-13 19:15:56 -07:00
Phillip Webb
848a61a3a8
Merge branch '3.0.x' into 3.1.x
2023-08-13 18:50:33 -07:00
Phillip Webb
9805723415
Update copyright year of changed files
2023-08-13 18:50:13 -07:00
Moritz Halbritter
7bb337aeb1
Polish tests
2023-08-08 13:12:47 +02:00
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
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
Scott Frederick
76f60e0737
Merge branch '3.0.x'
...
Closes gh-35390
2023-05-10 15:32:44 -05:00
Scott Frederick
5ffb68344a
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35389
2023-05-10 15:32:15 -05:00
Scott Frederick
852e3ed7ca
Upgrade CI to Docker 23.0.6
...
Closes gh-35388
2023-05-10 15:31:57 -05:00
Phillip Webb
2c1db0e9a2
Merge branch '2.5.x' into 2.6.x
...
Closes gh-35386
2023-05-10 09:56:24 -07:00
Phillip Webb
e2365ff2a4
Upgrade Java 8 version in CI image and .sdkmanrc and switch to Bellsoft
...
Closes gh-35385
2023-05-10 09:53:20 -07:00
Stephane Nicoll
7e91bff83b
Upgrade Ubuntu version in CI images
...
Closes gh-35258
2023-05-04 16:13:54 +02:00
Stephane Nicoll
b798bfd9d6
Upgrade Ubuntu version in CI images
...
Closes gh-35257
2023-05-04 16:12:46 +02:00
Stephane Nicoll
75e9a7e95b
Upgrade Ubuntu version in CI images
...
Closes gh-35259
2023-05-04 16:11:33 +02:00
Andy Wilkinson
3287e61cd0
Merge branch '3.0.x'
...
Closes gh-35219
2023-05-01 20:43:38 +01:00
Andy Wilkinson
c7cbdd9b0a
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35218
2023-05-01 20:43:16 +01:00
Andy Wilkinson
e7578f0595
Add Docker Hub credentials to system tests task
...
Closes gh-35213
2023-05-01 20:42:06 +01:00
Scott Frederick
51a28af347
Merge branch '3.0.x'
...
See gh-35176
2023-04-27 17:11:05 -05:00
Scott Frederick
e8c82060db
Upgrade CI to Docker 23.0.5
...
See gh-35175
2023-04-27 17:10:53 -05:00
Scott Frederick
79673e61e9
Upgrade CI to Docker 23.0.5
...
Closes gh-35177
2023-04-27 17:03:56 -05:00
Stephane Nicoll
8435736570
Upgrade Java 20 version in CI image
...
Closes gh-35077
2023-04-20 14:33:56 +02:00
Stephane Nicoll
cde830c964
Upgrade Java 17 version in CI image and .sdkmanrc
...
Closes gh-35078
2023-04-20 14:33:18 +02:00
Stephane Nicoll
671e1a7c93
Upgrade CI to Docker 23.0.4
...
Closes gh-35092
2023-04-20 14:32:34 +02:00
Stephane Nicoll
bf630bd166
Upgrade Java 20 version in CI image
...
Closes gh-35072
2023-04-20 14:31:26 +02:00
Stephane Nicoll
8c96967c16
Upgrade Java 17 version in CI image and .sdkmanrc
...
Closes gh-35071
2023-04-20 14:30:56 +02:00
Stephane Nicoll
6e15177650
Upgrade CI to Docker 23.0.4
...
Closes gh-35070
2023-04-20 14:29:13 +02:00
Stephane Nicoll
81ade5d3b5
Upgrade Java 20 version in CI image
...
Closes gh-35073
2023-04-20 14:27:39 +02:00
Stephane Nicoll
b6705b7f45
Upgrade Java 17 version in CI image
...
Closes gh-35079
2023-04-20 14:26:36 +02:00
Stephane Nicoll
8195700c96
Upgrade Java 11 version in CI image
...
Closes gh-35076
2023-04-20 14:25:56 +02:00
Stephane Nicoll
59ac9295fa
Upgrade Java 8 version in CI image and .sdkmanrc
...
Closes gh-35074
2023-04-20 14:25:21 +02:00
Stephane Nicoll
573aec7d3a
Upgrade CI to Docker 23.0.4
...
Closes gh-35075
2023-04-20 14:22:04 +02:00
Phillip Webb
3dac258aa8
Merge branch '3.0.x'
2023-04-18 10:10:29 -07:00
Phillip Webb
60a53633c7
Merge branch '2.7.x' into 3.0.x
2023-04-18 10:09:42 -07:00
Phillip Webb
cb56035bcc
Setup docker config.json on CI when building project
2023-04-18 10:04:20 -07:00
Andy Wilkinson
92c0162357
Merge branch '3.0.x'
...
Closes gh-34959
2023-04-17 17:36:01 +01:00
Andy Wilkinson
121165d684
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34961
2023-04-17 17:35:29 +01:00
Andy Wilkinson
4095f4ea82
Upgrade CI images to Docker 23.0.3
...
Closes gh-34960
2023-04-17 17:35:15 +01:00
Andy Wilkinson
7828fbfdab
Merge branch '3.0.x'
...
Closes gh-34756
2023-03-24 16:03:15 +00:00
Andy Wilkinson
d4ef5dc151
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34755
2023-03-24 16:03:02 +00:00
Andy Wilkinson
17a4d303f8
Switch Java 20 CI to Bellsoft Liberica
...
Closes gh-34752
2023-03-24 15:59:45 +00:00
Andy Wilkinson
e8e29ecfb8
Merge branch '3.0.x'
...
Closes gh-34754
2023-03-24 15:54:56 +00:00
Andy Wilkinson
1933e9a28e
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34753
2023-03-24 15:54:27 +00:00
Andy Wilkinson
04e7e70ebd
Remove JDK 19 CI
...
Closes gh-34639
2023-03-24 15:47:06 +00:00
Andy Wilkinson
718e2ff276
Merge branch '3.0.x'
...
Closes gh-34720
2023-03-24 15:37:23 +00:00
Andy Wilkinson
1da4271f81
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34721
2023-03-24 15:37:00 +00:00
Andy Wilkinson
e79ac4b24e
Upgrade CI images to ubuntu:jammy-20230308
...
Closes gh-34719
2023-03-24 15:36:02 +00:00
Andy Wilkinson
91c5d41094
Add docker compose to CI images
...
Closes gh-34738
2023-03-23 17:25:37 +00:00
Andy Wilkinson
e7f40b9e0a
Merge branch '3.0.x'
...
See gh-34641
2023-03-20 11:46:22 +00:00
Andy Wilkinson
d7987147c1
Correct base Java version in JDK 20 CI image
...
See gh-34640
2023-03-20 11:45:44 +00:00
Andy Wilkinson
2802841de6
Merge branch '3.0.x'
...
Closes gh-34641
2023-03-20 10:13:42 +00:00
Andy Wilkinson
7a4dcecaff
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34640
2023-03-20 10:12:38 +00:00
Andy Wilkinson
2cbaf645b1
Add CI with JDK 20
...
Closes gh-34175
2023-03-20 10:04:41 +00:00
Scott Frederick
bf7c814dac
Merge branch '3.0.x'
...
Closes gh-34519
2023-03-08 15:35:15 -06:00
Scott Frederick
de85308578
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34520
2023-03-08 15:33:52 -06:00
Scott Frederick
4bd0f75119
Upgrade CI images to ubuntu:jammy-20230301
...
Closes gh-34521
2023-03-08 15:24:36 -06:00
Scott Frederick
57a4eb88db
Merge branch '3.0.x'
...
Closes gh-34213
2023-02-15 15:13:42 -06:00
Scott Frederick
ffedb26e91
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34214
2023-02-15 15:13:03 -06:00
Scott Frederick
1ea70d3ddd
Upgrade CI to Docker 23.0.1
...
Closes gh-34215
2023-02-15 15:12:44 -06:00
Andy Wilkinson
dfcb4d905c
Merge branch '3.0.x'
...
Closes gh-34130
2023-02-09 09:10:33 +00:00
Andy Wilkinson
3f0e148e30
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34129
2023-02-09 09:10:04 +00:00
Andy Wilkinson
bb6dfc10ab
Upgrade CI images to Docker 23.0.0
...
Closes gh-34128
2023-02-09 09:06:01 +00:00
Andy Wilkinson
64dcbec763
Merge branch '3.0.x'
...
Closes gh-34124
2023-02-08 14:17:30 +00:00
Andy Wilkinson
1cdc24a11d
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34123
2023-02-08 14:17:06 +00:00
Andy Wilkinson
07fcb67540
Use repo.maven.apache.org consistently
...
Maven Central has two canonical URLs [1]:
- https://repo1.maven.org
- https://repo.maven.apache.org
This commit updates the codebase to only use repo.maven.apache.org.
Closes gh-33938
[1] https://central.sonatype.org/news/20190715_http_deprecation_update/#canonical-urls
2023-02-08 14:04:16 +00:00
Andy Wilkinson
6973d615d8
Merge branch '3.0.x'
...
Closes gh-33980
2023-02-08 11:04:45 +00:00
Andy Wilkinson
b2d239ee10
Merge branch '2.7.x' into 3.0.x
...
Closes gh-33983
2023-02-08 11:04:28 +00:00
Andy Wilkinson
2518139021
Upgrade CI images to Docker 20.10.23
...
Closes gh-33981
2023-02-08 11:03:36 +00:00
Andy Wilkinson
e42a506d71
Merge branch '3.0.x'
...
Closes gh-33982
2023-02-06 13:08:27 +00:00
Andy Wilkinson
d65f1cd704
Merge branch '2.7.x' into 3.0.x
...
Closes gh-32977
2023-02-06 13:07:46 +00:00
Andy Wilkinson
ccb748ad35
Upgrade CI images to ubuntu:jammy-20230126
...
Closes gh-32979
2023-02-06 13:05:52 +00:00
Andy Wilkinson
28e793a7aa
Merge branch '3.0.x'
2023-02-06 11:56:16 +00:00
Andy Wilkinson
57b7b1ae8e
Fix formatting of ArtifactoryServiceTests
...
See gh-33967
2023-02-06 11:55:28 +00:00
Phillip Webb
9b6502300f
Merge branch '3.0.x'
2023-02-02 16:07:06 -08:00
Phillip Webb
cf60c1c8a2
Merge branch '2.7.x' into 3.0.x
2023-02-02 16:06:52 -08:00
Phillip Webb
d71d885021
Update CI pipeline
2023-02-02 16:04:34 -08:00
Phillip Webb
5df63ca85f
Merge branch '3.0.x'
...
Closes gh-34056
2023-02-02 15:53:27 -08:00
Phillip Webb
09b83c972a
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34055
2023-02-02 15:52:58 -08:00
Phillip Webb
86fc39261e
Upgrade CI to springio/artifactory-resource 0.0.18
...
Closes gh-34054
2023-02-02 15:52:21 -08:00
Moritz Halbritter
23f1c896c9
Merge branch '3.0.x'
...
Closes gh-34015
2023-01-31 10:20:36 +01:00