commit 0e5c617e416daff46ab0a225fb1047eb6c85225a
author Olivier Lamy <olamy@apache.org> Sat Aug 06 11:56:05 2022 +1000
committer GitHub <noreply@github.com> Sat Aug 06 11:56:05 2022 +1000
tree 2d1fd03e1a736a4e9a128656641e3a1ac4580718
parent 92e897220a181f2d22797ac7a3d7641864a2ad9b

jdk 11 default

vars/multiJdkBuild.groovy

diff --git a/vars/multiJdkBuild.groovy b/vars/multiJdkBuild.groovy
index 62825f7..421a9f6 100644
--- a/vars/multiJdkBuild.groovy
+++ b/vars/multiJdkBuild.groovy
@@ -40,13 +40,13 @@
   ])
 
   // now determine params
-  def jdk = params.containsKey('jdk') ? params.jdk : 'jdk_1.8_latest'
-  def jdk11 = params.containsKey('jdk11') ? params.jdk : 'jdk_11_latest'
+  def jdk = params.containsKey('jdk') ? params.jdk : 'jdk_11_latest'
+  def jdk17 = params.containsKey('jdk17') ? params.jdk : 'jdk_17_latest'
   def upstreamTriggers = params.containsKey('upstreamTriggers')?params.upstreamTriggers:''
   // use the cmdLine parameter otherwise default depending on current branch
   def cmdline = params.containsKey('cmdline') ? params.cmdline : ((env.NONAPACHEORG_RUN != 'y' && env.BRANCH_NAME == 'master') ?"clean deploy":"clean install")
   def cmdlineJdk11 = params.containsKey('cmdlineJdk11') ? params.cmdlineJdk11 : "clean install"
-  def mvnName = params.containsKey('mvnName') ? params.mvnName : 'maven_3.6.3'
+  def mvnName = params.containsKey('mvnName') ? params.mvnName : 'maven_3.8.6'
 
 
   def defaultPublishers = [artifactsPublisher(disabled: false), junitPublisher(ignoreAttachments: false, disabled: false),
@@ -71,18 +71,18 @@
     stages{
       stage("Parallel Stage") {
         parallel {
-          stage("Build JDK8") {
+          stage("Build JDK11") {
             agent { node { label 'ubuntu' } }
             options { timeout(time: 120, unit: 'MINUTES') }
             steps {
               mavenBuild(jdk, cmdline, mvnName, publishers)
             }
           }
-          stage("Build JDK11") {
+          stage("Build JDK17") {
             agent { node { label 'ubuntu' } }
             options { timeout(time: 120, unit: 'MINUTES') }
             steps {
-              mavenBuild(jdk11, cmdlineJdk11, mvnName, publishers)
+              mavenBuild(jdk17, cmdlineJdk11, mvnName, publishers)
             }
           }
         }