From 8c41e7c44dfc87241e7b48b42b288ce712eb322b Mon Sep 17 00:00:00 2001
From: Justin Florentine <justin+github@florentine.us>
Date: Fri, 15 Mar 2024 21:32:39 -0400
Subject: [PATCH] Artifactory publish (#6746)

* resumes publishing jars, but not distros to artifactory
* checkMavenCoordinateCollisions needs a publication with an explicitly set version, does not inherit project.version

---------

Signed-off-by: Justin Florentine <justin+github@florentine.us>
Co-authored-by: garyschulte <garyschulte@gmail.com>
---
 .github/workflows/artifacts.yml  | 4 ++++
 .github/workflows/pre-review.yml | 2 +-
 build.gradle                     | 7 -------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
index 6a737252bc..e7db5a04ae 100644
--- a/.github/workflows/artifacts.yml
+++ b/.github/workflows/artifacts.yml
@@ -46,6 +46,10 @@ jobs:
           path: 'build/distributions/besu*.zip'
           name: besu-${{ github.ref_name }}.zip
           compression-level: 0
+      - name: Artifactory Publish
+        env:
+          ARTIFACTORY_USER: ${{ secrets.BESU_ARTIFACTORY }}
+        run: ./gradlew -Prelease.releaseVersion=${{ github.ref_name }} -Pversion=${{github.ref_name}} artifactoryPublish
   testWindows:
     runs-on: windows-2022
     needs: artifacts
diff --git a/.github/workflows/pre-review.yml b/.github/workflows/pre-review.yml
index a7b2faf6e8..6a0b6e79dd 100644
--- a/.github/workflows/pre-review.yml
+++ b/.github/workflows/pre-review.yml
@@ -124,7 +124,7 @@ jobs:
       - name: run unit tests
         id: unitTest
         run: ./gradlew $GRADLEW_UNIT_TEST_ARGS
-      - name: Upload Acceptance Test Results
+      - name: Upload Unit Test Results
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
         with:
           name: unit-${{matrix.filename}}-test-results
diff --git a/build.gradle b/build.gradle
index 17d2d317ff..9c98874597 100644
--- a/build.gradle
+++ b/build.gradle
@@ -685,8 +685,6 @@ publishing {
       groupId = '.'
       version = project.version
       artifactId = 'besu'
-      artifact("$buildDir/distributions/besu-${project.version}.zip")
-      artifact("$buildDir/distributions/besu-${project.version}.tar.gz") { extension = 'tar.gz' }
     }
   }
 }
@@ -698,11 +696,6 @@ def artifactoryOrg = System.getenv('ARTIFACTORY_ORG') ?: 'hyperledger'
 artifactory {
   contextUrl = "https://hyperledger.jfrog.io/${artifactoryOrg}"
   publish {
-    repository {
-      repoKey = "besu-binaries"
-      username = artifactoryUser
-      password = artifactoryKey
-    }
     defaults {
       publications('distArtifactory')
       publishArtifacts = true