@@ -27,21 +27,23 @@ jobs:
2727 JF_ARTIFACTORY_SPRING : ${{ secrets.JF_ARTIFACTORY_SPRING }}
2828 - name : Configure JFrog Cli
2929 run : |
30- jfrog rt mvnc \
31- --server-id-deploy=repo.spring.io \
32- --repo-deploy-releases=libs-staging-local \
33- --repo-deploy-snapshots=libs-staging-local
30+ jf rt gradlec \
31+ --use-wrapper \
32+ --uses-plugin \
33+ --deploy-ivy-desc=false \
34+ --server-id-resolve repo.spring.io \
35+ --server-id-deploy repo.spring.io \
36+ --repo-resolve milestone \
37+ --repo-deploy libs-staging-local
3438 echo JFROG_CLI_BUILD_NAME=spring-shell-main-milestone >> $GITHUB_ENV
3539 echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
3640 - name : Configure Milestone Version
3741 run : |
38- jfrog rt mvn build-helper:parse-version versions:set \
39- -DprocessAllModules=true \
40- -DgenerateBackupPoms=false \
41- -Dartifactory.publish.artifacts=false \
42- -DnewVersion='${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}-${{ github.event.inputs.milestone }}' \
43- -B
44- echo PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
42+ snapshotVersion=$( awk -F '=' '$1 == "version" { print $2 }' gradle.properties )
43+ plainVersion=${snapshotVersion%-SNAPSHOT}
44+ milestoneVersion="$plainVersion-${{ github.event.inputs.milestone }}"
45+ sed -i "s/version=$snapshotVersion/version=$milestoneVersion/" gradle.properties
46+ echo PROJECT_VERSION=$milestoneVersion >> $GITHUB_ENV
4547 - name : Tag Release
4648 env :
4749 PROJECT_VERSION : ${{ env.PROJECT_VERSION }}
5557 env :
5658 DISABLE_SAMPLES : true
5759 run : |
58- jfrog rt build-clean
59- jfrog rt mvn clean install \
60- -DskipTests -U -B
61- jfrog rt build-publish
60+ jf rt gradle build distZip artifactoryPublish
61+ jf rt build-publish
6262 - name : Push Release
6363 env :
6464 PROJECT_VERSION : ${{ env.PROJECT_VERSION }}
@@ -85,15 +85,11 @@ jobs:
8585 JF_ARTIFACTORY_SPRING : ${{ secrets.JF_ARTIFACTORY_SPRING }}
8686 - name : Configure JFrog Cli
8787 run : |
88- jfrog rt mvnc \
89- --server-id-deploy=repo.spring.io \
90- --repo-deploy-releases=libs-staging-local \
91- --repo-deploy-snapshots=libs-staging-local
9288 echo JFROG_CLI_BUILD_NAME=spring-shell-main-milestone >> $GITHUB_ENV
9389 echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
9490 - name : Promote Build
9591 run : |
96- jfrog rt build-promote libs-milestone-local
92+ jf rt build-promote libs-milestone-local
9793
9894 ghrelease :
9995 runs-on : ubuntu-latest
0 commit comments