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.
This commit is contained in:
Corneil du Plessis
2024-12-10 13:43:07 +02:00
parent 2ca6d6e0d9
commit 668f2f3043
5 changed files with 14 additions and 12 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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