From 42177590d4fc140c6e8f4ba97781dded0aa3cc2a Mon Sep 17 00:00:00 2001
From: brais <26645694+BraisVQ@users.noreply.github.com>
Date: Mon, 30 Mar 2026 17:04:26 +0200
Subject: [PATCH 1/3] update sonarqube execution to use java 21

---
 src/org/ods/services/SonarQubeService.groovy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/ods/services/SonarQubeService.groovy b/src/org/ods/services/SonarQubeService.groovy
index f68596251..58b60b3eb 100644
--- a/src/org/ods/services/SonarQubeService.groovy
+++ b/src/org/ods/services/SonarQubeService.groovy
@@ -82,8 +82,8 @@ class SonarQubeService {
                 scannerParams << "-Dsonar.branch.name=${properties['sonar.branch.name']}"
             }
             script.sh(
-                label: 'Set Java 17 for SonarQube scan',
-                script: "source use-j17.sh"
+                label: 'Set Java 21 for SonarQube scan',
+                script: "source use-j21.sh"
             )
             script.sh(
                 label: 'Run SonarQube scan',

From 3d1ecac15b4d02688c44fdf7219bfbf3735663a1 Mon Sep 17 00:00:00 2001
From: brais <26645694+BraisVQ@users.noreply.github.com>
Date: Mon, 30 Mar 2026 17:15:47 +0200
Subject: [PATCH 2/3] Update Java version for SonarQube scan tests

---
 test/groovy/org/ods/services/SonarQubeServiceSpec.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/groovy/org/ods/services/SonarQubeServiceSpec.groovy b/test/groovy/org/ods/services/SonarQubeServiceSpec.groovy
index 564d2b0da..3bd4c8e2c 100644
--- a/test/groovy/org/ods/services/SonarQubeServiceSpec.groovy
+++ b/test/groovy/org/ods/services/SonarQubeServiceSpec.groovy
@@ -108,7 +108,7 @@ class SonarQubeServiceSpec extends PipelineSpockTestBase {
         service.scan(optionsWithoutPrivateToken)
 
         then:
-        2 * steps.sh(label: 'Set Java 17 for SonarQube scan', script: "source use-j17.sh")
+        2 * steps.sh(label: 'Set Java 21 for SonarQube scan', script: "source use-j21.sh")
         1 * steps.sh(label: 'Run SonarQube scan', script: { it.contains("/opt/sonar-scanner/bin/sonar-scanner") && it.contains("-Dsonar.projectKey=key") && it.contains("-Dsonar.projectName=name") && it.contains("-Dsonar.exclusions=test/**") && it.contains("-Dsonar.auth.token=my-private-token") })
         1 * steps.sh(label: 'Run SonarQube scan', script: { it.contains("/opt/sonar-scanner/bin/sonar-scanner") && it.contains("-Dsonar.projectKey=key") && it.contains("-Dsonar.projectName=name") && it.contains("-Dsonar.exclusions=test/**") && it.contains("-Dsonar.auth.token=public-token") })
     }

From d3a6d74436318f72cb59420fe5d03f825c9814ce Mon Sep 17 00:00:00 2001
From: brais <26645694+BraisVQ@users.noreply.github.com>
Date: Mon, 30 Mar 2026 17:17:01 +0200
Subject: [PATCH 3/3] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84b434b1f..31117469b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 ### Changed
 * Push container images to AWS ECR independently of EKS, while optionally triggering EKS deployments when needed ([#1267](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1267))
+* Updated Java version in sonarqube execution to Java 21 ([#1269](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1269))
 
 ### Fixed
 * Fix Tailor deployment drifts for D, Q envs ([#1055](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1055))