Skip to content

Commit 668f2f3

Browse files
author
Corneil du Plessis
committed
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.
1 parent 2ca6d6e commit 668f2f3

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ jobs:
5454
--use-wrapper \
5555
--uses-plugin \
5656
--deploy-ivy-desc=false \
57-
--server-id-resolve repo.spring.io \
58-
--server-id-deploy repo.spring.io \
57+
--server-id-resolve spring-cloud \
58+
--server-id-deploy spring-cloud \
5959
--repo-resolve snapshot \
6060
--repo-deploy snapshot
6161
echo JFROG_CLI_BUILD_NAME=spring-shell-33x >> $GITHUB_ENV

.github/workflows/e2e.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
graal: latest
1717
musl: false
1818
- nickname: macos
19-
os: macos-12
19+
os: macos-latest
2020
graal: latest
2121
musl: false
2222
- nickname: linux
@@ -74,12 +74,14 @@ jobs:
7474
nickname: win
7575
# - os: windows-2019
7676
# nickname: win
77-
- os: macos-12
78-
nickname: macos
7977
- os: macos-13
8078
nickname: macos
8179
- os: macos-14
8280
nickname: macos
81+
- os: macos-15
82+
nickname: macos
83+
- os: ubuntu-24.04
84+
nickname: linux
8385
- os: ubuntu-22.04
8486
nickname: linux
8587
- os: ubuntu-20.04

.github/workflows/release-ga.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
--use-wrapper \
3030
--uses-plugin \
3131
--deploy-ivy-desc=false \
32-
--server-id-resolve repo.spring.io \
33-
--server-id-deploy repo.spring.io \
32+
--server-id-resolve spring-cloud \
33+
--server-id-deploy spring-cloud \
3434
--repo-resolve release \
3535
--repo-deploy libs-staging-local
3636
echo JFROG_CLI_BUILD_NAME=spring-shell-33x-release >> $GITHUB_ENV

.github/workflows/release-milestone.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
--use-wrapper \
3333
--uses-plugin \
3434
--deploy-ivy-desc=false \
35-
--server-id-resolve repo.spring.io \
36-
--server-id-deploy repo.spring.io \
35+
--server-id-resolve spring-cloud \
36+
--server-id-deploy spring-cloud \
3737
--repo-resolve milestone \
3838
--repo-deploy libs-staging-local
3939
echo JFROG_CLI_BUILD_NAME=spring-shell-33x-milestone >> $GITHUB_ENV

gradle.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
version=3.3.4-SNAPSHOT
2-
springBootVersion=3.3.4
2+
springBootVersion=3.3.6
33
nativeBuildToolsVersion=0.10.1
4-
commonsIoVersion=2.11.0
4+
commonsIoVersion=2.18.0
55
jlineVersion=3.26.3
6-
st4Version=4.3.3
6+
st4Version=4.3.4
77
jimfsVersion=1.2
88
gradleEnterpriseVersion=3.16.2
99
springGeConventionsVersion=0.0.15

0 commit comments

Comments
 (0)