[jspwiki] 22/23: Jenkinsfile uses JDK 11 to perform the build, as this is now the minimum required by SonarQube (https://sonarcloud.io/documentation/appendices/end-of-support/)

[juanpablo]

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

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit c9919b5f24372b94494e4b750f4b5e64baa9b54f
Author: juanpablo <juanpa...@apache.org>
AuthorDate: Sat Nov 7 21:03:13 2020 +0100

    Jenkinsfile uses JDK 11 to perform the build, as this is now the minimum 
required by SonarQube 
(https://sonarcloud.io/documentation/appendices/end-of-support/)
---
 Jenkinsfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 80fabbb..7a411ee 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,6 +24,8 @@ try {
 
     def asfsite = 'asf-site'
     def build = 'build'
+    def buildJdk = 'jdk_11_latest'
+    def buildMvn = 'Maven 3 (latest)'
     def jbake = 'jbake'
     def pom
 
@@ -35,7 +37,7 @@ try {
         stage( 'build source' ) {
             dir( build ) {
                 git url: buildRepo, poll: true
-                withMaven(jdk: 'JDK 1.8 (latest)', maven: 'Maven 3 (latest)' ) 
{
+                withMaven( jdk: buildJdk, maven: buildMvn ) {
                     withCredentials( [ string( credentialsId: 
'sonarcloud-jspwiki', variable: 'SONAR_TOKEN' ) ] ) {
                         def sonarOptions = "-Dsonar.projectKey=jspwiki-builder 
-Dsonar.organization=apache -Dsonar.host.url=https://sonarcloud.io 
-Dsonar.login=$SONAR_TOKEN"
                         echo 'Will use SonarQube instance at 
https://sonarcloud.io'
@@ -51,7 +53,7 @@ try {
         }
 
         stage( 'build website' ) {
-            withMaven(jdk: 'JDK 1.8 (latest)', maven: 'Maven 3 (latest)' ) {
+            withMaven( jdk: buildJdk, maven: buildMvn ) {
                 dir( jbake ) {
                     git branch: jbake, url: siteRepo, credentialsId: creds, 
poll: false
                     sh "cp ../$build/ChangeLog.md 
./src/main/config/changelog.md"