Skip to content

Commit e6ebcf1

Browse files
committed
Upgrade Java version used in CI from 14 to 15
Closes gh-23433
1 parent 0edf7cb commit e6ebcf1

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

ci/images/spring-boot-jdk14-ci-image/Dockerfile renamed to ci/images/spring-boot-jdk15-ci-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ubuntu:bionic-20200807
33
ADD setup.sh /setup.sh
44
ADD get-jdk-url.sh /get-jdk-url.sh
55
ADD get-docker-url.sh /get-docker-url.sh
6-
RUN ./setup.sh java14
6+
RUN ./setup.sh java15
77

88
ENV JAVA_HOME /opt/openjdk
99
ENV PATH $JAVA_HOME/bin:$PATH

ci/pipeline.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,12 @@ resources:
142142
source:
143143
<<: *docker-resource-source
144144
repository: ((docker-hub-organization))/spring-boot-jdk11-ci-image
145-
- name: spring-boot-jdk14-ci-image
145+
- name: spring-boot-jdk15-ci-image
146146
type: docker-image
147147
icon: docker
148148
source:
149149
<<: *docker-resource-source
150-
repository: ((docker-hub-organization))/spring-boot-jdk14-ci-image
150+
repository: ((docker-hub-organization))/spring-boot-jdk15-ci-image
151151
- name: artifactory-repo
152152
type: artifactory-resource
153153
icon: package-variant
@@ -172,14 +172,14 @@ resources:
172172
access_token: ((github-ci-status-token))
173173
branch: ((branch))
174174
context: jdk11-build
175-
- name: repo-status-jdk14-build
175+
- name: repo-status-jdk15-build
176176
type: github-status-resource
177177
icon: eye-check-outline
178178
source:
179179
repository: ((github-repo-name))
180180
access_token: ((github-ci-status-token))
181181
branch: ((branch))
182-
context: jdk14-build
182+
context: jdk15-build
183183
- name: slack-alert
184184
type: slack-notification
185185
icon: slack
@@ -210,10 +210,10 @@ jobs:
210210
params:
211211
build: ci-images-git-repo/ci/images
212212
dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk11-ci-image/Dockerfile
213-
- put: spring-boot-jdk14-ci-image
213+
- put: spring-boot-jdk15-ci-image
214214
params:
215215
build: ci-images-git-repo/ci/images
216-
dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk14-ci-image/Dockerfile
216+
dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk15-ci-image/Dockerfile
217217
- name: detect-jdk-updates
218218
plan:
219219
- get: git-repo
@@ -233,12 +233,12 @@ jobs:
233233
params:
234234
<<: *github-task-params
235235
JDK_VERSION: java11
236-
- task: detect-jdk14-update
236+
- task: detect-jdk15-update
237237
image: spring-boot-ci-image
238238
file: git-repo/ci/tasks/detect-jdk-updates.yml
239239
params:
240240
<<: *github-task-params
241-
JDK_VERSION: java14
241+
JDK_VERSION: java15
242242
- name: detect-ubuntu-image-updates
243243
plan:
244244
- get: git-repo
@@ -400,46 +400,46 @@ jobs:
400400
- put: slack-alert
401401
params:
402402
<<: *slack-success-params
403-
- name: jdk14-build
403+
- name: jdk15-build
404404
serial: true
405405
public: true
406406
plan:
407-
- get: spring-boot-jdk14-ci-image
407+
- get: spring-boot-jdk15-ci-image
408408
- get: git-repo
409409
trigger: true
410-
- put: repo-status-jdk14-build
410+
- put: repo-status-jdk15-build
411411
params: { state: "pending", commit: "git-repo" }
412412
- do:
413413
- task: build-project
414-
image: spring-boot-jdk14-ci-image
414+
image: spring-boot-jdk15-ci-image
415415
<<: *build-project-task-params
416416
- in_parallel:
417417
- task: build-smoke-tests
418418
timeout: ((task-timeout))
419-
image: spring-boot-jdk14-ci-image
419+
image: spring-boot-jdk15-ci-image
420420
file: git-repo/ci/tasks/build-smoke-tests.yml
421421
params:
422422
<<: *gradle-enterprise-task-params
423423
- task: build-integration-tests
424424
timeout: ((task-timeout))
425-
image: spring-boot-jdk14-ci-image
425+
image: spring-boot-jdk15-ci-image
426426
file: git-repo/ci/tasks/build-integration-tests.yml
427427
params:
428428
<<: *gradle-enterprise-task-params
429429
- task: build-deployment-tests
430430
timeout: ((task-timeout))
431-
image: spring-boot-jdk14-ci-image
431+
image: spring-boot-jdk15-ci-image
432432
file: git-repo/ci/tasks/build-deployment-tests.yml
433433
params:
434434
<<: *gradle-enterprise-task-params
435435
on_failure:
436436
do:
437-
- put: repo-status-jdk14-build
437+
- put: repo-status-jdk15-build
438438
params: { state: "failure", commit: "git-repo" }
439439
- put: slack-alert
440440
params:
441441
<<: *slack-fail-params
442-
- put: repo-status-jdk14-build
442+
- put: repo-status-jdk15-build
443443
params: { state: "success", commit: "git-repo" }
444444
- put: slack-alert
445445
params:
@@ -638,7 +638,7 @@ jobs:
638638
body: generated-release-notes/release-notes.md
639639
groups:
640640
- name: "Build"
641-
jobs: ["build", "jdk11-build", "jdk14-build", "windows-build"]
641+
jobs: ["build", "jdk11-build", "jdk15-build", "windows-build"]
642642
- name: "Release"
643643
jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "sync-to-maven-central"]
644644
- name: "CI Images"

0 commit comments

Comments
 (0)