From b381e7f795e049532ea4d27c44b1621128443aa0 Mon Sep 17 00:00:00 2001
From: Mirza Karacic <mkaracic@aerospike.com>
Date: Fri, 22 Nov 2024 15:44:44 -0800
Subject: [PATCH] Chagnes to jar filters

---
 .github/actions/upload-to-jfrog/action.yaml | 4 ++--
 .github/workflows/build.yaml                | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/actions/upload-to-jfrog/action.yaml b/.github/actions/upload-to-jfrog/action.yaml
index eef7083b2..c4117247c 100644
--- a/.github/actions/upload-to-jfrog/action.yaml
+++ b/.github/actions/upload-to-jfrog/action.yaml
@@ -39,8 +39,8 @@ runs:
     - name: Upload from branches to JFrog
       shell: bash
       # Only interested in `aerospike-proxy-client-x.x.x....` and  `aerospike-client-jdkx-x.x.x....`
-      run: jf rt upload --regexp=true --dry-run "aerospike-(client-(jdk\d+))-\d+\.\d+\.\d+(-jar-with-dependencies)?\.jar" "${{ inputs.jfrog-repo-name }}"
+      run: jf rt upload --regexp=true "aerospike-(client-(jdk\d+))-(bc-)?\d+\.\d+\.\d+(-jar-with-dependencies|-javadoc|-sources)?\.jar" "${{ inputs.jfrog-repo-name }}"
 
     - name: Publish build info
       shell: bash
-      run: jf rt build-publish --dry-run ${{ inputs.jdk-version == 'jdk8' && 'aerospike-client-jdk8' || 'aerospike-client-jdk21' }} ${{ inputs.version }}
+      run: jf rt build-publish ${{ inputs.jdk-version == 'jdk8' && 'aerospike-client-jdk8' || 'aerospike-client-jdk21' }} ${{ inputs.version }}
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 64de3533a..e342fd8dc 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -65,7 +65,7 @@ jobs:
           gpg-passphrase: ${{ secrets.GPG_PASS }}
 
       - name: Build
-        run: mvn install -Dcrypto.type=${{ inputs.client-type == 'bouncycastle' && '-bc' || '' }}
+        run: mvn install -Dcrypto.type=${{ inputs.crypto-type == 'bouncycastle' && '-bc' || '' }}
 
       - name: Run EE server
         if: ${{ inputs.run-tests == true }}
@@ -85,13 +85,13 @@ jobs:
         if: ${{ !cancelled() && inputs.upload-artifacts == true }}
         working-directory: client
         run: |
-          mvn javadoc:jar
+          mvn javadoc:jar -Dcrypto.type=${{ inputs.crypto-type == 'bouncycastle' && '-bc' || '' }}
 
       - name: Generate sources jar
         if: ${{ !cancelled() && inputs.upload-artifacts == true }}
         working-directory: client
         run: |
-          mvn source:jar
+          mvn source:jar -Dcrypto.type=${{ inputs.crypto-type == 'bouncycastle' && '-bc' || '' }}
 
       - name: Upload to JFrog
         if: ${{ !cancelled() && inputs.upload-artifacts == true }}