@@ -23,21 +23,22 @@ jobs:
2323 JF_ARTIFACTORY_SPRING : ${{ secrets.JF_ARTIFACTORY_SPRING }}
2424 - name : Configure JFrog Cli
2525 run : |
26- jfrog rt mvnc \
27- --server-id-deploy=repo.spring.io \
28- --repo-deploy-releases=libs-staging-local \
29- --repo-deploy-snapshots=libs-staging-local
26+ jf rt gradlec \
27+ --use-wrapper \
28+ --uses-plugin \
29+ --deploy-ivy-desc=false \
30+ --server-id-resolve repo.spring.io \
31+ --server-id-deploy repo.spring.io \
32+ --repo-resolve release \
33+ --repo-deploy libs-staging-local
3034 echo JFROG_CLI_BUILD_NAME=spring-shell-main-release >> $GITHUB_ENV
3135 echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
32- - name : Configure GA Version
36+ - name : Configure Release Version
3337 run : |
34- jfrog rt mvn build-helper:parse-version versions:set \
35- -DprocessAllModules=true \
36- -DgenerateBackupPoms=false \
37- -Dartifactory.publish.artifacts=false \
38- -DnewVersion='${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}' \
39- -B
40- echo PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
38+ snapshotVersion=$( awk -F '=' '$1 == "version" { print $2 }' gradle.properties )
39+ plainVersion=${snapshotVersion%-SNAPSHOT}
40+ sed -i "s/version=$snapshotVersion/version=$plainVersion/" gradle.properties
41+ echo PROJECT_VERSION=$plainVersion >> $GITHUB_ENV
4142 - name : Tag Release
4243 env :
4344 PROJECT_VERSION : ${{ env.PROJECT_VERSION }}
5152 env :
5253 DISABLE_SAMPLES : true
5354 run : |
54- jfrog rt build-clean
55- jfrog rt mvn clean install \
56- -DskipTests -U -B
57- jfrog rt build-publish
55+ jf rt gradle build distZip artifactoryPublish
56+ jf rt build-publish
5857 - name : Push Release
5958 env :
6059 PROJECT_VERSION : ${{ env.PROJECT_VERSION }}
@@ -81,15 +80,11 @@ jobs:
8180 JF_ARTIFACTORY_SPRING : ${{ secrets.JF_ARTIFACTORY_SPRING }}
8281 - name : Configure JFrog Cli
8382 run : |
84- jfrog rt mvnc \
85- --server-id-deploy=repo.spring.io \
86- --repo-deploy-releases=libs-staging-local \
87- --repo-deploy-snapshots=libs-staging-local
8883 echo JFROG_CLI_BUILD_NAME=spring-shell-main-release >> $GITHUB_ENV
8984 echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
9085 - name : Promote Build
9186 run : |
92- jfrog rt build-promote libs-release-local
87+ jf rt build-promote libs-release-local
9388
9489 ghrelease :
9590 runs-on : ubuntu-latest
@@ -165,7 +160,7 @@ jobs:
165160 echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
166161 - name : Download Release Files
167162 run : |
168- jfrog rt download \
163+ jf rt download \
169164 --spec .github/release-files-spec.json \
170165 --spec-vars "buildname=$JFROG_CLI_BUILD_NAME;buildnumber=$JFROG_CLI_BUILD_NUMBER"
171166 - uses : jvalkeal/nexus-sync@v0
0 commit comments