diff --git a/.github/workflows/build-snapshot-worker.yml b/.github/workflows/build-snapshot-worker.yml index 757b258cd6..a8604de2f5 100644 --- a/.github/workflows/build-snapshot-worker.yml +++ b/.github/workflows/build-snapshot-worker.yml @@ -25,11 +25,10 @@ jobs: with: maven-version: 3.8.8 maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/' - - uses: jfrog/setup-jfrog-cli@v1 - with: - version: 1.46.4 + - uses: jfrog/setup-jfrog-cli@v3 env: - JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} + JF_URL: 'https://repo.spring.io' + JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} - uses: actions/cache@v3 with: path: ~/.m2/repository @@ -44,8 +43,8 @@ jobs: - name: Configure JFrog Cli run: | jfrog rt mvnc \ - --server-id-resolve=repo.spring.io \ - --server-id-deploy=repo.spring.io \ + --server-id-resolve=${{ vars.JF_SERVER_ID }} \ + --server-id-deploy=${{ vars.JF_SERVER_ID }} \ --repo-resolve-releases=libs-milestone \ --repo-resolve-snapshots=libs-snapshot \ --repo-deploy-releases=libs-release-local \ @@ -122,11 +121,10 @@ jobs: with: maven-version: 3.8.8 maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/' - - uses: jfrog/setup-jfrog-cli@v1 - with: - version: 1.46.4 + - uses: jfrog/setup-jfrog-cli@v3 env: - JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} + JF_URL: 'https://repo.spring.io' + JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} - name: Login dockerhub uses: docker/login-action@v3 with: @@ -135,8 +133,8 @@ jobs: - name: Configure JFrog Cli run: | jfrog rt mvnc \ - --server-id-resolve=repo.spring.io \ - --server-id-deploy=repo.spring.io \ + --server-id-resolve=${{ vars.JF_SERVER_ID }} \ + --server-id-deploy=${{ vars.JF_SERVER_ID }} \ --repo-resolve-releases=libs-milestone \ --repo-resolve-snapshots=libs-snapshot \ --repo-deploy-releases=libs-release-local \ diff --git a/.github/workflows/cental-sync.yml b/.github/workflows/cental-sync.yml index 4f65a55cbe..aa8ca0ba92 100644 --- a/.github/workflows/cental-sync.yml +++ b/.github/workflows/cental-sync.yml @@ -19,11 +19,10 @@ jobs: - uses: actions/checkout@v4 # Setup jfrog cli - - uses: jfrog/setup-jfrog-cli@v1 - with: - version: 1.46.4 + - uses: jfrog/setup-jfrog-cli@v3 env: - JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} + JF_URL: 'https://repo.spring.io' + JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} # Extract build id from input - name: Extract Build Id diff --git a/.github/workflows/central-release.yml b/.github/workflows/central-release.yml index 4c768f6ef8..a31959454c 100644 --- a/.github/workflows/central-release.yml +++ b/.github/workflows/central-release.yml @@ -17,11 +17,10 @@ jobs: - uses: actions/checkout@v4 # Setup jfrog cli - - uses: jfrog/setup-jfrog-cli@v1 - with: - version: 1.46.4 + - uses: jfrog/setup-jfrog-cli@v3 env: - JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} + JF_URL: 'https://repo.spring.io' + JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} # zoo extract and ensure - name: Extract Zoo Context Properties uses: jvalkeal/build-zoo-handler@v0.0.4 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2972178dbe..f3f16e9f97 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,11 +44,10 @@ jobs: maven-version: 3.8.8 maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/' # jfrog cli - - uses: jfrog/setup-jfrog-cli@v1 - with: - version: 1.46.4 + - uses: jfrog/setup-jfrog-cli@v3 env: - JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} + JF_URL: 'https://repo.spring.io' + JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} - name: Login dockerhub uses: docker/login-action@v3 with: @@ -58,8 +57,8 @@ jobs: - name: Configure JFrog Cli run: | jfrog rt mvnc \ - --server-id-resolve=repo.spring.io \ - --server-id-deploy=repo.spring.io \ + --server-id-resolve=${{ vars.JF_SERVER_ID }} \ + --server-id-deploy=${{ vars.JF_SERVER_ID }} \ --repo-resolve-releases=libs-milestone \ --repo-resolve-snapshots=libs-snapshot \ --repo-deploy-releases=libs-release-local \ @@ -134,11 +133,10 @@ jobs: with: maven-version: 3.8.8 maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/' - - uses: jfrog/setup-jfrog-cli@v1 - with: - version: 1.46.4 + - uses: jfrog/setup-jfrog-cli@v3 env: - JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} + JF_URL: 'https://repo.spring.io' + JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} - name: Login dockerhub uses: docker/login-action@v3 with: @@ -147,8 +145,8 @@ jobs: - name: Configure JFrog Cli run: | jfrog rt mvnc \ - --server-id-resolve=repo.spring.io \ - --server-id-deploy=repo.spring.io \ + --server-id-resolve=${{ vars.JF_SERVER_ID }} \ + --server-id-deploy=${{ vars.JF_SERVER_ID }} \ --repo-resolve-releases=libs-milestone \ --repo-resolve-snapshots=libs-snapshot \ --repo-deploy-releases=libs-release-local \ diff --git a/.github/workflows/milestone-worker.yml b/.github/workflows/milestone-worker.yml index 36256d5186..2e8281e038 100644 --- a/.github/workflows/milestone-worker.yml +++ b/.github/workflows/milestone-worker.yml @@ -24,11 +24,10 @@ jobs: with: maven-version: 3.8.8 maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/' - - uses: jfrog/setup-jfrog-cli@v1 - with: - version: 1.46.4 + - uses: jfrog/setup-jfrog-cli@v3 env: - JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} + JF_URL: 'https://repo.spring.io' + JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} - uses: actions/cache@v3 with: path: ~/.m2/repository @@ -40,8 +39,8 @@ jobs: - name: Configure JFrog Cli run: | jfrog rt mvnc \ - --server-id-resolve=repo.spring.io \ - --server-id-deploy=repo.spring.io \ + --server-id-resolve=${{ vars.JF_SERVER_ID }} \ + --server-id-deploy=${{ vars.JF_SERVER_ID }} \ --repo-resolve-releases=libs-milestone \ --repo-resolve-snapshots=libs-snapshot \ --repo-deploy-releases=libs-milestone-local \ diff --git a/.github/workflows/next-dev-version-worker.yml b/.github/workflows/next-dev-version-worker.yml index 1b225f0c59..2b39130b9d 100644 --- a/.github/workflows/next-dev-version-worker.yml +++ b/.github/workflows/next-dev-version-worker.yml @@ -24,11 +24,10 @@ jobs: with: maven-version: 3.8.8 maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/' - - uses: jfrog/setup-jfrog-cli@v1 - with: - version: 1.46.4 + - uses: jfrog/setup-jfrog-cli@v3 env: - JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} + JF_URL: 'https://repo.spring.io' + JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} # cache maven .m2 - uses: actions/cache@v3 @@ -42,8 +41,8 @@ jobs: - name: Configure JFrog Cli run: | jfrog rt mvnc \ - --server-id-resolve=repo.spring.io \ - --server-id-deploy=repo.spring.io \ + --server-id-resolve=${{ vars.JF_SERVER_ID }} \ + --server-id-deploy=${{ vars.JF_SERVER_ID }} \ --repo-resolve-releases=libs-milestone \ --repo-resolve-snapshots=libs-snapshot \ --repo-deploy-releases=libs-release-local \ diff --git a/.github/workflows/promote-milestone.yml b/.github/workflows/promote-milestone.yml index c53cf84be7..506ba2f317 100644 --- a/.github/workflows/promote-milestone.yml +++ b/.github/workflows/promote-milestone.yml @@ -14,11 +14,10 @@ jobs: steps: # need repo to push release branch and a tag - uses: actions/checkout@v4 - - uses: jfrog/setup-jfrog-cli@v1 - with: - version: 1.46.4 + - uses: jfrog/setup-jfrog-cli@v3 env: - JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} + JF_URL: 'https://repo.spring.io' + JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} # zoo extract and ensure - name: Extract Zoo Context Properties uses: jvalkeal/build-zoo-handler@v0.0.4 diff --git a/.github/workflows/promote-release.yml b/.github/workflows/promote-release.yml index e1b65530a2..5b46a7b461 100644 --- a/.github/workflows/promote-release.yml +++ b/.github/workflows/promote-release.yml @@ -14,11 +14,10 @@ jobs: steps: # need repo to push release branch and a tag - uses: actions/checkout@v4 - - uses: jfrog/setup-jfrog-cli@v1 - with: - version: 1.46.4 + - uses: jfrog/setup-jfrog-cli@v3 env: - JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} + JF_URL: 'https://repo.spring.io' + JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} # zoo extract and ensure - name: Extract Zoo Context Properties uses: jvalkeal/build-zoo-handler@v0.0.4 diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml index 33a72e0d5e..3bf3c6dc78 100644 --- a/.github/workflows/publish-docs.yml +++ b/.github/workflows/publish-docs.yml @@ -20,11 +20,10 @@ jobs: with: maven-version: 3.8.8 maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/' - - uses: jfrog/setup-jfrog-cli@v1 - with: - version: 1.46.4 + - uses: jfrog/setup-jfrog-cli@v3 env: - JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} + JF_URL: 'https://repo.spring.io' + JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} - uses: actions/cache@v3 with: path: ~/.m2/repository @@ -36,8 +35,8 @@ jobs: - name: Configure JFrog Cli run: | jfrog rt mvnc \ - --server-id-resolve=repo.spring.io \ - --server-id-deploy=repo.spring.io \ + --server-id-resolve=${{ vars.JF_SERVER_ID }} \ + --server-id-deploy=${{ vars.JF_SERVER_ID }} \ --repo-resolve-releases=libs-release-staging \ --repo-resolve-snapshots=libs-snapshot \ --repo-deploy-releases=libs-staging-local \ diff --git a/.github/workflows/release-worker.yml b/.github/workflows/release-worker.yml index 228fe1f18e..45b6429229 100644 --- a/.github/workflows/release-worker.yml +++ b/.github/workflows/release-worker.yml @@ -24,11 +24,10 @@ jobs: with: maven-version: 3.8.8 maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/' - - uses: jfrog/setup-jfrog-cli@v1 - with: - version: 1.46.4 + - uses: jfrog/setup-jfrog-cli@v3 env: - JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} + JF_URL: 'https://repo.spring.io' + JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} - uses: actions/cache@v3 with: path: ~/.m2/repository @@ -40,8 +39,8 @@ jobs: - name: Configure JFrog Cli run: | jfrog rt mvnc \ - --server-id-resolve=repo.spring.io \ - --server-id-deploy=repo.spring.io \ + --server-id-resolve=${{ vars.JF_SERVER_ID }} \ + --server-id-deploy=${{ vars.JF_SERVER_ID }} \ --repo-resolve-releases=libs-release-staging \ --repo-resolve-snapshots=libs-snapshot \ --repo-deploy-releases=libs-staging-local \