SLING-9839 - undo the sonarQube jdk 11 changes, they are likely to break other things
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 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 @@
// 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"
