From a62fecab3d3e872ae8419c6c55f3495d45be0fcc Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 13 Aug 2020 22:12:43 +0100 Subject: [PATCH] move jdk15 => jdk15u (#2028) --- pipelines/build/openjdk15_pipeline.groovy | 2 +- pipelines/jobs/configurations/{jdk15.groovy => jdk15u.groovy} | 0 ...k15_pipeline_config.groovy => jdk15u_pipeline_config.groovy} | 0 sbin/common/constants.sh | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename pipelines/jobs/configurations/{jdk15.groovy => jdk15u.groovy} (100%) rename pipelines/jobs/configurations/{jdk15_pipeline_config.groovy => jdk15u_pipeline_config.groovy} (100%) diff --git a/pipelines/build/openjdk15_pipeline.groovy b/pipelines/build/openjdk15_pipeline.groovy index d1fccdb34..c8ca06b24 100644 --- a/pipelines/build/openjdk15_pipeline.groovy +++ b/pipelines/build/openjdk15_pipeline.groovy @@ -12,7 +12,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -def javaToBuild = "jdk15" +def javaToBuild = "jdk15u" def scmVars = null Closure configureBuild = null def buildConfigurations = null diff --git a/pipelines/jobs/configurations/jdk15.groovy b/pipelines/jobs/configurations/jdk15u.groovy similarity index 100% rename from pipelines/jobs/configurations/jdk15.groovy rename to pipelines/jobs/configurations/jdk15u.groovy diff --git a/pipelines/jobs/configurations/jdk15_pipeline_config.groovy b/pipelines/jobs/configurations/jdk15u_pipeline_config.groovy similarity index 100% rename from pipelines/jobs/configurations/jdk15_pipeline_config.groovy rename to pipelines/jobs/configurations/jdk15u_pipeline_config.groovy diff --git a/sbin/common/constants.sh b/sbin/common/constants.sh index 8d0115e23..d074ab0e8 100755 --- a/sbin/common/constants.sh +++ b/sbin/common/constants.sh @@ -21,7 +21,7 @@ export JDK11_VERSION="jdk11u"; export JDK12_VERSION="jdk12u"; export JDK13_VERSION="jdk13u"; export JDK14_VERSION="jdk14u"; -export JDK15_VERSION="jdk15"; +export JDK15_VERSION="jdk15u"; export JDKHEAD_VERSION="jdk"; export JDK8_CORE_VERSION="jdk8";