From 91fec77eb006050c986ca0e79b180261fd964f40 Mon Sep 17 00:00:00 2001
From: Namitha-genesis <namitha.m@genesis.global>
Date: Fri, 24 Jul 2026 14:34:32 +0530
Subject: [PATCH] Adding code for Sonar to use Java 21

---
 .github/workflows/build-and-generate-rpm.yml | 31 ++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-generate-rpm.yml b/.github/workflows/build-and-generate-rpm.yml
index 06942d1f..3232a334 100644
--- a/.github/workflows/build-and-generate-rpm.yml
+++ b/.github/workflows/build-and-generate-rpm.yml
@@ -411,7 +411,27 @@ jobs:
         uses: gradle/gradle-build-action@v2
         with:
           arguments: >
-            test jacocoTestReport sonarqube --no-build-cache --stacktrace
+            test jacocoTestReport --no-build-cache --stacktrace
+            -PpushToCache=${{ inputs.push-to-artifactory-cache }}
+            -PdisableRemoteCache=${{ !inputs.use-artifactory-cache }}
+            ${{ env.SERVER_BUILD_ARGS }}
+            -PuseDevRepo=true
+          build-root-directory: "${{ inputs.working-directory }}/${{ inputs.server-path }}"
+          cache-disabled: true
+
+      - name: Set up Java 21 for Sonar
+        if: inputs.build_server && !inputs.skip-tests
+        uses: actions/setup-java@v4
+        with:
+          java-version: "21"
+          distribution: adopt
+
+      - name: Run Sonar analysis
+        if: inputs.build_server && !inputs.skip-tests
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: >
+            sonarqube --no-build-cache --stacktrace
             -PpushToCache=${{ inputs.push-to-artifactory-cache }}
             -PdisableRemoteCache=${{ !inputs.use-artifactory-cache }}
             ${{ env.SERVER_BUILD_ARGS }}
@@ -421,6 +441,13 @@ jobs:
           build-root-directory: "${{ inputs.working-directory }}/${{ inputs.server-path }}"
           cache-disabled: true
 
+      - name: Restore Java 17
+        if: inputs.build_server && !inputs.skip-tests
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ inputs.java_version }}
+          distribution: adopt
+
       - name: Copy Test Reports
         working-directory: "${{ inputs.working-directory }}"
         shell: bash
@@ -686,4 +713,4 @@ jobs:
           cd ~/rpmbuild/RPMS/noarch/
           ls -al
           uploaded_rpm_name=$(ls -1 *.rpm)
-          echo "uploaded_rpm_name=$uploaded_rpm_name" >> $GITHUB_OUTPUT
+          echo "uploaded_rpm_name=$uploaded_rpm_name" >> $GITHUB_OUTPUT
\ No newline at end of file