You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2024/01/09 22:07:40 UTC
(maven-jenkins-lib) 01/01: Add JDK 21 to standard builds, deploy by JDK 21
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch jdk-21
in repository https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git
commit abf5c22c0248e04f69ce34b311f9abe5607ea072
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Tue Jan 9 23:05:48 2024 +0100
Add JDK 21 to standard builds, deploy by JDK 21
---
vars/asfMavenTlpPlgnBuild.groovy | 4 ++--
vars/asfMavenTlpStdBuild.groovy | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/vars/asfMavenTlpPlgnBuild.groovy b/vars/asfMavenTlpPlgnBuild.groovy
index afa641d..f0ca2b7 100644
--- a/vars/asfMavenTlpPlgnBuild.groovy
+++ b/vars/asfMavenTlpPlgnBuild.groovy
@@ -38,7 +38,7 @@ def call(Map params = [:]) {
// now determine the matrix of parallel builds
def oses = params.containsKey('os') ? params.os : ['linux']
// minimum, LTS, current and next ea
- def jdks = params.containsKey('jdks') ? params.jdks : params.containsKey('jdk') ? params.jdk : ['8','11','17']
+ def jdks = params.containsKey('jdks') ? params.jdks : params.containsKey('jdk') ? params.jdk : ['8','11','17','21']
def jdkMin = jdks[0];
def mavens = params.containsKey('maven') ? params.maven : ['3.6.x', '3.9.x']
// def failFast = params.containsKey('failFast') ? params.failFast : true
@@ -136,7 +136,7 @@ def doCreateTask( os, jdk, maven, tasks, first, plan, taskContext )
if (plan == 'build') {
cmd += 'clean'
- if (env.BRANCH_NAME == 'master' && jdk == '17' && maven == '3.9.x' && os == 'linux' ) {
+ if (env.BRANCH_NAME == 'master' && jdk == '21' && maven == '3.9.x' && os == 'linux' ) {
cmd += 'deploy'
} else {
cmd += 'verify -Dpgpverify.skip'
diff --git a/vars/asfMavenTlpStdBuild.groovy b/vars/asfMavenTlpStdBuild.groovy
index e69e50d..4071f7a 100644
--- a/vars/asfMavenTlpStdBuild.groovy
+++ b/vars/asfMavenTlpStdBuild.groovy
@@ -37,7 +37,7 @@ def call(Map params = [:]) {
// now determine the matrix of parallel builds
def oses = params.containsKey('os') ? params.os : ['linux']
// minimum, LTS, current and next ea
- def jdks = params.containsKey('jdks') ? params.jdks : params.containsKey('jdk') ? params.jdk : ['8','11','17']
+ def jdks = params.containsKey('jdks') ? params.jdks : params.containsKey('jdk') ? params.jdk : ['8','11','17','21']
def maven = params.containsKey('maven') ? params.maven : '3.9.x'
def tmpWs = params.containsKey('tmpWs') ? params.tmpWs : false
def mavenArgs = params.containsKey('mavenArgs') ? params.mavenArgs : ''
@@ -69,7 +69,7 @@ def call(Map params = [:]) {
}
cmd += 'clean'
cmd += mavenArgs
- if (env.BRANCH_NAME == 'master' && jdk == '17' && os == 'linux' ) {
+ if (env.BRANCH_NAME == 'master' && jdk == '21' && os == 'linux' ) {
cmd += 'deploy'
} else {
cmd += 'verify -Dpgpverify.skip'