Skip to content

Commit d977694

Browse files
committed
Update Java version for compatibility tests in CI
This commit configures Java 20 for compatibility tests in our CI, replacing Java 19.
1 parent 24b359d commit d977694

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

ci/images/ci-image/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ RUN ./setup.sh
66

77
ENV JAVA_HOME /opt/openjdk/java17
88
ENV JDK17 /opt/openjdk/java17
9-
ENV JDK19 /opt/openjdk/java19
9+
ENV JDK20 /opt/openjdk/java20
1010

1111
ENV PATH $JAVA_HOME/bin:$PATH

ci/images/get-jdk-url.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ 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"
8+
java20)
9+
echo "https://github.com/bell-sw/Liberica/releases/download/20%2B37/bellsoft-jdk20+37-linux-amd64.tar.gz"
1010
;;
1111
*)
1212
echo $"Unknown java version"

ci/images/setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/c
2020

2121
mkdir -p /opt/openjdk
2222
pushd /opt/openjdk > /dev/null
23-
for jdk in java17 java19
23+
for jdk in java17 java20
2424
do
2525
JDK_URL=$( /get-jdk-url.sh $jdk )
2626
mkdir $jdk

ci/pipeline.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,14 @@ resources:
127127
access_token: ((github-ci-status-token))
128128
branch: ((branch))
129129
context: build
130-
- name: repo-status-jdk19-build
130+
- name: repo-status-jdk20-build
131131
type: github-status-resource
132132
icon: eye-check-outline
133133
source:
134134
repository: ((github-repo-name))
135135
access_token: ((github-ci-status-token))
136136
branch: ((branch))
137-
context: jdk19-build
137+
context: jdk20-build
138138
- name: slack-alert
139139
type: slack-notification
140140
icon: slack
@@ -231,15 +231,15 @@ jobs:
231231
"zip.type": "schema"
232232
get_params:
233233
threads: 8
234-
- name: jdk19-build
234+
- name: jdk20-build
235235
serial: true
236236
public: true
237237
plan:
238238
- get: ci-image
239239
- get: git-repo
240240
- get: every-morning
241241
trigger: true
242-
- put: repo-status-jdk19-build
242+
- put: repo-status-jdk20-build
243243
params: { state: "pending", commit: "git-repo" }
244244
- do:
245245
- task: check-project
@@ -248,16 +248,16 @@ jobs:
248248
privileged: true
249249
timeout: ((task-timeout))
250250
params:
251-
TEST_TOOLCHAIN: 19
251+
TEST_TOOLCHAIN: 20
252252
<<: *build-project-task-params
253253
on_failure:
254254
do:
255-
- put: repo-status-jdk19-build
255+
- put: repo-status-jdk20-build
256256
params: { state: "failure", commit: "git-repo" }
257257
- put: slack-alert
258258
params:
259259
<<: *slack-fail-params
260-
- put: repo-status-jdk19-build
260+
- put: repo-status-jdk20-build
261261
params: { state: "success", commit: "git-repo" }
262262
- name: build-pull-requests
263263
serial: true
@@ -441,7 +441,7 @@ jobs:
441441

442442
groups:
443443
- name: "builds"
444-
jobs: ["build", "jdk19-build"]
444+
jobs: ["build", "jdk20-build"]
445445
- name: "releases"
446446
jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
447447
- name: "ci-images"

spring-core/src/test/java/org/springframework/core/SpringCoreBlockHoundIntegrationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
* @author Sam Brannen
4848
* @since 5.2.4
4949
*/
50-
@DisabledOnJre(value= {JRE.JAVA_18, JRE.JAVA_19}, disabledReason = "BlockHound is not compatible with Java 18+")
50+
@DisabledOnJre(value= {JRE.JAVA_18, JRE.JAVA_19, JRE.JAVA_20}, disabledReason = "BlockHound is not compatible with Java 18+")
5151
class SpringCoreBlockHoundIntegrationTests {
5252

5353
@BeforeAll

0 commit comments

Comments
 (0)