From 36aa75cd7d28c1ef2884dbdc5a0d59eaa3e63ba7 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Tue, 31 Oct 2023 14:24:29 -0400
Subject: [PATCH] More GHAs improvements around Maven

---
 .../spring-artifactory-maven-release-staging.yml      | 11 ++++++-----
 .../workflows/spring-artifactory-maven-snapshot.yml   |  7 +++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/spring-artifactory-maven-release-staging.yml b/.github/workflows/spring-artifactory-maven-release-staging.yml
index 06a7c8c..3822c84 100644
--- a/.github/workflows/spring-artifactory-maven-release-staging.yml
+++ b/.github/workflows/spring-artifactory-maven-release-staging.yml
@@ -41,10 +41,11 @@ jobs:
       - name: Configure JFrog Cli
         run: |
           jf mvnc \
-            --server-id-resolve repo.spring.io \
-            --server-id-deploy repo.spring.io \
-            --repo-resolve-releases milestone \
-            --repo-deploy-releases libs-staging-local
+            --use-wrapper=true \
+            --repo-resolve-releases=libs-milestone \
+            --repo-resolve-snapshots=snapshot \
+            --repo-deploy-releases=libs-staging-local \
+            --repo-deploy-snapshots=libs-snapshot-local
           echo JFROG_CLI_BUILD_NAME=${{ github.event.repository.name }}-${{ inputs.releaseVersion }} >> $GITHUB_ENV
           echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
 
@@ -54,7 +55,7 @@ jobs:
 
       - name: Build and Publish
         run: |
-          jf mvn deploy ${{ inputs.mavenArgs }}
+          jf mvn install ${{ inputs.mavenArgs }}
           jf rt build-publish
 
       - name: Tag Release and Next Development Version
diff --git a/.github/workflows/spring-artifactory-maven-snapshot.yml b/.github/workflows/spring-artifactory-maven-snapshot.yml
index f156c0a..000ec54 100644
--- a/.github/workflows/spring-artifactory-maven-snapshot.yml
+++ b/.github/workflows/spring-artifactory-maven-snapshot.yml
@@ -4,7 +4,7 @@ on:
   workflow_call:
     inputs:
       mavenArgs:
-        description: 'Additional mvn command arguments: goals, plugins etc. The `deploy` is included.'
+        description: 'Additional mvn command arguments: goals, plugins etc. The `install` is included.'
         required: false
         type: string
 
@@ -32,8 +32,7 @@ jobs:
       - name: Configure JFrog Cli
         run: |
           jf mvnc \
-            --server-id-resolve=repo.spring.io \
-            --server-id-deploy=repo.spring.io \
+            --use-wrapper=true \
             --repo-resolve-releases=libs-milestone \
             --repo-resolve-snapshots=snapshot \
             --repo-deploy-releases=libs-milestone-local \
@@ -43,6 +42,6 @@ jobs:
 
       - name: Build and Publish
         run: |
-          jf mvn install deploy ${{ inputs.mavenArgs }}
+          jf mvn install ${{ inputs.mavenArgs }}
           jf rt build-publish