From f1721038600b1e37e044534fbf767eed909d608a Mon Sep 17 00:00:00 2001 From: Morgan Davies Date: Thu, 4 Jun 2020 10:56:58 +0100 Subject: [PATCH] Revert "Update hardcoded JDK next values (#1574)" This reverts commit 7b3fd1e3e2110fff87483859a851ce12a222f7c8. --- pipelines/build/common/build_base_file.groovy | 9 ++------- pipelines/build/common/openjdk_build_pipeline.groovy | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index a5680178c..93ba4dc07 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -208,13 +208,8 @@ class Builder implements Serializable { if (matcher.matches()) { return Integer.parseInt(matcher.group('version')) } else if ("jdk".equalsIgnoreCase(javaToBuild.trim())) { - String javaFeatureVersion = System.getenv("JAVA_FEATURE_VERSION") - if (javaFeatureVersion) { - return Integer.valueOf(javaFeatureVersion) - } else { - context.error("Environment variable JAVA_FEATURE_VERSION not set") - throw new Exception() - } + // This needs to get updated when JDK HEAD version updates + return Integer.valueOf("15") } else { context.error("Failed to read java version '${javaToBuild}'") throw new Exception() diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy index 0c7c866ad..93fd6c807 100644 --- a/pipelines/build/common/openjdk_build_pipeline.groovy +++ b/pipelines/build/common/openjdk_build_pipeline.groovy @@ -62,13 +62,8 @@ class Build { if (matcher.matches()) { return Integer.parseInt(matcher.group('version')) } else if ("jdk".equalsIgnoreCase(javaToBuild.trim())) { - String javaFeatureVersion = System.getenv("JAVA_FEATURE_VERSION") - if (javaFeatureVersion) { - return Integer.valueOf(javaFeatureVersion) - } else { - context.error("Environment variable JAVA_FEATURE_VERSION not set") - throw new Exception() - } + // This needs to get updated when JDK HEAD version updates + return Integer.valueOf("15") } else { context.error("Failed to read java version '${javaToBuild}'") throw new Exception()