SK-2343: Maintain the Java v2 SDK's code and documentation in the main branch

.github/workflows/beta-release.yml

@@ -0,0 +1,20 @@
+name: Public beta release
+on:
+  push:
+    tags: '*.*.*-beta.*'
+jobs:
+  build-and-deploy:
+    uses: ./.github/workflows/shared-build-and-deploy.yml
+    with:
+      ref: ${{ github.ref_name }}
+      server-id: central
+      profile: maven-central
+      tag: 'beta'
+    secrets:
+      server-username: ${{ secrets.CENTRAL_PUBLISHER_PORTAL_USERNAME }}
+      server-password: ${{ secrets.CENTRAL_PUBLISHER_PORTAL_PASSWORD }}
+      gpg-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
+      gpg-passphrase: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+      skyflow-credentials: ${{ secrets.SKYFLOW_CREDENTIALS }} >> .env
+      test-expired-token: ${{ secrets.TEST_EXPIRED_TOKEN }} >> .env
+      test-reusable-token: ${{ secrets.TEST_REUSABLE_TOKEN }} >> .env

.github/workflows/endorlabsScan.yml

@@ -37,7 +37,7 @@ jobs:
           json: ${{ secrets.TEST_CREDENTIALS_FILE_STRING }}
 
       - name: Compile Package
-        run: mvn -B package -DTEST_VAULT_ID=${{ secrets.TEST_VAULT_ID }} -DTEST_VAULT_URL=${{ secrets.TEST_VAULT_URL }} -DTEST_SKYFLOW_ID=${{ secrets.TEST_SKYFLOW_ID }} -DTEST_TOKEN=${{ secrets.TEST_TOKEN }} -DTEST_CREDENTIALS=${{ secrets.TEST_CREDENTIALS_FILE_STRING }} -DTEST_EXPIRED_TOKEN=${{ secrets.TEST_EXPIRED_TOKEN }} -DTEST_REUSABLE_TOKEN=${{ secrets.TEST_REUSABLE_TOKEN }} -DSKYFLOW_CREDENTIALS=${{ secrets.SKYFLOW_CREDENTIALS }} -f pom.xml
+        run: mvn -B package -f pom.xml -Dmaven.javadoc.skip=true
 
       - name: Endor Labs SCA Scan
         uses: endorlabs/github-action@main
@@ -47,4 +47,4 @@ jobs:
           pr: false
           enable_github_action_token: true
           scan_dependencies: true
-          additional_args: "--as-default-branch --call-graph-languages=java"
+          additional_args: "--as-default-branch --call-graph-languages=java"

.github/workflows/internal-release.yml

@@ -1,9 +1,9 @@
 name: Publish package to the JFROG Artifactory
 on:
   push:
-    tags: '*.*.*'
+    tags-ignore:
+      - '*.*'
     paths-ignore:
-      - "pom.xml"
       - "*.md"
     branches:
       - release/*
@@ -13,11 +13,14 @@ jobs:
     uses: ./.github/workflows/shared-build-and-deploy.yml
     with:
       ref: ${{ github.ref_name }}
-      is-internal: true
       server-id: central
       profile: jfrog
+      tag: 'internal'
     secrets:
       server-username: ${{ secrets.ARTIFACTORY_USERNAME }}
       server-password: ${{ secrets.ARTIFACTORY_PASSWORD }}
       gpg-key: ${{ secrets.JFROG_GPG_KEY }}
-      gpg-passphrase: ${{ secrets.JFROG_GPG_PASSPHRASE }}
+      gpg-passphrase: ${{ secrets.JFROG_GPG_PASSPHRASE }}
+      skyflow-credentials: ${{ secrets.SKYFLOW_CREDENTIALS }} >> .env
+      test-expired-token: ${{ secrets.TEST_EXPIRED_TOKEN }} >> .env
+      test-reusable-token: ${{ secrets.TEST_REUSABLE_TOKEN }} >> .env

.github/workflows/main.yml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-java@v1
         with:
-          java-version: '1.8'
+          java-version: '11'
 
       - name: create-json
         id: create-json
@@ -23,7 +23,7 @@ jobs:
           json: ${{ secrets.TEST_CREDENTIALS_FILE_STRING }}
 
       - name: Build & Run tests with Maven
-        run: mvn -B package -DTEST_VAULT_ID=${{ secrets.TEST_VAULT_ID }} -DTEST_VAULT_URL=${{ secrets.TEST_VAULT_URL }} -DTEST_SKYFLOW_ID=${{ secrets.TEST_SKYFLOW_ID }} -DTEST_TOKEN=${{ secrets.TEST_TOKEN }} -DTEST_CREDENTIALS=${{ secrets.TEST_CREDENTIALS_FILE_STRING }} -DTEST_EXPIRED_TOKEN=${{ secrets.TEST_EXPIRED_TOKEN }} -f pom.xml
+        run: mvn -B package -f pom.xml -Dmaven.javadoc.skip=true
 
       - name: Codecov
         uses: codecov/codecov-action@v2.1.0

.github/workflows/pr.yml

@@ -1,6 +1,6 @@
 name: PR CI Checks
 
-on: [ pull_request ]
+on: [pull_request]
 
 jobs:
   check-commit-message:
@@ -11,18 +11,18 @@ jobs:
         uses: gsactions/commit-message-checker@v1
         with:
           pattern: '(\[?[A-Z]{1,5}-[1-9][0-9]*)|(\[AUTOMATED\])|(Merge)|(Release).+$'
-          flags: 'gm'
-          excludeDescription: 'true'
-          checkAllCommitMessages: 'true'
+          flags: "gm"
+          excludeDescription: "true"
+          checkAllCommitMessages: "true"
           accessToken: ${{ secrets.PAT_ACTIONS }}
-          error: 'One of your your commit messages is not matching the format with JIRA ID Ex: ( SDK-123 commit message )'
+          error: "One of your your commit messages is not matching the format with JIRA ID Ex: ( SDK-123 commit message )"
   Test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-java@v1
         with:
-          java-version: '1.8'
+          java-version: "11"
 
       - name: create-json
         id: create-json
@@ -31,8 +31,16 @@ jobs:
           name: "credentials.json"
           json: ${{ secrets.TEST_CREDENTIALS_FILE_STRING }}
 
+      - name: create env
+        id: create-env
+        run: |
+          touch .env
+          echo SKYFLOW_CREDENTIALS=${{ secrets.SKYFLOW_CREDENTIALS }} >> .env
+          echo TEST_EXPIRED_TOKEN=${{ secrets.TEST_EXPIRED_TOKEN }} >> .env
+          echo TEST_REUSABLE_TOKEN=${{ secrets.TEST_REUSABLE_TOKEN }} >> .env
+
       - name: Build & Run tests with Maven
-        run: mvn -B package -DTEST_EXPIRED_TOKEN=${{ secrets.TEST_EXPIRED_TOKEN }} -DTEST_DATA_CREDENTIALS_FILE=${{ secrets.TEST_DATA_CREDENTIALS_FILE }} -f pom.xml
+        run: mvn -B package -f pom.xml -Dmaven.javadoc.skip=true
 
       - name: Codecov
         uses: codecov/codecov-action@v2.1.0

.github/workflows/release.yml

@@ -1,17 +1,20 @@
-name: Publish package to the Maven Central Repository
+name: Public release
 on:
   push:
-    tags: '*.*.*'
+    tags: '[0-9]+.[0-9]+.[0-9]+'
 jobs:
   build-and-deploy:
     uses: ./.github/workflows/shared-build-and-deploy.yml
     with:
       ref: ${{ github.ref_name }}
-      is-internal: false
-      server-id: ossrh
+      server-id: central
       profile: maven-central
+      tag: 'public'
     secrets:
-      server-username: ${{ secrets.OSSRH_USERNAME }}
-      server-password: ${{ secrets.OSSRH_PASSWORD }}
+      server-username: ${{ secrets.CENTRAL_PUBLISHER_PORTAL_USERNAME }}
+      server-password: ${{ secrets.CENTRAL_PUBLISHER_PORTAL_PASSWORD }}
       gpg-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
-      gpg-passphrase: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+      gpg-passphrase: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+      skyflow-credentials: ${{ secrets.SKYFLOW_CREDENTIALS }} >> .env
+      test-expired-token: ${{ secrets.TEST_EXPIRED_TOKEN }} >> .env
+      test-reusable-token: ${{ secrets.TEST_REUSABLE_TOKEN }} >> .env

.github/workflows/shared-build-and-deploy.yml

@@ -3,22 +3,22 @@ on:
   workflow_call:
     inputs:
       ref:
-        description: 'Git reference to use (e.g., main or branch name)'
+        description: "Git reference to use (e.g., main or branch name)"
         required: true
         type: string
 
-      is-internal:
-        description: 'Flag for internal release'
-        required: true
-        type: boolean
-
       server-id:
-        description: 'Id of the repository'
+        description: "Id of the repository"
         required: true
         type: string
-      
+
       profile:
-        description: 'Profile to pick from pom.xml'
+        description: "Profile to pick from pom.xml"
+        required: true
+        type: string
+
+      tag:
+        description: 'Release Tag'
         required: true
         type: string
     secrets:
@@ -34,25 +34,46 @@ on:
       gpg-passphrase:
         required: true
 
+      skyflow-credentials:
+        required: true
+
+      test-expired-token:
+        required: true
+
+      test-reusable-token:
+        required: true
+
 jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
-          ref: ${{ inputs.ref }}
           fetch-depth: 0
 
       - name: Set up maven or jfrog repository
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
-          java-version: '1.8'
-          distribution: 'adopt'
+          java-version: "11"
+          distribution: "adopt"
           server-id: ${{ inputs.server-id }}
           server-username: SERVER_USERNAME
           server-password: SERVER_PASSWORD
           gpg-private-key: ${{ secrets.gpg-key }} # Value of the GPG private key to import
           gpg-passphrase: GPG_PASSPHRASE # env variable for GPG private key passphrase
+
+      - name: Resolve Branch for the Tagged Commit
+        id: resolve-branch
+        if: ${{ inputs.tag == 'beta' || inputs.tag == 'public' }} 
+        run: |
+          TAG_COMMIT=$(git rev-list -n 1 ${{ github.ref_name }})
+          BRANCH_NAME=$(git branch -r --contains $TAG_COMMIT | grep -o 'origin/.*' | sed 's|origin/||' | head -n 1)
+          if [ -z "$BRANCH_NAME" ]; then
+            echo "Error: Could not resolve branch for the tag."
+            exit 1
+          fi
+          echo "Resolved Branch Name: $BRANCH_NAME"
+          echo "branch_name=$BRANCH_NAME" >> $GITHUB_ENV
 
       - name: Get Previous tag
         id: previoustag
@@ -63,7 +84,7 @@ jobs:
       - name: Bump Version
         run: |
           chmod +x ./scripts/bump_version.sh
-          if ${{ inputs.is-internal }}; then
+          if ${{ inputs.tag == 'internal' }}; then
             ./scripts/bump_version.sh "${{ steps.previoustag.outputs.tag }}" "$(git rev-parse --short "$GITHUB_SHA")"
           else
             ./scripts/bump_version.sh "${{ steps.previoustag.outputs.tag }}"
@@ -73,22 +94,28 @@ jobs:
         run: |
           git config user.name ${{ github.actor }}
           git config user.email ${{ github.actor }}@users.noreply.github.com
+
+          if [[ "${{ inputs.tag }}" == "beta" || "${{ inputs.tag }}" == "public" ]]; then
+            git checkout ${{ env.branch_name }}
+          fi
+
           git add pom.xml
-          if ${{ inputs.is-internal }}; then
+          if [[ "${{ inputs.tag }}" == "internal" ]]; then
             git commit -m "[AUTOMATED] Private Release ${{ steps.previoustag.outputs.tag }}-dev-$(git rev-parse --short $GITHUB_SHA)"
             git push origin ${{ github.ref_name }} -f
-          else
+          fi
+          if [[ "${{ inputs.tag }}" == "beta" || "${{ inputs.tag }}" == "public" ]]; then
             git commit -m "[AUTOMATED] Public Release - ${{ steps.previoustag.outputs.tag }}"
-            git push origin
+            git push origin ${{ env.branch_name }}
           fi
 
       - name: Create env
-        if: ${{ inputs.is-internal }}
         id: create-env
         run: |
           touch .env
-          echo SKYFLOW_CREDENTIALS=${{ secrets.SKYFLOW_CREDENTIALS }} >> .env
-          echo TEST_EXPIRED_TOKEN=${{ secrets.TEST_EXPIRED_TOKEN }} >> .env
+          echo SKYFLOW_CREDENTIALS=${{ secrets.skyflow-credentials }} >> .env
+          echo TEST_EXPIRED_TOKEN=${{ secrets.test-expired-token }} >> .env
+          echo TEST_REUSABLE_TOKEN=${{ secrets.test-reusable-token }} >> .env
 
       - name: Create credentials json
         id: create-json
@@ -98,8 +125,9 @@ jobs:
           json: ${{ secrets.TEST_CREDENTIALS_FILE_STRING }}
 
       - name: Publish package
-        run: mvn clean deploy -P ${{ inputs.profile }}
+        run: mvn --batch-mode deploy -P ${{ inputs.profile }}
+
         env:
           SERVER_USERNAME: ${{ secrets.server-username }}
           SERVER_PASSWORD: ${{ secrets.server-password  }}
-          GPG_PASSPHRASE: ${{ secrets.gpg-passphrase }}
+          GPG_PASSPHRASE: ${{ secrets.gpg-passphrase }}