From 90001a98dd06a54d5817d7f5799c36949a319825 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Mon, 20 Dec 2021 07:58:35 +0100
Subject: [PATCH] Moves Sonar config into pom.xml

---
 Jenkinsfile | 2 +-
 pom.xml     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 13307c90f..1a833f8fa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -94,7 +94,7 @@ pipeline {
           }
           steps {
             withCredentials([string(credentialsId: 'asf-struts-sonarcloud', variable: 'SONARCLOUD_TOKEN')]) {
-              sh 'mvn sonar:sonar -DskipAssembly -Dsonar.projectKey=apache_struts -Dsonar.organization=apache -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${SONARCLOUD_TOKEN}'
+              sh 'mvn sonar:sonar -DskipAssembly -Dsonar.login=${SONARCLOUD_TOKEN}'
             }
           }
         }
diff --git a/pom.xml b/pom.xml
index 399c0b7a1..cc588cff2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,9 @@
         <fluido-skin.version>1.9</fluido-skin.version>
 
         <!-- Sonar -->
-        <sonar.host.url>https://builds.apache.org/analysis/</sonar.host.url>
+        <sonar.projectKey>apache_struts</sonar.projectKey>
+        <sonar.organization>apache</sonar.organization>
+        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <sonar.exclusions>apps/**</sonar.exclusions>
     </properties>