Fix e2e macos configuration

Update to Spring Boot 3.3.6 Update to Commons-IO 2.18.0 Update JFrog CLI to use spring-cloud as server id.
spring-projects · Dec 10, 2024 · 668f2f3 · 668f2f3
1 parent 2ca6d6e
commit 668f2f3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -54,8 +54,8 @@ jobs:
             --use-wrapper \
             --uses-plugin \
             --deploy-ivy-desc=false \
-            --server-id-resolve repo.spring.io \
-            --server-id-deploy repo.spring.io \
+            --server-id-resolve spring-cloud \
+            --server-id-deploy spring-cloud \
             --repo-resolve snapshot \
             --repo-deploy snapshot
           echo JFROG_CLI_BUILD_NAME=spring-shell-33x >> $GITHUB_ENV

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -16,7 +16,7 @@ jobs:
             graal: latest
             musl: false
           - nickname: macos
-            os: macos-12
+            os: macos-latest
             graal: latest
             musl: false
           - nickname: linux
@@ -74,12 +74,14 @@ jobs:
             nickname: win
           # - os: windows-2019
           #   nickname: win
-          - os: macos-12
-            nickname: macos
           - os: macos-13
             nickname: macos
           - os: macos-14
             nickname: macos
+          - os: macos-15
+            nickname: macos
+          - os: ubuntu-24.04
+            nickname: linux
           - os: ubuntu-22.04
             nickname: linux
           - os: ubuntu-20.04

diff --git a/.github/workflows/release-ga.yml b/.github/workflows/release-ga.yml
@@ -29,8 +29,8 @@ jobs:
           --use-wrapper \
           --uses-plugin \
           --deploy-ivy-desc=false \
-          --server-id-resolve repo.spring.io \
-          --server-id-deploy repo.spring.io \
+          --server-id-resolve spring-cloud \
+          --server-id-deploy spring-cloud \
           --repo-resolve release \
           --repo-deploy libs-staging-local
         echo JFROG_CLI_BUILD_NAME=spring-shell-33x-release >> $GITHUB_ENV

diff --git a/.github/workflows/release-milestone.yml b/.github/workflows/release-milestone.yml
@@ -32,8 +32,8 @@ jobs:
           --use-wrapper \
           --uses-plugin \
           --deploy-ivy-desc=false \
-          --server-id-resolve repo.spring.io \
-          --server-id-deploy repo.spring.io \
+          --server-id-resolve spring-cloud \
+          --server-id-deploy spring-cloud \
           --repo-resolve milestone \
           --repo-deploy libs-staging-local
         echo JFROG_CLI_BUILD_NAME=spring-shell-33x-milestone >> $GITHUB_ENV

diff --git a/gradle.properties b/gradle.properties
@@ -1,9 +1,9 @@
 version=3.3.4-SNAPSHOT
-springBootVersion=3.3.4
+springBootVersion=3.3.6
 nativeBuildToolsVersion=0.10.1
-commonsIoVersion=2.11.0
+commonsIoVersion=2.18.0
 jlineVersion=3.26.3
-st4Version=4.3.3
+st4Version=4.3.4
 jimfsVersion=1.2
 gradleEnterpriseVersion=3.16.2
 springGeConventionsVersion=0.0.15