root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Update Java version for compatibility tests in CI 

This commit configures Java 20 for compatibility tests in our CI,
replacing Java 19.
This commit is contained in:
Brian Clozel 2023-03-23 15:47:06 +01:00
parent 24b359d519
commit d9776941bf
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/images/ci-image/Dockerfile
View File

@ -6,6 +6,6 @@ RUN ./setup.sh
ENV JAVA_HOME /opt/openjdk/java17 ENV JAVA_HOME /opt/openjdk/java17
ENV JDK17 /opt/openjdk/java17 ENV JDK17 /opt/openjdk/java17
ENV JDK19 /opt/openjdk/java19 ENV JDK20 /opt/openjdk/java20
ENV PATH $JAVA_HOME/bin:$PATH ENV PATH $JAVA_HOME/bin:$PATH

4
ci/images/get-jdk-url.sh
View File

@ -5,8 +5,8 @@ case "$1" in
java17) java17)
echo "https://github.com/bell-sw/Liberica/releases/download/17.0.6+10/bellsoft-jdk17.0.6+10-linux-amd64.tar.gz" echo "https://github.com/bell-sw/Liberica/releases/download/17.0.6+10/bellsoft-jdk17.0.6+10-linux-amd64.tar.gz"
;; ;;
java19) java20)
echo "https://github.com/bell-sw/Liberica/releases/download/19.0.2+9/bellsoft-jdk19.0.2+9-linux-amd64.tar.gz" echo "https://github.com/bell-sw/Liberica/releases/download/20%2B37/bellsoft-jdk20+37-linux-amd64.tar.gz"
;; ;;
*) *)
echo $"Unknown java version" echo $"Unknown java version"

2
ci/images/setup.sh
View File

@ -20,7 +20,7 @@ curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/c
mkdir -p /opt/openjdk mkdir -p /opt/openjdk
pushd /opt/openjdk > /dev/null pushd /opt/openjdk > /dev/null
for jdk in java17 java19 for jdk in java17 java20
do do
JDK_URL=$( /get-jdk-url.sh $jdk ) JDK_URL=$( /get-jdk-url.sh $jdk )
mkdir $jdk mkdir $jdk

16
ci/pipeline.yml
View File

@ -127,14 +127,14 @@ resources:
access_token: ((github-ci-status-token)) access_token: ((github-ci-status-token))
branch: ((branch)) branch: ((branch))
context: build context: build
- name: repo-status-jdk19-build - name: repo-status-jdk20-build
type: github-status-resource type: github-status-resource
icon: eye-check-outline icon: eye-check-outline
source: source:
repository: ((github-repo-name)) repository: ((github-repo-name))
access_token: ((github-ci-status-token)) access_token: ((github-ci-status-token))
branch: ((branch)) branch: ((branch))
context: jdk19-build context: jdk20-build
- name: slack-alert - name: slack-alert
type: slack-notification type: slack-notification
icon: slack icon: slack
@ -231,7 +231,7 @@ jobs:
"zip.type": "schema" "zip.type": "schema"
get_params: get_params:
threads: 8 threads: 8
- name: jdk19-build - name: jdk20-build
serial: true serial: true
public: true public: true
plan: plan:
@ -239,7 +239,7 @@ jobs:
- get: git-repo - get: git-repo
- get: every-morning - get: every-morning
trigger: true trigger: true
- put: repo-status-jdk19-build - put: repo-status-jdk20-build
params: { state: "pending", commit: "git-repo" } params: { state: "pending", commit: "git-repo" }
- do: - do:
- task: check-project - task: check-project
@ -248,16 +248,16 @@ jobs:
privileged: true privileged: true
timeout: ((task-timeout)) timeout: ((task-timeout))
params: params:
TEST_TOOLCHAIN: 19 TEST_TOOLCHAIN: 20
<<: *build-project-task-params <<: *build-project-task-params
on_failure: on_failure:
do: do:
- put: repo-status-jdk19-build - put: repo-status-jdk20-build
params: { state: "failure", commit: "git-repo" } params: { state: "failure", commit: "git-repo" }
- put: slack-alert - put: slack-alert
params: params:
<<: *slack-fail-params <<: *slack-fail-params
- put: repo-status-jdk19-build - put: repo-status-jdk20-build
params: { state: "success", commit: "git-repo" } params: { state: "success", commit: "git-repo" }
- name: build-pull-requests - name: build-pull-requests
serial: true serial: true
@ -441,7 +441,7 @@ jobs:
groups: groups:
- name: "builds" - name: "builds"
jobs: ["build", "jdk19-build"] jobs: ["build", "jdk20-build"]
- name: "releases" - name: "releases"
jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"] jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
- name: "ci-images" - name: "ci-images"

2
spring-core/src/test/java/org/springframework/core/SpringCoreBlockHoundIntegrationTests.java
View File

@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
* @author Sam Brannen * @author Sam Brannen
* @since 5.2.4 * @since 5.2.4
*/ */
@DisabledOnJre(value= {JRE.JAVA_18, JRE.JAVA_19}, disabledReason = "BlockHound is not compatible with Java 18+") @DisabledOnJre(value= {JRE.JAVA_18, JRE.JAVA_19, JRE.JAVA_20}, disabledReason = "BlockHound is not compatible with Java 18+")
class SpringCoreBlockHoundIntegrationTests { class SpringCoreBlockHoundIntegrationTests {
@BeforeAll @BeforeAll