[CI] Update jfrog-cli version

spring-cloud · Oct 3, 2024 · 86c3d15 · 86c3d15
1 parent 35335d6
commit 86c3d15
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 27 deletions.
diff --git a/.github/workflows/build-snapshot-worker.yml b/.github/workflows/build-snapshot-worker.yml
@@ -59,8 +59,8 @@ jobs:
       run: |
         ./mvnw --help
         ./spring-cloud-dataflow-package/set-package-version.sh
-        jfrog rt mvn -s .settings.xml install -Pfull,docs -B
-        jfrog rt mvn -s .settings.xml install -pl spring-cloud-dataflow-package -B
+        jfrog mvn -s .settings.xml install -Pfull,docs -B
+        jfrog mvn -s .settings.xml install -pl spring-cloud-dataflow-package -B
         jfrog rt build-publish        
         PROJECT_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -o -q -DforceStdout)
         echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$PROJECT_VERSION >> $GITHUB_ENV
@@ -139,9 +139,9 @@ jobs:
         shell: bash
         timeout-minutes: 75
         run: |
-          jfrog rt mvn clean install -s .settings.xml -DskipTests -am -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server
+          jfrog mvn clean install -s .settings.xml -DskipTests -am -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server
           export ENABLE_${{ matrix.db }}=true
-          jfrog rt mvn test -s .settings.xml -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server -Dgroups=${{ matrix.db }}
+          jfrog mvn test -s .settings.xml -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server -Dgroups=${{ matrix.db }}
       - name: Test Report
         uses: dorny/test-reporter@v1
         if: ${{ success() || failure() }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -64,8 +64,8 @@ jobs:
       timeout-minutes: 75
       run: |
         ./spring-cloud-dataflow-package/set-package-version.sh
-        jfrog rt mvn -s .settings.xml install -Pfull,docs -B
-        jfrog rt mvn -s .settings.xml install -pl spring-cloud-dataflow-package -B
+        jfrog mvn -s .settings.xml install -Pfull,docs -B
+        jfrog mvn -s .settings.xml install -pl spring-cloud-dataflow-package -B
         jfrog rt build-publish
         export JFROG_CLI_BUILD_NAME="${JFROG_CLI_BUILD_NAME/spring-cloud-dataflow/spring-cloud-skipper}"
         PROJECT_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -o -q -DforceStdout)
@@ -142,9 +142,9 @@ jobs:
       shell: bash
       timeout-minutes: 75
       run: |                        
-        jfrog rt mvn clean install -s .settings.xml -DskipTests -am -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server
+        jfrog mvn clean install -s .settings.xml -DskipTests -am -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server
         export ENABLE_${{ matrix.db }}=true
-        jfrog rt mvn test -s .settings.xml -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server -Dgroups=${{ matrix.db }}
+        jfrog mvn test -s .settings.xml -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server -Dgroups=${{ matrix.db }}
     - name: Test Report
       uses: dorny/test-reporter@v1
       if: ${{ success() || failure() }}

diff --git a/.github/workflows/milestone-worker.yml b/.github/workflows/milestone-worker.yml
@@ -60,7 +60,7 @@ jobs:
           BUILD_ZOO_HANDLER_spring_cloud_dataflow_ui_version
     - name: Build and Publish
       run: |
-        jfrog rt mvn build-helper:parse-version versions:set \
+        jfrog mvn build-helper:parse-version versions:set \
           -gs .github/settings.xml \
           -Pstagingmilestone \
           -DprocessAllModules=true \
@@ -71,21 +71,21 @@ jobs:
         BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$(./mvnw help:evaluate -Dexpression=project.version -o -q -DforceStdout) >> $GITHUB_ENV
         echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$BUILD_ZOO_HANDLER_spring_cloud_dataflow_version >> $GITHUB_ENV
         echo "::notice ::set dataflow.version=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_version}"        
-        jfrog rt mvn versions:set-property \
+        jfrog mvn versions:set-property \
           -gs .github/settings.xml \
           -Pstagingmilestone \
           -DgenerateBackupPoms=false \
           -Dproperty=dataflow.version \
           -DnewVersion=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_version} \
           -B        
-        jfrog rt mvn versions:set-property \
+        jfrog mvn versions:set-property \
           -gs .github/settings.xml \
           -Pstagingmilestone \
           -DgenerateBackupPoms=false \
           -Dproperty=spring-cloud-deployer.version \
           -DnewVersion=${BUILD_ZOO_HANDLER_spring_cloud_deployer_version} \
           -B
-        jfrog rt mvn versions:set-property \
+        jfrog mvn versions:set-property \
           -gs .github/settings.xml \
           -Pstagingmilestone \
           -DgenerateBackupPoms=false \
@@ -94,7 +94,7 @@ jobs:
           -B
         jfrog rt build-clean
         ./spring-cloud-dataflow-package/set-package-version.sh
-        jfrog rt mvn -gs .github/settings.xml -Pstagingmilestone,full,deploymentfiles,docs -B install -DskipTests 
+        jfrog mvn -gs .github/settings.xml -Pstagingmilestone,full,deploymentfiles,docs -B install -DskipTests 
         jfrog rt build-publish
         PROJECT_VERSION=$(./mvnw -gs .github/settings.xml -Pstagingmilestone help:evaluate -Dexpression=project.version -o -q -DforceStdout)
         echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$PROJECT_VERSION >> $GITHUB_ENV

diff --git a/.github/workflows/next-dev-version-worker.yml b/.github/workflows/next-dev-version-worker.yml
@@ -59,7 +59,7 @@ jobs:
     # build and publish to configured target
     - name: Build and Publish
       run: |
-        jfrog rt mvn build-helper:parse-version versions:set \
+        jfrog mvn build-helper:parse-version versions:set \
           -DprocessAllModules=true \
           -DgenerateBackupPoms=false \
           -Dartifactory.publish.artifacts=false \
@@ -68,25 +68,25 @@ jobs:
         BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$(./mvnw help:evaluate -Dexpression=project.version -o -q -DforceStdout)
         echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$BUILD_ZOO_HANDLER_spring_cloud_dataflow_version >> $GITHUB_ENV
         echo "::notice ::set dataflow.version=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_version}"        
-        jfrog rt mvn versions:set-property \
+        jfrog mvn versions:set-property \
           -DgenerateBackupPoms=false \
           -Dproperty=dataflow.version \
           -DnewVersion=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_version} \
           -B        
-        jfrog rt mvn versions:set-property \
+        jfrog mvn versions:set-property \
           -DgenerateBackupPoms=false \
           -Dproperty=spring-cloud-deployer.version \
           -DnewVersion=${BUILD_ZOO_HANDLER_spring_cloud_deployer_version} \
           -B
-        jfrog rt mvn versions:set-property \
+        jfrog mvn versions:set-property \
           -DgenerateBackupPoms=false \
           -Dproperty=spring-cloud-dataflow-ui.version \
           -DnewVersion=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_ui_version} \
           -B
         jfrog rt build-clean
         ./mvnw clean
         ./spring-cloud-dataflow-package/set-package-version.sh
-        jfrog rt mvn -s .settings.xml install -DskipTests -B         
+        jfrog mvn -s .settings.xml install -DskipTests -B         
         jfrog rt build-publish
         echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-main-ndv >> $GITHUB_ENV
         echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildnumber=$GITHUB_RUN_NUMBER >> $GITHUB_ENV

diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
@@ -47,23 +47,23 @@ jobs:
 #       build and publish to configured target
       - name: Build and Publish
         run: |
-          jfrog rt mvn build-helper:parse-version versions:set \
+          jfrog mvn build-helper:parse-version versions:set \
             -gs .github/settings.xml \
             -DskipResolution=true \
             -DprocessAllModules=true \
             -DgenerateBackupPoms=false \
             -Dartifactory.publish.artifacts=false \
             -DnewVersion=${{ inputs.version }} \
             -B          
-          jfrog rt mvn versions:set-property \
+          jfrog mvn versions:set-property \
             -gs .github/settings.xml \
             -Pstagingrelease \
             -DskipResolution=true \
             -DgenerateBackupPoms=false \
             -Dproperty=dataflow.version \
             -DnewVersion=${{ inputs.version }} \
             -B
-          jfrog rt mvn versions:set-property \
+          jfrog mvn versions:set-property \
             -gs .github/settings.xml \
             -Pstagingrelease \
             -DskipResolution=true \
@@ -80,7 +80,7 @@ jobs:
           ./spring-cloud-dataflow-package/set-package-version.sh
           echo "::notice ::install"
           ./mvnw -gs .github/settings.xml -am -pl :spring-cloud-skipper-server-core install -DskipTests -T 1C
-          jfrog rt mvn -gs .github/settings.xml \
+          jfrog mvn -gs .github/settings.xml \
             -Pstagingrelease,full,deploymentfiles,docs \
             -pl :spring-cloud-dataflow-classic-docs,:spring-cloud-dataflow-docs,:spring-cloud-skipper-docs \
             -B install -DskipTests

diff --git a/.github/workflows/release-worker.yml b/.github/workflows/release-worker.yml
@@ -60,7 +60,7 @@ jobs:
 #       build and publish to configured target
       - name: Build and Publish
         run: |
-          jfrog rt mvn build-helper:parse-version versions:set \
+          jfrog mvn build-helper:parse-version versions:set \
             -gs .github/settings.xml \
             -Pstagingrelease \
             -DskipResolution=true \
@@ -72,7 +72,7 @@ jobs:
           BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$(./mvnw help:evaluate -Dexpression=project.version -o -q -DforceStdout)
           echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$BUILD_ZOO_HANDLER_spring_cloud_dataflow_version >> $GITHUB_ENV
           echo "::notice ::set dataflow.version=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_version}"
-          jfrog rt mvn versions:set-property \
+          jfrog mvn versions:set-property \
             -gs .github/settings.xml \
             -Pstagingrelease \
             -DskipResolution=true \
@@ -81,7 +81,7 @@ jobs:
             -DnewVersion=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_version} \
             -B             
           echo "::notice ::set spring-cloud-deployer.version=${BUILD_ZOO_HANDLER_spring_cloud_deployer_version}"
-          jfrog rt mvn versions:set-property \
+          jfrog mvn versions:set-property \
             -gs .github/settings.xml \
             -Pstagingrelease \
             -DskipResolution=true \
@@ -90,7 +90,7 @@ jobs:
             -DnewVersion=${BUILD_ZOO_HANDLER_spring_cloud_deployer_version} \
             -B
           echo "::notice ::set spring-cloud-dataflow-ui.version=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_ui_version}"
-          jfrog rt mvn versions:set-property \
+          jfrog mvn versions:set-property \
             -gs .github/settings.xml \
             -DskipResolution=true \
             -Pstagingrelease \
@@ -103,7 +103,7 @@ jobs:
           echo "::notice ::set-package-version"
           ./spring-cloud-dataflow-package/set-package-version.sh
           echo "::notice ::install"
-          jfrog rt mvn -gs .github/settings.xml -Pstagingrelease,full,deploymentfiles,docs -B install -DskipTests
+          jfrog mvn -gs .github/settings.xml -Pstagingrelease,full,deploymentfiles,docs -B install -DskipTests
           echo "::notice ::build-publish"
           jfrog rt build-publish
           PROJECT_VERSION=$(./mvnw -gs .github/settings.xml -Pstagingrelease help:evaluate -Dexpression=project.version -o -q -DforceStdout)