From eb68d6d8454a2e4154b89ad74bb551b52dd68da7 Mon Sep 17 00:00:00 2001
From: Artem Bilan <artem.bilan@broadcom.com>
Date: Fri, 15 Dec 2023 13:31:20 -0500
Subject: [PATCH] Fix verify-staged for Artifactory

The JFrog CLI does not add `--repo-resolve` to Gradle build
(unlike for Maven)

* Get rid of JFrog CLI
* Generate Gradle init script manually for our `libs-staging-local`
and use respective secrets for credentials

See more info in: https://github.com/jfrog/jfrog-cli/issues/2364
---
 .github/workflows/verify-staged-artifacts.yml | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/verify-staged-artifacts.yml b/.github/workflows/verify-staged-artifacts.yml
index de90f51855..cbe3b28f40 100644
--- a/.github/workflows/verify-staged-artifacts.yml
+++ b/.github/workflows/verify-staged-artifacts.yml
@@ -8,6 +8,13 @@ on:
         required: true
         type: string
 
+env:
+  GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
+  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
+  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
+  ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
+  ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+
 jobs:
   verify-staged-with-samples:
     runs-on: ubuntu-latest
@@ -19,31 +26,24 @@ jobs:
           repository: spring-projects/spring-integration
           show-progress: false
 
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 17
-          cache: 'gradle'
-
-      - uses: jfrog/setup-jfrog-cli@v3
-        with:
-          version: 2.52.2
-        env:
-          JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
-
-      - name: Configure JFrog Cli
-        run: jf gradlec --repo-resolve libs-staging-local
+      - name: Set up Gradle
+        uses: spring-io/spring-gradle-build-action@v2
 
-      - name: Verify Spring Integration Kafka against staged release
+      - name: Prepare Spring Integration project against Staging
         run: |
+          printf "allprojects {
+                  repositories {
+                    maven { 
+                      url 'https://repo.spring.io/libs-staging-local'
+                      credentials {
+                        username = '$ARTIFACTORY_USERNAME'
+                        password = '$ARTIFACTORY_PASSWORD'
+                      }
+                    }
+                  }
+                }" > staging-repo-init.gradle
+          
           sed -i "1,/springKafkaVersion.*/s/springKafkaVersion.*/springKafkaVersion='${{ inputs.releaseVersion }}'/" build.gradle
-          jf gradle :spring-integration-kafka:check
 
-      - name: Capture Test Results
-        if: failure()
-        uses: actions/upload-artifact@v3
-        with:
-          name: test-results
-          path: '**/target/surefire-reports/**/*.*'
-          retention-days: 1
\ No newline at end of file
+      - name: Verify Spring Integration Samples against staged release
+        run: gradle :spring-integration-kafka:check --init-script staging-repo-init.gradle
\ No newline at end of file