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

Jump to bottom

Update AdoptOpenJDK 8 & 11, add upstream OpenJDK 8 & 11 (Linux & Windows) #171

Merged
merged 1 commit into from
Oct 29, 2019
Merged

Update AdoptOpenJDK 8 & 11, add upstream OpenJDK 8 & 11 (Linux & Windows) #171

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
64 changes: 64 additions & 0 deletions src/main/scala/io/sdkman/changelogs/JavaMigrations.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,4 +679,68 @@ class JavaMigrations {
).validate().insert()
Seq(Linux64, MacOSX, Windows).foreach(platform => removeVersion(candidate = "java", version = "11.0.4-amzn", platform))
}

@ChangeSet(order = "205", id = "205-add_adoptopenjdk-hs_8_0_232", author = "andrebrait")
def migrate205(implicit db: MongoDatabase) = {
List(
Version("java", "8.0.232.hs-adpt", "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u232b09.tar.gz", Linux64, Some(AdoptOpenJDK)),
Version("java", "8.0.232.hs-adpt", "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_x64_mac_hotspot_8u232b09.tar.gz", MacOSX, Some(AdoptOpenJDK)),
Version("java", "8.0.232.hs-adpt", "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_x64_windows_hotspot_8u232b09.zip", Windows, Some(AdoptOpenJDK)))
.validate()
.insert()
Seq(Linux64, MacOSX, Windows).foreach(removeVersion("java", "8.0.222.hs-adpt", _))
}

@ChangeSet(order = "206", id = "206-add_adoptopenjdk-j9_8_0_232", author = "andrebrait")
def migrate206(implicit db: MongoDatabase) = {
List(
Version("java", "8.0.232.j9-adpt", "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09_openj9-0.17.0/OpenJDK8U-jdk_x64_linux_openj9_8u232b09_openj9-0.17.0.tar.gz", Linux64, Some(AdoptOpenJDK)),
Version("java", "8.0.232.j9-adpt", "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09_openj9-0.17.0/OpenJDK8U-jdk_x64_mac_openj9_8u232b09_openj9-0.17.0.tar.gz", MacOSX, Some(AdoptOpenJDK)),
Version("java", "8.0.232.j9-adpt", "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09_openj9-0.17.0/OpenJDK8U-jdk_x64_windows_openj9_8u232b09_openj9-0.17.0.zip", Windows, Some(AdoptOpenJDK)))
.validate()
.insert()
Seq(Linux64, MacOSX, Windows).foreach(removeVersion("java", "8.0.222.j9-adpt", _))
}

@ChangeSet(order = "207", id = "207-add_adoptopenjdk-hs_11_0_5", author = "andrebrait")
def migrate207(implicit db: MongoDatabase) = {
List(
Version("java", "11.0.5.hs-adpt", "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5+10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.5_10.tar.gz", Linux64, Some(AdoptOpenJDK)),
Version("java", "11.0.5.hs-adpt", "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5+10/OpenJDK11U-jdk_x64_mac_hotspot_11.0.5_10.tar.gz", MacOSX, Some(AdoptOpenJDK)),
Version("java", "11.0.5.hs-adpt", "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5+10/OpenJDK11U-jdk_x64_windows_hotspot_11.0.5_10.zip", Windows, Some(AdoptOpenJDK)))
.validate()
.insert()
Seq(Linux64, MacOSX, Windows).foreach(removeVersion("java", "11.0.4.hs-adpt", _))
}

@ChangeSet(order = "208", id = "208-add_adoptopenjdk-j9_11_0_5", author = "andrebrait")
def migrate208(implicit db: MongoDatabase) = {
List(
Version("java", "11.0.5.j9-adpt", "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5+10_openj9-0.17.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.5_10_openj9-0.17.0.tar.gz", Linux64, Some(AdoptOpenJDK)),
Version("java", "11.0.5.j9-adpt", "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5+10_openj9-0.17.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.5_10_openj9-0.17.0.tar.gz", MacOSX, Some(AdoptOpenJDK)),
Version("java", "11.0.5.j9-adpt", "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5+10_openj9-0.17.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.5_10_openj9-0.17.0.zip", Windows, Some(AdoptOpenJDK)))
.validate()
.insert()
Seq(Linux64, MacOSX, Windows).foreach(removeVersion("java", "11.0.4.j9-adpt", _))
}

@ChangeSet(order = "209", id = "209-add_openjdk_8_0_232", author = "andrebrait")
def migrate209(implicit db: MongoDatabase) = {
List(
Version("java", "8.0.232-open", "https://github.com/AdoptOpenJDK/openjdk8-upstream-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_x64_linux_8u232b09.tar.gz", Linux64),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't really add adoptopenjdk builds as -open because this is reserved for reference implementation JDKs coming from http://jdk.java.net.

They aren't releasing any new versions of JDK8, and only seem to have new RIs for 11, 12 and 13 now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marc0der Although the URLs are from AdoptOpenJDK, these are actually binaries from upstream builds of the OpenJDK (see https://adoptopenjdk.net/upstream.html and AdoptOpenJDK/TSC#65)

So these are provided by AdoptOpenJDK on behalf of RedHat as builds of the reference implementation. We can find another name for them, if you want (perhaps redhat?) but these are technically the continuation of what is provided in http://jdk.java.net

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@andrebrait Thanks for the explanation, it makes perfect sense now. I think keeping it under the -open label works perfectly in that case.

Going forward, would it be an idea for the AdoptOpenJDK project to start using our vendor API instead of using PRs? This could make things a lot easier than using a PR for each new release.

Version("java", "8.0.232-open", "https://github.com/AdoptOpenJDK/openjdk8-upstream-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_x64_windows_8u232b09.zip", Windows))
.validate()
.insert()
}

@ChangeSet(order = "210", id = "210-add_openjdk_11_0_5", author = "andrebrait")
def migrate210(implicit db: MongoDatabase) = {
marc0der marked this conversation as resolved.
Show resolved Hide resolved
List(
Version("java", "11.0.5-open", "https://github.com/AdoptOpenJDK/openjdk11-upstream-binaries/releases/download/jdk-11.0.5+10/OpenJDK11U-jdk_x64_linux_11.0.5_10.tar.gz", Linux64),
Version("java", "11.0.5-open", "https://github.com/AdoptOpenJDK/openjdk11-upstream-binaries/releases/download/jdk-11.0.5+10/OpenJDK11U-jdk_x64_windows_11.0.5_10.zip", Windows))
.validate()
.insert()
Seq(Linux64, Windows).foreach(removeVersion("java", "11.0.2-open", _))
}

}