From 9737a14867aebf919e892ba62291a183ae25a1f3 Mon Sep 17 00:00:00 2001
From: deepiksSingh2711 <deepikarajput2711@gmail.com>
Date: Wed, 6 May 2026 15:06:45 +0530
Subject: [PATCH] support java plugin with java 21

---
 .github/actions/deploy-release/action.yml                 | 2 +-
 .github/actions/deploy/action.yml                         | 4 ++--
 .github/workflows/blackduck.yml                           | 4 ++--
 .github/workflows/cfdeploy.yml                            | 8 ++++----
 .github/workflows/codeql.yml                              | 4 ++--
 .github/workflows/demo-build.yml                          | 4 ++--
 .github/workflows/internalArticatory.yml                  | 2 +-
 .github/workflows/main-build-and-deploy-oss.yml           | 2 +-
 .github/workflows/main-build-and-deploy.yml               | 2 +-
 .github/workflows/main-build.yml                          | 4 ++--
 .github/workflows/multi tenancy_Integration.yml           | 4 ++--
 .../workflows/multiTenant_deploy_and_Integration_test.yml | 4 ++--
 ...tiTenant_deploy_and_Integration_test_LatestVersion.yml | 4 ++--
 .github/workflows/pull-request-build.yml                  | 2 +-
 .../singleTenant_deploy_and_Integration_test.yml          | 8 ++++----
 ...leTenant_deploy_and_Integration_test_LatestVersion.yml | 8 ++++----
 .github/workflows/singleTenant_integration_test.yml       | 4 ++--
 .github/workflows/sonarqube.yml                           | 4 ++--
 .github/workflows/unit.tests.yml                          | 2 +-
 deploy-artifactory.sh                                     | 2 +-
 pom.xml                                                   | 2 +-
 21 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/.github/actions/deploy-release/action.yml b/.github/actions/deploy-release/action.yml
index 134414b0a..7ff6adcf8 100644
--- a/.github/actions/deploy-release/action.yml
+++ b/.github/actions/deploy-release/action.yml
@@ -37,7 +37,7 @@ runs:
       uses: actions/setup-java@v4
       with:
         distribution: 'sapmachine'
-        java-version: '17'
+        java-version: '21'
         cache: maven
         server-id: central
         server-username: MAVEN_CENTRAL_USER
diff --git a/.github/actions/deploy/action.yml b/.github/actions/deploy/action.yml
index 027923cc7..15c8ca7d9 100644
--- a/.github/actions/deploy/action.yml
+++ b/.github/actions/deploy/action.yml
@@ -34,11 +34,11 @@ runs:
         echo "altDeploymentRepository: ${{inputs.server-id}}::default::${{inputs.repository-url}}"
       shell: bash
 
-    - name: Setup Java 17
+    - name: Setup Java 21
       uses: actions/setup-java@v4
       with:
         distribution: sapmachine
-        java-version: '17'
+        java-version: '21'
         server-id: ${{ inputs.server-id }}
         server-username: CAP_DEPLOYMENT_USER
         server-password: CAP_DEPLOYMENT_PASS
diff --git a/.github/workflows/blackduck.yml b/.github/workflows/blackduck.yml
index 669bddd62..a1763a42e 100644
--- a/.github/workflows/blackduck.yml
+++ b/.github/workflows/blackduck.yml
@@ -23,10 +23,10 @@ jobs:
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: maven
           
diff --git a/.github/workflows/cfdeploy.yml b/.github/workflows/cfdeploy.yml
index 43e73471f..eeb6c3869 100644
--- a/.github/workflows/cfdeploy.yml
+++ b/.github/workflows/cfdeploy.yml
@@ -40,10 +40,10 @@ jobs:
         with:
           ref: ${{ github.event.inputs.deploy_branch }}
 
-      - name: Set up Java 17 ☕
+      - name: Set up Java 21 ☕
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
 
       - name: Build and package 🔨
@@ -136,10 +136,10 @@ jobs:
         with:
           ref: develop
 
-      - name: Set up Java 17 ☕
+      - name: Set up Java 21 ☕
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
 
       - name: Verify and Checkout Deploy Branch 🔄
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 0223bb522..a5b5476e0 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -29,11 +29,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v4
diff --git a/.github/workflows/demo-build.yml b/.github/workflows/demo-build.yml
index 61b2aa6c0..223c11f04 100644
--- a/.github/workflows/demo-build.yml
+++ b/.github/workflows/demo-build.yml
@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: maven
       - name: Build with Maven
diff --git a/.github/workflows/internalArticatory.yml b/.github/workflows/internalArticatory.yml
index 5d3bf0150..48e6a3088 100644
--- a/.github/workflows/internalArticatory.yml
+++ b/.github/workflows/internalArticatory.yml
@@ -1,7 +1,7 @@
 name: Internal Artifactory snapshot deploy
 
 env:
-  JAVA_VERSION: '17'
+  JAVA_VERSION: '21'
   MAVEN_VERSION: '3.6.3'
   ARTIFACTORY_URL: ${{ secrets.ARTIFACTORY_URL }}
 
diff --git a/.github/workflows/main-build-and-deploy-oss.yml b/.github/workflows/main-build-and-deploy-oss.yml
index 30661c4f3..86ad400c5 100644
--- a/.github/workflows/main-build-and-deploy-oss.yml
+++ b/.github/workflows/main-build-and-deploy-oss.yml
@@ -1,7 +1,7 @@
 name: Deploy to Maven Central
 
 env:
-  JAVA_VERSION: '17'
+  JAVA_VERSION: '21'
   MAVEN_VERSION: '3.6.3'
 
 on:
diff --git a/.github/workflows/main-build-and-deploy.yml b/.github/workflows/main-build-and-deploy.yml
index 0b6616795..0ce1a17b1 100644
--- a/.github/workflows/main-build-and-deploy.yml
+++ b/.github/workflows/main-build-and-deploy.yml
@@ -1,7 +1,7 @@
 name: Deploy to Artifactory on pre-released
 
 env:
-  JAVA_VERSION: '17'
+  JAVA_VERSION: '21'
   MAVEN_VERSION: '3.6.3'
   DEPLOY_REPOSITORY_URL: 'https://common.repositories.cloud.sap/artifactory/cap-sdm-java'
   POM_FILE: '.flattened-pom.xml'
diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
index 753cde7a2..e255950c2 100644
--- a/.github/workflows/main-build.yml
+++ b/.github/workflows/main-build.yml
@@ -1,7 +1,7 @@
 name: Main build and snapshot deploy
 
 env:
-  JAVA_VERSION: '17'
+  JAVA_VERSION: '21'
   MAVEN_VERSION: '3.6.3'
 
 on:
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: [ 17 ]
+        java-version: [ 21 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v6
diff --git a/.github/workflows/multi tenancy_Integration.yml b/.github/workflows/multi tenancy_Integration.yml
index a20e1fac7..17ec2920f 100644
--- a/.github/workflows/multi tenancy_Integration.yml	
+++ b/.github/workflows/multi tenancy_Integration.yml	
@@ -34,10 +34,10 @@ jobs:
         with:
           ref: ${{ github.event.inputs.branch_name }}
 
-      - name: Set up Java 17 ☕
+      - name: Set up Java 21 ☕
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 
diff --git a/.github/workflows/multiTenant_deploy_and_Integration_test.yml b/.github/workflows/multiTenant_deploy_and_Integration_test.yml
index d658af729..259fc53fc 100644
--- a/.github/workflows/multiTenant_deploy_and_Integration_test.yml
+++ b/.github/workflows/multiTenant_deploy_and_Integration_test.yml
@@ -117,10 +117,10 @@ jobs:
       - name: Checkout repository ✅
         uses: actions/checkout@v6
 
-      - name: Set up Java 17 ☕
+      - name: Set up Java 21 ☕
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 
diff --git a/.github/workflows/multiTenant_deploy_and_Integration_test_LatestVersion.yml b/.github/workflows/multiTenant_deploy_and_Integration_test_LatestVersion.yml
index e00f7fe3c..16a81e7a9 100644
--- a/.github/workflows/multiTenant_deploy_and_Integration_test_LatestVersion.yml
+++ b/.github/workflows/multiTenant_deploy_and_Integration_test_LatestVersion.yml
@@ -164,10 +164,10 @@ jobs:
       - name: Checkout repository ✅
         uses: actions/checkout@v6
 
-      - name: Set up Java 17 ☕
+      - name: Set up Java 21 ☕
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 
diff --git a/.github/workflows/pull-request-build.yml b/.github/workflows/pull-request-build.yml
index 634075edf..7ebbf875b 100644
--- a/.github/workflows/pull-request-build.yml
+++ b/.github/workflows/pull-request-build.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        java-version: [ 17 ]
+        java-version: [ 21 ]
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/singleTenant_deploy_and_Integration_test.yml b/.github/workflows/singleTenant_deploy_and_Integration_test.yml
index 6f227b84d..9bfc8c059 100644
--- a/.github/workflows/singleTenant_deploy_and_Integration_test.yml
+++ b/.github/workflows/singleTenant_deploy_and_Integration_test.yml
@@ -26,10 +26,10 @@ jobs:
         with:
           ref: develop
 
-      - name: Set up Java 17
+      - name: Set up Java 21
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
 
       - name: Verify and Checkout Deploy Branch
@@ -126,10 +126,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
 
-      - name: Set up Java 17
+      - name: Set up Java 21
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 
diff --git a/.github/workflows/singleTenant_deploy_and_Integration_test_LatestVersion.yml b/.github/workflows/singleTenant_deploy_and_Integration_test_LatestVersion.yml
index 098537141..c5d931227 100644
--- a/.github/workflows/singleTenant_deploy_and_Integration_test_LatestVersion.yml
+++ b/.github/workflows/singleTenant_deploy_and_Integration_test_LatestVersion.yml
@@ -26,10 +26,10 @@ jobs:
         with:
           ref: develop
 
-      - name: Set up Java 17
+      - name: Set up Java 21
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
 
       - name: Verify and Checkout Deploy Branch
@@ -177,10 +177,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
 
-      - name: Set up Java 17
+      - name: Set up Java 21
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 
diff --git a/.github/workflows/singleTenant_integration_test.yml b/.github/workflows/singleTenant_integration_test.yml
index 1c1edf42b..ad5a5b6fe 100644
--- a/.github/workflows/singleTenant_integration_test.yml
+++ b/.github/workflows/singleTenant_integration_test.yml
@@ -29,10 +29,10 @@ jobs:
         with:
           ref: ${{ github.event.inputs.branch_name }}
 
-      - name: Set up Java 17 ☕
+      - name: Set up Java 21 ☕
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 
diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
index 34a81c705..8260b7608 100644
--- a/.github/workflows/sonarqube.yml
+++ b/.github/workflows/sonarqube.yml
@@ -24,10 +24,10 @@ jobs:
         with:
           fetch-depth: 0  # Ensure shallow clones are disabled for better analysis relevancy
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: maven
 
diff --git a/.github/workflows/unit.tests.yml b/.github/workflows/unit.tests.yml
index 646934c67..84c9b0016 100644
--- a/.github/workflows/unit.tests.yml
+++ b/.github/workflows/unit.tests.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: [17]
+        java-version: [21]
     steps:
     - name: Checkout repository
       uses: actions/checkout@v6
diff --git a/deploy-artifactory.sh b/deploy-artifactory.sh
index dc0071b1c..6d30ad52a 100644
--- a/deploy-artifactory.sh
+++ b/deploy-artifactory.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 ########################################
 # CONFIGURATION
 ########################################
-JAVA_VERSION="${JAVA_VERSION:-17}"
+JAVA_VERSION="${JAVA_VERSION:-21}"
 MAVEN_VERSION="${MAVEN_VERSION:-3.6.3}"
 
 # These MUST come from Jenkins
diff --git a/pom.xml b/pom.xml
index 802d1ef8f..8db2566c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
     <properties>
         <revision>1.8.1-SNAPSHOT</revision>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>