Skip to content

Commit 38c6430

Browse files
committed
Minor cleanup and fixing non set distribution type in jdk
1 parent 9487fc6 commit 38c6430

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/Jdk.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public void setArchitecture(final String architecture) {
115115
}
116116

117117
public String getDistributionVersion() {
118-
return distributionVersion.get();
118+
return distributionVersion.getOrNull();
119119
}
120120

121121
public void setDistributionVersion(String distributionVersion) {

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/JdkDownloadPlugin.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,8 @@ private void setupRepository(Project project, Jdk jdk) {
114114
+ jdk.getBuild()
115115
+ "/[module]/[classifier]/jdk/hotspot/normal/adoptium";
116116
}
117-
} else if (jdk.getVendor().equals(VENDOR_OPENJDK) && jdk.getDistributionVersion().equals("ea")) {
118-
119-
// "https://builds.es-jdk-archive.com/jdks/openjdk/25/openjdk-25-ea+30/openjdk-25-ea+30_linux-x64_bin.tar.gz"],
120-
// /jdks/openjdk/25/openjdk-25-ea+30/openjdk-25-ea+30_linux
117+
} else if (jdk.getVendor().equals(VENDOR_OPENJDK) && "ea".equals(jdk.getDistributionVersion())) {
121118
repoUrl = "https://builds.es-jdk-archive.com/";
122-
123119
// current pattern since 12.0.1
124120
artifactPattern = "jdks/openjdk/"
125121
+ jdk.getMajor()

0 commit comments

Comments
 (0)