Skip to content

Commit 1933e9a

Browse files
committed
Merge branch '2.7.x' into 3.0.x
Closes gh-34753
2 parents 1da4271 + 04e7e70 commit 1933e9a

File tree

4 files changed

+2
-110
lines changed

4 files changed

+2
-110
lines changed

ci/images/ci-image-jdk19/Dockerfile

Lines changed: 0 additions & 10 deletions
This file was deleted.

ci/images/get-jdk-url.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ case "$1" in
55
java17)
66
echo "https://github.com/bell-sw/Liberica/releases/download/17.0.6+10/bellsoft-jdk17.0.6+10-linux-amd64.tar.gz"
77
;;
8-
java19)
9-
echo "https://github.com/bell-sw/Liberica/releases/download/19.0.2+9/bellsoft-jdk19.0.2+9-linux-amd64.tar.gz"
10-
;;
118
java20)
129
echo "https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-x64_bin.tar.gz"
1310
;;

ci/pipeline.yml

Lines changed: 2 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,6 @@ resources:
182182
source:
183183
<<: *ci-registry-image-resource-source
184184
repository: ((docker-hub-organization))/spring-boot-ci
185-
- name: ci-image-jdk19
186-
type: registry-image
187-
icon: docker
188-
source:
189-
<<: *ci-registry-image-resource-source
190-
repository: ((docker-hub-organization))/spring-boot-ci-jdk19
191185
- name: ci-image-jdk20
192186
type: registry-image
193187
icon: docker
@@ -218,14 +212,6 @@ resources:
218212
access_token: ((github-ci-status-token))
219213
branch: ((branch))
220214
context: build
221-
- name: repo-status-jdk19-build
222-
type: github-status-resource
223-
icon: eye-check-outline
224-
source:
225-
repository: ((github-repo-name))
226-
access_token: ((github-ci-status-token))
227-
branch: ((branch))
228-
context: jdk19-build
229215
- name: repo-status-jdk20-build
230216
type: github-status-resource
231217
icon: eye-check-outline
@@ -269,13 +255,6 @@ jobs:
269255
image: ci-image
270256
vars:
271257
ci-image-name: ci-image
272-
- task: build-ci-image-jdk19
273-
privileged: true
274-
file: git-repo/ci/tasks/build-ci-image.yml
275-
output_mapping:
276-
image: ci-image-jdk19
277-
vars:
278-
ci-image-name: ci-image-jdk19
279258
- task: build-ci-image-jdk20
280259
privileged: true
281260
file: git-repo/ci/tasks/build-ci-image.yml
@@ -287,9 +266,6 @@ jobs:
287266
- put: ci-image
288267
params:
289268
image: ci-image/image.tar
290-
- put: ci-image-jdk19
291-
params:
292-
image: ci-image-jdk19/image.tar
293269
- put: ci-image-jdk20
294270
params:
295271
image: ci-image-jdk20/image.tar
@@ -306,12 +282,6 @@ jobs:
306282
params:
307283
<<: *github-task-params
308284
JDK_VERSION: java17
309-
- task: detect-jdk19-update
310-
image: ci-image
311-
file: git-repo/ci/tasks/detect-jdk-updates.yml
312-
params:
313-
<<: *github-task-params
314-
JDK_VERSION: java19
315285
- name: detect-ubuntu-image-updates
316286
plan:
317287
- get: git-repo
@@ -399,38 +369,6 @@ jobs:
399369
params:
400370
path: git-repo
401371
status: failure
402-
- name: jdk19-build
403-
serial: true
404-
public: true
405-
plan:
406-
- get: ci-image-jdk19
407-
- get: git-repo
408-
trigger: true
409-
- put: repo-status-jdk19-build
410-
params: { state: "pending", commit: "git-repo" }
411-
- do:
412-
- task: build-project
413-
image: ci-image-jdk19
414-
privileged: true
415-
timeout: ((task-timeout))
416-
file: git-repo/ci/tasks/build-project.yml
417-
params:
418-
BRANCH: ((branch))
419-
TOOLCHAIN_JAVA_VERSION: 19
420-
<<: *gradle-enterprise-task-params
421-
<<: *docker-hub-task-params
422-
on_failure:
423-
do:
424-
- put: repo-status-jdk19-build
425-
params: { state: "failure", commit: "git-repo" }
426-
- put: slack-alert
427-
params:
428-
<<: *slack-fail-params
429-
- put: repo-status-jdk19-build
430-
params: { state: "success", commit: "git-repo" }
431-
- put: slack-alert
432-
params:
433-
<<: *slack-success-params
434372
- name: jdk20-build
435373
serial: true
436374
public: true
@@ -730,35 +668,6 @@ jobs:
730668
- put: slack-alert
731669
params:
732670
<<: *slack-success-params
733-
- name: jdk19-run-system-tests
734-
serial: true
735-
public: true
736-
plan:
737-
- get: ci-image-jdk19
738-
- get: git-repo
739-
- get: paketo-builder-base-image
740-
trigger: true
741-
- get: daily
742-
trigger: true
743-
- do:
744-
- task: run-system-tests
745-
image: ci-image-jdk19
746-
privileged: true
747-
timeout: ((task-timeout))
748-
file: git-repo/ci/tasks/run-system-tests.yml
749-
params:
750-
BRANCH: ((branch))
751-
TOOLCHAIN_JAVA_VERSION: 19
752-
<<: *gradle-enterprise-task-params
753-
<<: *docker-hub-task-params
754-
on_failure:
755-
do:
756-
- put: slack-alert
757-
params:
758-
<<: *slack-fail-params
759-
- put: slack-alert
760-
params:
761-
<<: *slack-success-params
762671
- name: jdk20-run-system-tests
763672
serial: true
764673
public: true
@@ -790,11 +699,11 @@ jobs:
790699
<<: *slack-success-params
791700
groups:
792701
- name: "builds"
793-
jobs: ["build", "jdk19-build", "jdk20-build", "windows-build"]
702+
jobs: ["build", "jdk20-build", "windows-build"]
794703
- name: "releases"
795704
jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release", "publish-gradle-plugin", "publish-to-sdkman", "update-homebrew-tap"]
796705
- name: "system-tests"
797-
jobs: ["run-system-tests", "jdk19-run-system-tests", "jdk20-run-system-tests"]
706+
jobs: ["run-system-tests", "jdk20-run-system-tests"]
798707
- name: "ci-images"
799708
jobs: ["build-ci-images", "detect-docker-updates", "detect-jdk-updates", "detect-ubuntu-image-updates"]
800709
- name: "pull-requests"

ci/scripts/detect-jdk-updates.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ case "$JDK_VERSION" in
1212
BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=17"
1313
ISSUE_TITLE="Upgrade Java 17 version in CI image and .sdkmanrc"
1414
;;
15-
java19)
16-
BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=19"
17-
ISSUE_TITLE="Upgrade Java 19 version in CI image"
18-
;;
1915
*)
2016
echo $"Unknown java version"
2117
exit 1;

0 commit comments

Comments
 (0)