Fix for finding the hazelcast-enterprise jar during the builds [Pa 32…

…7] (#131) While building Java Standalone Client via maven, hazelcast-enterprise jar file couldn't be found. Fixes: 1. Changed the way of installing jars to local maven 2. Fixed a problem with getting license key from secrets for server versions <5.5 3. Changed version of actions/upload-artifact and actions/download-artifact to v4 since v2 is deprecated. 4. Changed the default branch name to master in java_thin_client_compatibility.yaml
hazelcast · Sep 13, 2024 · 2b21a59 · 2b21a59
1 parent 3df4c9b
commit 2b21a59
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 28 deletions.
diff --git a/...flows/java_thin_client_compatibility.yaml → .../workflows/java_client_compatibility.yaml b/...flows/java_thin_client_compatibility.yaml → .../workflows/java_client_compatibility.yaml
@@ -1,4 +1,4 @@
-name: Test Java Thin client against the released IMDG servers
+name: Test Java client against the released IMDG servers
 
 on:
   workflow_dispatch:
@@ -10,7 +10,7 @@ on:
       branch_name:
         description: Name of the branch to test client from
         required: true
-        default: develop
+        default: master
 
 jobs:
   setup_server_matrix:
@@ -54,7 +54,7 @@ jobs:
                 { version: 21, distribution: adopt-openj9 }
         ]
 
-    name: Test Java Thin client ${{ github.event.inputs.branch_name }} branch against ${{ matrix.kind }} ${{ matrix.server-version }} server on ${{ matrix.os }} and JVM ${{ matrix.java.version }} ${{ matrix.java.distribution }}
+    name: Test Java client ${{ github.event.inputs.branch_name }} branch against ${{ matrix.kind }} ${{ matrix.server-version }} server on ${{ matrix.os }} and JVM ${{ matrix.java.version }} ${{ matrix.java.distribution }}
     steps:
       - name: Checkout to scripts
         uses: actions/checkout@v4

diff --git a/.github/workflows/server_compatibility.yaml b/.github/workflows/server_compatibility.yaml
@@ -64,41 +64,41 @@ jobs:
           path: certs
           ref: data
           token: ${{ secrets.GH_PAT }}
-      - name: Checkout to Hazelcast Mono
+      - name: Checkout to Hazelcast Mono ${{ github.event.inputs.branch_name }}
         uses: actions/checkout@v4
         with:
           repository: ${{ github.event.inputs.organization_name }}/hazelcast-mono
           path: hazelcast-mono
           ref: ${{ github.event.inputs.branch_name }}
           token: ${{ secrets.GH_PAT }}
-      - name: Set up HAZELCAST_SERVER_VERSION env
+      - name: Set up HAZELCAST_SERVER_VERSION output variable
         id: set_up_hz_server_version
         run: echo "HAZELCAST_SERVER_VERSION=$( mvn help:evaluate -Dexpression=project.version -q -DforceStdout )" >> "$GITHUB_OUTPUT"
         working-directory: hazelcast-mono
-      - name: Build JARs
+      - name: Build JARs Hazelcast Server Version ${{ steps.set_up_hz_server_version.outputs.HAZELCAST_SERVER_VERSION }}
         run: ./mvnw clean install --activate-profiles quick
         working-directory: hazelcast-mono
       - name: Upload Hazelcast JAR
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: hazelcast
           path: hazelcast-mono/hazelcast/hazelcast/target/hazelcast-*[!s].jar
           retention-days: 1
       - name: Upload Hazelcast SQL JAR (if exists)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: hazelcast-sql
           path: hazelcast-mono/hazelcast/hazelcast-sql/target/hazelcast-sql-*[!s].jar
           if-no-files-found: ignore
           retention-days: 1
       - name: Upload Hazelcast tests JAR
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: hazelcast-tests
           path: hazelcast-mono/hazelcast/hazelcast/target/hazelcast-*-tests.jar
           retention-days: 1
       - name: Upload Hazelcast Enterprise JAR
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: hazelcast-enterprise
           path: hazelcast-mono/hazelcast-enterprise/target/hazelcast-enterprise-*[!s].jar
@@ -110,7 +110,7 @@ jobs:
           mv certs.jar $HZ_ENTERPRISE_TESTS_JAR_NAME
         working-directory: certs
       - name: Upload certificates as Hazelcast Enterprise tests JAR
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: hazelcast-enterprise-tests
           path: certs/hazelcast-enterprise-*-tests.jar
@@ -184,31 +184,31 @@ jobs:
           pip install -r requirements-test.txt
         working-directory: master
       - name: Download Hazelcast tests JAR
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: hazelcast-tests
           path: jars
       - name: Download Hazelcast SQL JAR (if exists)
         continue-on-error: true
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: hazelcast-sql
           path: jars
       - name: Download Hazelcast JAR
         if: ${{ matrix.server_kind == 'os' }}
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: hazelcast
           path: jars
       - name: Download Hazelcast Enterprise JAR
         if: ${{ matrix.server_kind == 'enterprise' }}
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: hazelcast-enterprise
           path: jars
       - name: Download Hazelcast Enterprise tests JAR
         if: ${{ matrix.server_kind == 'enterprise' }}
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: hazelcast-enterprise-tests
           path: jars
@@ -548,7 +548,7 @@ jobs:
 
       # upload logs
       - name: Upload RC and Server logs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: Rc-Server-logs-${{ matrix.client_tag }}-${{ matrix.server_kind }}
@@ -778,7 +778,7 @@ jobs:
       fail-fast: false
       matrix:
         client_tag: ${{ fromJson(needs.setup_java_client_matrix.outputs.matrix) }}
-        server_kind: [ enterprise, os ]
+        server_kind: [ os, enterprise ]
 
     name: Test Java Thin client ${{ matrix.client_tag }} with ${{ matrix.server_kind }} server
     steps:
@@ -814,31 +814,61 @@ jobs:
           rm -rf ~/.m2/repository/com/hazelcast/hazelcast-enterprise/${{ needs.upload_jars.outputs.hz_server_version }}
 
       - name: Download Hazelcast JAR
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: hazelcast
-          path: ~/.m2/repository/com/hazelcast/hazelcast/${{ needs.upload_jars.outputs.hz_server_version }}
+          path: hazelcast-server-jars
 
       - name: Download Hazelcast tests JAR
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: hazelcast-tests
-          path: ~/.m2/repository/com/hazelcast/hazelcast/${{ needs.upload_jars.outputs.hz_server_version }}
+          path: hazelcast-server-jars
 
       - name: Download Hazelcast Enterprise JAR
-        if: ${{ matrix.server_kind == 'enterprise' }}
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: hazelcast-enterprise
-          path: ~/.m2/repository/com/hazelcast/hazelcast-enterprise/${{ needs.upload_jars.outputs.hz_server_version }}
+          path: hazelcast-server-jars
+
+      - name: Install Hazelcast JAR to maven local
+        run: |
+          mvn -B install:install-file\
+           -Dfile=hazelcast-server-jars/hazelcast-${{ needs.upload_jars.outputs.hz_server_version }}.jar\
+           -DgroupId=com.hazelcast\
+           -DartifactId=hazelcast\
+           -Dversion=${{ needs.upload_jars.outputs.hz_server_version }}\
+           -Dpackaging=jar\
+           -DgeneratePom=true
+
+      - name: Install Hazelcast tests JAR to maven local
+        run: |
+          mvn -B install:install-file\
+           -Dfile=hazelcast-server-jars/hazelcast-${{ needs.upload_jars.outputs.hz_server_version }}-tests.jar\
+           -DgroupId=com.hazelcast\
+           -DartifactId=hazelcast\
+           -Dversion=${{ needs.upload_jars.outputs.hz_server_version }}\
+           -Dclassifier=tests\
+           -Dpackaging=jar\
+           -DgeneratePom=true
+
+      - name: Install Hazelcast Enterprise JAR to maven local
+        run: |
+          mvn -B install:install-file\
+           -Dfile=hazelcast-server-jars/hazelcast-enterprise-${{ needs.upload_jars.outputs.hz_server_version }}.jar\
+           -DgroupId=com.hazelcast\
+           -DartifactId=hazelcast-enterprise\
+           -Dversion=${{ needs.upload_jars.outputs.hz_server_version }}\
+           -Dpackaging=jar\
+           -DgeneratePom=true
 
       - name: Set up HZ_LICENSEKEY env
-        if: ${{ matrix.server_kind == 'enterprise' && github.event.inputs.hz_version < '5.5' }}
+        if: ${{ matrix.server_kind == 'enterprise' && needs.upload_jars.outputs.hz_server_version < '5.5' }}
         run: |
-          echo "HZ_LICENSEKEY=${{ env.HAZELCAST_ENTERPRISE_KEY }}" >> $GITHUB_ENV
+          echo "HZ_LICENSEKEY=${{ secrets.HAZELCAST_ENTERPRISE_KEY }}" >> $GITHUB_ENV
 
       - name: Set up v7 HZ_LICENSEKEY env
-        if: ${{ matrix.server_kind == 'enterprise' && github.event.inputs.hz_version >= '5.5'  }} 
+        if: ${{ matrix.server_kind == 'enterprise' && needs.upload_jars.outputs.hz_server_version >= '5.5'  }}
         run: |
           echo "HZ_LICENSEKEY=${{ secrets.HAZELCAST_ENTERPRISE_KEY_V7 }}" >> $GITHUB_ENV