From 2c2290b40e810e0544eb053daac0cbb2c9ceaa17 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Wed, 6 Aug 2025 08:03:28 +0200
Subject: [PATCH 1/3] HDDS-13541. Bump sonar-maven-plugin to 5.1.0.4751

---
 hadoop-ozone/dev-support/checks/sonar.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hadoop-ozone/dev-support/checks/sonar.sh b/hadoop-ozone/dev-support/checks/sonar.sh
index b9948a31d4e0..63c931ce3a92 100755
--- a/hadoop-ozone/dev-support/checks/sonar.sh
+++ b/hadoop-ozone/dev-support/checks/sonar.sh
@@ -27,4 +27,4 @@ fi
 mvn -V -B -DskipShade -DskipTests -DskipRecon --no-transfer-progress \
   -Dsonar.coverage.jacoco.xmlReportPaths="$(pwd)/target/coverage/all.xml" \
   -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=hadoop-ozone \
-  verify org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar
+  verify org.sonarsource.scanner.maven:sonar-maven-plugin:5.1.0.4751:sonar

From 1ea5d259967baf9d44813ed167828f483dee7d70 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Wed, 6 Aug 2025 08:04:09 +0200
Subject: [PATCH 2/3] set SonarQube properties in pom.xml

---
 hadoop-ozone/dev-support/checks/sonar.sh | 1 -
 pom.xml                                  | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hadoop-ozone/dev-support/checks/sonar.sh b/hadoop-ozone/dev-support/checks/sonar.sh
index 63c931ce3a92..bfd6708ab515 100755
--- a/hadoop-ozone/dev-support/checks/sonar.sh
+++ b/hadoop-ozone/dev-support/checks/sonar.sh
@@ -26,5 +26,4 @@ fi
 
 mvn -V -B -DskipShade -DskipTests -DskipRecon --no-transfer-progress \
   -Dsonar.coverage.jacoco.xmlReportPaths="$(pwd)/target/coverage/all.xml" \
-  -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=hadoop-ozone \
   verify org.sonarsource.scanner.maven:sonar-maven-plugin:5.1.0.4751:sonar
diff --git a/pom.xml b/pom.xml
index d37a3005bb0f..17ed8cdd63cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -206,7 +206,10 @@
     <slf4j.version>2.0.17</slf4j.version>
     <snakeyaml.version>2.0</snakeyaml.version>
     <snappy-java.version>1.1.10.8</snappy-java.version>
+    <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     <sonar.java.binaries>${basedir}/target/classes</sonar.java.binaries>
+    <sonar.organization>apache</sonar.organization>
+    <sonar.projectKey>hadoop-ozone</sonar.projectKey>
     <sortpom-maven-plugin.version>3.0.1</sortpom-maven-plugin.version>
     <spotbugs.version>3.1.12.2</spotbugs.version>
     <spring.version>5.3.39</spring.version>

From 6b5ee3c832011917358c42e8ae14b6cf619fc859 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Wed, 6 Aug 2025 09:49:26 +0200
Subject: [PATCH 3/3] extract SONAR_MAVEN_PLUGIN_VERSION

---
 hadoop-ozone/dev-support/checks/sonar.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hadoop-ozone/dev-support/checks/sonar.sh b/hadoop-ozone/dev-support/checks/sonar.sh
index bfd6708ab515..1b6773f779ba 100755
--- a/hadoop-ozone/dev-support/checks/sonar.sh
+++ b/hadoop-ozone/dev-support/checks/sonar.sh
@@ -23,7 +23,8 @@ if [ ! "$SONAR_TOKEN" ]; then
   exit 1
 fi
 
+: "${SONAR_MAVEN_PLUGIN_VERSION:=5.1.0.4751}"
 
 mvn -V -B -DskipShade -DskipTests -DskipRecon --no-transfer-progress \
   -Dsonar.coverage.jacoco.xmlReportPaths="$(pwd)/target/coverage/all.xml" \
-  verify org.sonarsource.scanner.maven:sonar-maven-plugin:5.1.0.4751:sonar
+  verify "org.sonarsource.scanner.maven:sonar-maven-plugin:${SONAR_MAVEN_PLUGIN_VERSION}:sonar"