From accdccc5b13af2e9be717a62f7c7e384c78af16e Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sun, 10 May 2020 21:44:13 +0200
Subject: [PATCH] use SonarQube from ces-build-lib

---
 Jenkinsfile | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c7dff42e68..776b1dea36 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -81,8 +81,8 @@ node('docker') {
       )
 
       stage('SonarQube') {
-
-        analyzeWith(mvn)
+        def sonarQube = new SonarCloud(this, [sonarQubeEnv: 'sonarcloud.io-scm', sonarOrganization: 'scm-manager'])
+        sonarQube.analyzeWith(mvn)
 
         if (!waitForQualityGateWebhookToBeCalled()) {
           currentBuild.result = 'UNSTABLE'
@@ -224,34 +224,6 @@ Maven setupMavenBuild() {
   return mvn
 }
 
-void analyzeWith(Maven mvn) {
-
-  withSonarQubeEnv('sonarcloud.io-scm') {
-
-    String mvnArgs = "${env.SONAR_MAVEN_GOAL} " +
-      "-Dsonar.host.url=${env.SONAR_HOST_URL} " +
-      "-Dsonar.login=${env.SONAR_AUTH_TOKEN} "
-
-    if (isPullRequest()) {
-      echo "Analysing SQ in PR mode"
-      mvnArgs += "-Dsonar.pullrequest.base=${env.CHANGE_TARGET} " +
-        "-Dsonar.pullrequest.branch=${env.CHANGE_BRANCH} " +
-        "-Dsonar.pullrequest.key=${env.CHANGE_ID} " +
-        "-Dsonar.pullrequest.provider=bitbucketcloud " +
-        "-Dsonar.pullrequest.bitbucketcloud.owner=sdorra " +
-        "-Dsonar.pullrequest.bitbucketcloud.repository=scm-manager " +
-        "-Dsonar.cpd.exclusions=**/*StoreFactory.java,**/*UserPassword.js "
-    } else {
-      mvnArgs += " -Dsonar.branch.name=${env.BRANCH_NAME} "
-      if (!isMainBranch()) {
-        // Avoid exception "The main branch must not have a target" on main branch
-        mvnArgs += " -Dsonar.branch.target=${mainBranch} "
-      }
-    }
-    mvn "${mvnArgs}"
-  }
-}
-
 boolean isReleaseBranch() {
   return env.BRANCH_NAME.startsWith("release/");
 }