From 12e79d4e1258b240b07be51b8a20878f4a4cb7cc Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Mon, 6 Nov 2023 13:23:51 +0000 Subject: [PATCH] Adjust for JDK21 and 22 Signed-off-by: Stewart X Addison --- pipelines/build/common/build_base_file.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index 6a0d702fe..11f2e7f8f 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -765,7 +765,7 @@ class Builder implements Serializable { tag = publishName } - if (javaToBuild=="jdk21" && scmReference && !release) { + if ((javaToBuild=="jdk21" || javaToBuild=="jdk") && scmReference && !release) { publishName = scmReference.replace('_adopt','') def firstDot=publishName.indexOf('.') def plusSign=publishName.indexOf('+') @@ -787,8 +787,8 @@ class Builder implements Serializable { parameters: [ ['$class': 'BooleanParameterValue', name: 'RELEASE', value: release], ['$class': 'BooleanParameterValue', name: 'DRY_RUN', value: ((releaseType=="Weekly" && javaVersion=="jdk21") ? true : false)], - context.string(name: 'TAG', value: (javaToBuild=="jdk21"?(scmReference.replace('_adopt','')):tag)), - context.string(name: 'TIMESTAMP', value: (javaToBuild=="jdk"?publishName:timestamp)), + context.string(name: 'TAG', value: ((javaToBuild=="jdk21" || javaToBuild=="jdk")?(scmReference.replace('_adopt','')):tag)), + context.string(name: 'TIMESTAMP', value: ((javaToBuild="jdk21" || javaToBuild=="jdk")?publishName:timestamp)), context.string(name: 'UPSTREAM_JOB_NAME', value: env.JOB_NAME), context.string(name: 'UPSTREAM_JOB_NUMBER', value: "${currentBuild.getNumber()}"), context.string(name: 'VERSION', value: javaVersion)