Merge branch '6.1.x'

spring-projects · Feb 21, 2024 · 2a1b30d · 2a1b30d
2 parents 734fc47 + f440d87
commit 2a1b30d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile
@@ -7,6 +7,6 @@ RUN ./setup.sh
 ENV JAVA_HOME /opt/openjdk/java17
 ENV JDK17 /opt/openjdk/java17
 ENV JDK21 /opt/openjdk/java21
-ENV JDK22 /opt/openjdk/java22
+ENV JDK23 /opt/openjdk/java23
 
 ENV PATH $JAVA_HOME/bin:$PATH
diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh
@@ -8,8 +8,8 @@ case "$1" in
 	java21)
 		echo "https://github.com/bell-sw/Liberica/releases/download/21.0.2%2B14/bellsoft-jdk21.0.2+14-linux-amd64.tar.gz"
 	;;
-	java22)
-		echo "https://download.java.net/java/GA/jdk22/830ec9fcccef480bb3e73fb7ecafe059/36/GPL/openjdk-22_linux-x64_bin.tar.gz"
+	java23)
+		echo "https://download.java.net/java/early_access/jdk23/10/GPL/openjdk-23-ea+10_linux-x64_bin.tar.gz"
 	;;
 	*)
 		echo $"Unknown java version"

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
@@ -121,14 +121,14 @@ resources:
     access_token: ((github-ci-status-token))
     branch: ((branch))
     context: jdk21-build
-- name: repo-status-jdk22-build
+- name: repo-status-jdk23-build
   type: github-status-resource
   icon: eye-check-outline
   source:
     repository: ((github-repo-name))
     access_token: ((github-ci-status-token))
     branch: ((branch))
-    context: jdk22-build
+    context: jdk23-build
 - name: slack-alert
   type: slack-notification
   icon: slack
@@ -249,15 +249,15 @@ jobs:
               <<: *slack-fail-params
     - put: repo-status-jdk21-build
       params: { state: "success", commit: "git-repo" }
-- name: jdk22-build
+- name: jdk23-build
   serial: true
   public: true
   plan:
     - get: ci-image
     - get: git-repo
     - get: every-morning
-      trigger: true
-    - put: repo-status-jdk22-build
+      trigger: false
+    - put: repo-status-jdk23-build
       params: { state: "pending", commit: "git-repo" }
     - do:
         - task: check-project
@@ -266,16 +266,16 @@ jobs:
           privileged: true
           timeout: ((task-timeout))
           params:
-            TEST_TOOLCHAIN: 22
+            TEST_TOOLCHAIN: 23
             <<: *build-project-task-params
       on_failure:
         do:
-          - put: repo-status-jdk22-build
+          - put: repo-status-jdk23-build
             params: { state: "failure", commit: "git-repo" }
           - put: slack-alert
             params:
               <<: *slack-fail-params
-    - put: repo-status-jdk22-build
+    - put: repo-status-jdk23-build
       params: { state: "success", commit: "git-repo" }
 - name: stage-milestone
   serial: true
@@ -428,7 +428,7 @@ jobs:
 
 groups:
 - name: "builds"
-  jobs: ["build", "jdk21-build", "jdk22-build"]
+  jobs: ["build", "jdk21-build", "jdk23-build"]
 - name: "releases"
   jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
 - name: "ci-images"

diff --git a/ci/scripts/build-project.sh b/ci/scripts/build-project.sh
@@ -5,6 +5,6 @@ source $(dirname $0)/common.sh
 repository=$(pwd)/distribution-repository
 
 pushd git-repo > /dev/null
-./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17,JDK21,JDK22 \
+./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17,JDK21,JDK23 \
   --no-daemon --max-workers=4 -PdeploymentRepository=${repository} build publishAllPublicationsToDeploymentRepository
 popd > /dev/null
diff --git a/ci/scripts/check-project.sh b/ci/scripts/check-project.sh
@@ -4,6 +4,6 @@ set -e
 source $(dirname $0)/common.sh
 
 pushd git-repo > /dev/null
-./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17,JDK21,JDK22 \
+./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17,JDK21,JDK23 \
   -PmainToolchain=${MAIN_TOOLCHAIN} -PtestToolchain=${TEST_TOOLCHAIN} --no-daemon --max-workers=4 check antora
 popd > /dev/null