[sling-tooling-jenkins] branch master updated: SLING-9839 - undo the sonarQube jdk 11 changes, they are likely to break other things

[bd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bdelacretaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-tooling-jenkins.git


The following commit(s) were added to refs/heads/master by this push:
     new f1b9ec0  SLING-9839 - undo the sonarQube jdk 11 changes, they are likely to break other things
f1b9ec0 is described below

commit f1b9ec078549bd0820926a8d2f6699ed5bc92a50
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Nov 5 18:23:43 2020 +0100

    SLING-9839 - undo the sonarQube jdk 11 changes, they are likely to break other things
---
 vars/slingOsgiBundleBuild.groovy | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/vars/slingOsgiBundleBuild.groovy b/vars/slingOsgiBundleBuild.groovy
index ff44712..90873f4 100644
--- a/vars/slingOsgiBundleBuild.groovy
+++ b/vars/slingOsgiBundleBuild.groovy
@@ -4,7 +4,6 @@ def call(Map params = [:]) {
 
     def globalConfig = [
         availableJDKs : [ 8: 'jdk_1.8_latest', 9: 'jdk_1.9_latest', 10: 'jdk_10_latest', 11: 'jdk_11_latest', 12: 'jdk_12_latest', 13: 'jdk_13_latest', 14: 'jdk_14_latest', 15: 'jdk_15_latest', 16: 'jdk_16_latest'],
-        sonarQubeJdk: 11,
         mvnVersion : 'maven_3_latest',
         mainNodeLabel : 'ubuntu',
         githubCredentialsId: 'sling-github-token'
@@ -52,8 +51,7 @@ def call(Map params = [:]) {
                         // Alls params are set, let's execute using #withCrendentials to hide and mask Robert's token
                         withCredentials([string(credentialsId: 'sonarcloud-token-rombert', variable: 'SONAR_TOKEN')]) {
                             withMaven(maven: globalConfig.mvnVersion, 
-                                // SonarQube now neeeds JDK 11, SLING-9880
-                                jdk: jenkinsJdkLabel(globalConfig.sonarQubeJdk, globalConfig),
+                                jdk: jenkinsJdkLabel(jobConfig.jdks[0], globalConfig),
                                 publisherStrategy: 'EXPLICIT') {
                                     try {
                                          sh  "mvn -U clean verify sonar:sonar ${sonarcloudParams} -Pci"