You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2022/08/06 01:56:08 UTC
[archiva-jenkins-lib] branch master updated: jdk 11 default
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 0e5c617 jdk 11 default
0e5c617 is described below
commit 0e5c617e416daff46ab0a225fb1047eb6c85225a
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sat Aug 6 11:56:05 2022 +1000
jdk 11 default
---
vars/multiJdkBuild.groovy | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
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 @@ def call(Map params = [:]) {
])
// 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 @@ def call(Map params = [:]) {
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)
}
}
}