From aa2acedcae790bf9f36b4eabff2fe91576336b3b Mon Sep 17 00:00:00 2001
From: Francois Papon <fpapon@apache.org>
Date: Mon, 5 Oct 2020 20:56:31 +0200
Subject: [PATCH] Move sonar build step to Java 11 pipeline

---
 Jenkinsfile       | 9 ---------
 Jenkinsfile-jdk11 | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 81a93ca7a8..a53d4f81d2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -88,15 +88,6 @@ pipeline {
             }
         }
 
-        stage('Code Quality') {
-            steps {
-                echo 'Checking Code Quality on SonarCloud'
-                withCredentials([string(credentialsId: 'sonarcloud-key-apache-shiro', variable: 'SONAR_TOKEN')]) {
-                    sh 'mvn sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_shiro -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}'
-                }
-            }
-        }
-
         stage('Generate doc') {
             when {
                 expression {
diff --git a/Jenkinsfile-jdk11 b/Jenkinsfile-jdk11
index 2b3d5eab94..ba838cabc6 100644
--- a/Jenkinsfile-jdk11
+++ b/Jenkinsfile-jdk11
@@ -89,6 +89,15 @@ pipeline {
             }
         }
 
+        stage('Code Quality') {
+            steps {
+                echo 'Checking Code Quality on SonarCloud'
+                withCredentials([string(credentialsId: 'sonarcloud-key-apache-shiro', variable: 'SONAR_TOKEN')]) {
+                    sh 'mvn sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_shiro -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}'
+                }
+            }
+        }
+
         stage('Generate doc') {
             when {
                 expression {