aerospike · BrianNichols · May 7, 2025 · May 6, 2025
diff --git a/.github/actions/publish-build-info-to-jfrog/action.yaml b/.github/actions/publish-build-info-to-jfrog/action.yaml
@@ -33,6 +33,7 @@ runs:
       uses: jfrog/setup-jfrog-cli@v4
       env:
         JF_URL: ${{ inputs.jfrog-platform-url }}
+        JF_PROJECT: clients
       with:
         version: 2.72.2
         oidc-provider-name: ${{ inputs.oidc-provider }}

diff --git a/.github/actions/publish-to-jfrog/action.yaml b/.github/actions/publish-to-jfrog/action.yaml
@@ -54,6 +54,7 @@ runs:
       uses: jfrog/setup-jfrog-cli@v4
       env:
         JF_URL: ${{ inputs.jfrog-platform-url }}
+        JF_PROJECT: clients
       with:
         version: 2.72.2
         oidc-provider-name: ${{ inputs.oidc-provider }}
@@ -67,7 +68,7 @@ runs:
         --repo-deploy-snapshots=${{ inputs.jfrog-snapshots-repo-name }}
 
     # Generating deploy spec to match the artifacts to be uploaded. Builds for java do not follow the standards since we have bouncycastle and gnu builds.
-    # Technically speaking we should have multiple modules looking at how Maven does things. But for practical reasons we don't since we would have duplicate 
+    # Technically speaking we should have multiple modules looking at how Maven does things. But for practical reasons we don't since we would have duplicate
     # code to maintain.
     - name: Generate deploy spec
       shell: bash

diff --git a/.github/actions/run-ee-server/action.yaml b/.github/actions/run-ee-server/action.yaml
@@ -42,6 +42,7 @@ runs:
       uses: jfrog/setup-jfrog-cli@v4
       env:
         JF_URL: ${{ inputs.jfrog-platform-url }}
+        JF_PROJECT: clients
       with:
         oidc-provider-name: ${{ inputs.oidc-provider }}
         oidc-audience: ${{ inputs.oidc-audience }}

diff --git a/.github/actions/stage-release-artifacts/action.yaml b/.github/actions/stage-release-artifacts/action.yaml
@@ -47,6 +47,7 @@ runs:
       uses: jfrog/setup-jfrog-cli@v4
       env:
         JF_URL: ${{ inputs.jfrog-platform-url }}
+        JF_PROJECT: clients
       with:
         oidc-provider-name: ${{ inputs.oidc-provider }}
         oidc-audience: ${{ inputs.oidc-audience }}

diff --git a/.github/workflows/acknowledge.yaml b/.github/workflows/acknowledge.yaml
@@ -33,6 +33,7 @@ jobs:
         uses: jfrog/setup-jfrog-cli@v4
         env:
           JF_URL: ${{ inputs.jfrog-platform-url }}
+          JF_PROJECT: clients
         with:
           version: 2.72.2
           oidc-provider-name: ${{ secrets.JFROG_OIDC_PROVIDER }}

diff --git a/.github/workflows/aggregate-build.yaml b/.github/workflows/aggregate-build.yaml
@@ -16,6 +16,9 @@ on:
       is-snapshot:
         type: string
         required: true
+      release-version:
+        type: string
+        required: true
     secrets:
       JFROG_OIDC_PROVIDER:
         required: true
@@ -26,11 +29,18 @@ jobs:
   build:
     runs-on: ${{ vars.BUILD_CONTAINER_DISTRO_VERSION }}
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ inputs.ref }}
+
       - name: Set up JFrog credentials l
         id: setup-jfrog-cli
         uses: jfrog/setup-jfrog-cli@v4
         env:
           JF_URL: ${{ inputs.jfrog-platform-url }}
+          JF_PROJECT: clients
         with:
           version: 2.72.2
           oidc-provider-name: ${{ secrets.JFROG_OIDC_PROVIDER }}
@@ -49,3 +59,21 @@ jobs:
           jf rt ba clients-java-push-to-dev ${{ github.run_number }} clients-java-push-to-dev_aerospike-client-jdk${{ inputs.java-version }} ${{ github.run_number }}
 
           jf rt bp clients-java-push-to-dev ${{ github.run_number }}
+
+      - name: Install sponge
+        run: sudo apt install -y moreutils
+
+      - name: Create file spec for release bundle
+        shell: bash
+        working-directory: .github/workflows
+        run: | 
+          cat ./rb-spec.json | jq '.files[0].build = "clients-java-push-to-dev/${{ github.run_number }}"' | sponge ./rb-spec.json
+
+      - name: Create release bundle from JFrog build
+        working-directory: ./.github/workflows
+        run: | 
+          jf rbc --spec=./rb-spec.json clients-java-jdk${{ inputs.java-version }} ${{ inputs.release-version}}
+
+      - name: Promote release bundle to DEV stage
+        run: | 
+          jf rbp --signing-key=aerospike clients-java-jdk${{ inputs.java-version }} ${{ inputs.release-version}} STAGE
diff --git a/.github/workflows/aggregated-release-build.yaml b/.github/workflows/aggregated-release-build.yaml
@@ -29,6 +29,7 @@ jobs:
         uses: jfrog/setup-jfrog-cli@v4
         env:
           JF_URL: ${{ inputs.jfrog-platform-url }}
+          JF_PROJECT: clients
         with:
           version: 2.72.2
           oidc-provider-name: ${{ secrets.JFROG_OIDC_PROVIDER }}

diff --git a/.github/workflows/promote.yaml b/.github/workflows/promote.yaml
@@ -51,6 +51,7 @@ jobs:
         uses: jfrog/setup-jfrog-cli@v4
         env:
           JF_URL: ${{ vars.JFROG_PLATFORM_URL }}
+          JF_PROJECT: clients
         with:
           oidc-provider-name: ${{ secrets.JFROG_OIDC_PROVIDER }}
           oidc-audience: ${{ secrets.JFROG_OIDC_AUDIENCE }}

diff --git a/.github/workflows/push-to-stage.yaml b/.github/workflows/push-to-stage.yaml
@@ -3,8 +3,8 @@ name: clients-java-push-to-dev
 on:
   push:
     branches:
-      - stage
-      - stage-jdk8
+      - dev/versioning-from-ci
+      #- stage-jdk8
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/rb-spec.json b/.github/workflows/rb-spec.json
@@ -0,0 +1,9 @@
+{
+    "files": [
+      {
+        "build": "",
+        "includeDeps": "true",
+        "project": "clients"
+      }
+    ]
+}
diff --git a/.github/workflows/release-stage.yaml b/.github/workflows/release-stage.yaml
@@ -23,6 +23,7 @@ jobs:
     outputs:
       java-version: ${{ steps.get-java-version.outputs.java-version }}
       is-snapshot: ${{ steps.get-is-snapshot.outputs.is-snapshot }}
+      release-version: ${{ steps.get-release-version.outputs.release-version }}
     steps:
       - name: Checkout client
         uses: actions/checkout@v4
@@ -69,6 +70,17 @@ jobs:
             echo "is-snapshot='true'" >> $GITHUB_OUTPUT
           fi
 
+      - name: Get release or snapshot-version
+        id: get-release-version
+        shell: bash
+        run: |
+          IS_SNAPSHOT=${{ steps.get-is-snapshot.outputs.is-snapshot }}
+          if [ $IS_SNAPSHOT == 'true' ];then
+            echo release-version="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-SNAPSHOT_$GITHUB_SHA" >> $GITHUB_OUTPUT
+          else
+            echo release-version="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_OUTPUT
+          fi
+
   build:
     uses: ./.github/workflows/release.yaml
     needs: pre-requisites
@@ -89,3 +101,4 @@ jobs:
     with:
       java-version: ${{ needs.pre-requisites.outputs.java-version }}
       is-snapshot: ${{ needs.pre-requisites.outputs.is-snapshot }}
+      release-version: ${{ needs.pre-requisites.outputs.release-version }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -128,10 +128,8 @@ jobs:
       - name: Publish to JFrog
         uses: ./.github/actions/publish-to-jfrog
         with:
-          crypto-type: ${{ inputs.crypto-type }}
           oidc-provider: ${{ secrets.JFROG_OIDC_PROVIDER }}
           oidc-audience: ${{ secrets.JFROG_OIDC_AUDIENCE }}
-          artifact-name: ${{ steps.get-artifact-name.outputs.artifact-name }}
           artifact-id: ${{ steps.get-artifact-id.outputs.artifact-id }}
           artifact-version: ${{ steps.get-artifact-version.outputs.artifact-version }}
           package-install-location: ${{ github.workspace }}/local_repo