Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Update hardcoded JDK next values (#1574)" #1821

Closed
wants to merge 1 commit into from
Closed

Revert "Update hardcoded JDK next values (#1574)" #1821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions pipelines/build/common/build_base_file.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
9 changes: 2 additions & 7 deletions pipelines/build/common/openjdk_build_pipeline.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down