From b1fcd9fa5b0f19ed29188e7f84bc653a79e6a08a Mon Sep 17 00:00:00 2001 From: sciencesakura Date: Wed, 29 Oct 2025 23:01:17 +0900 Subject: [PATCH 1/3] Add JMC 9.1.1-zulu --- .../JdkMissionControlMigrations.scala | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/main/scala/io/sdkman/changelogs/JdkMissionControlMigrations.scala b/src/main/scala/io/sdkman/changelogs/JdkMissionControlMigrations.scala index fe3032b5e..a8764b928 100644 --- a/src/main/scala/io/sdkman/changelogs/JdkMissionControlMigrations.scala +++ b/src/main/scala/io/sdkman/changelogs/JdkMissionControlMigrations.scala @@ -47,4 +47,30 @@ class JdkMissionControlMigrations { .validate() .insert() + @ChangeSet( + order = "003", + id = "003-add-zulu-9.1.1", + author = "sciencesakura" + ) + def migrate003(implicit db: MongoDatabase): Unit = + Map( + Linux64 -> "zmc9.1.1.35-ca-linux_x64.tar.gz", + LinuxARM64 -> "zmc9.1.1.35-ca-linux_aarch64.tar.gz", + MacOSX -> "zmc9.1.1.35-ca-macos_x64.tar.gz", + MacARM64 -> "zmc9.1.1.35-ca-macos_aarch64.tar.gz", + Windows -> "zmc9.1.1.35-ca-win_x64.zip" + ).map { + case (platform, binary) => + Version( + "jmc", + "9.1.1-zulu", + s"https://cdn.azul.com/zmc/bin/$binary", + platform, + Some(Zulu) + ) + } + .toList + .validate() + .insert() + } From 02fe2105bf2e45da2ccb34bb3e239cf9783253ce Mon Sep 17 00:00:00 2001 From: sciencesakura Date: Tue, 11 Nov 2025 03:33:31 +0900 Subject: [PATCH 2/3] Add latest version of each JMC distribution. --- .../JdkMissionControlMigrations.scala | 58 +++++++++++++++---- 1 file changed, 47 insertions(+), 11 deletions(-) diff --git a/src/main/scala/io/sdkman/changelogs/JdkMissionControlMigrations.scala b/src/main/scala/io/sdkman/changelogs/JdkMissionControlMigrations.scala index a8764b928..b1e98f072 100644 --- a/src/main/scala/io/sdkman/changelogs/JdkMissionControlMigrations.scala +++ b/src/main/scala/io/sdkman/changelogs/JdkMissionControlMigrations.scala @@ -49,18 +49,54 @@ class JdkMissionControlMigrations { @ChangeSet( order = "003", - id = "003-add-zulu-9.1.1", + id = "003-add-latest-version-of-each-distribution", author = "sciencesakura" ) - def migrate003(implicit db: MongoDatabase): Unit = - Map( - Linux64 -> "zmc9.1.1.35-ca-linux_x64.tar.gz", - LinuxARM64 -> "zmc9.1.1.35-ca-linux_aarch64.tar.gz", - MacOSX -> "zmc9.1.1.35-ca-macos_x64.tar.gz", - MacARM64 -> "zmc9.1.1.35-ca-macos_aarch64.tar.gz", - Windows -> "zmc9.1.1.35-ca-win_x64.zip" + def migrate003(implicit db: MongoDatabase): Unit = { + List( + ("adpt", Linux64, "org.openjdk.jmc-9.1.1-linux.gtk.x86_64.tar.gz"), + ("adpt", LinuxARM64, "org.openjdk.jmc-9.1.1-linux.gtk.aarch64.tar.gz"), + ("adpt", MacOSX, "org.openjdk.jmc-9.1.1-macosx.cocoa.x86_64.tar.gz"), + ("adpt", MacARM64, "org.openjdk.jmc-9.1.1-macosx.cocoa.aarch64.tar.gz"), + ("adpt", Windows, "org.openjdk.jmc-9.1.1-win32.win32.x86_64.zip"), + ("amzn", Linux64, "amazon-corretto-jmc-8.1.1.1-linux-x64.tar.gz"), + ("amzn", MacOSX, "amazon-corretto-jmc-8.1.1.1-mac-x64.tar.gz"), + ("amzn", Windows, "amazon-corretto-jmc-8.1.1.1-windows-x64.zip"), + ("librca", Linux64, "bellsoft-lmc8.3.0-linux-amd64.tar.gz"), + ("librca", MacOSX, "bellsoft-lmc8.3.0-macos-amd64.tar.gz"), + ("librca", MacARM64, "bellsoft-lmc8.3.0-macos-aarch64.tar.gz"), + ("librca", Windows, "bellsoft-lmc8.3.0-windows-amd64.zip"), + ("zulu", Linux64, "zmc9.1.1.35-ca-linux_x64.tar.gz"), + ("zulu", LinuxARM64, "zmc9.1.1.35-ca-linux_aarch64.tar.gz"), + ("zulu", MacOSX, "zmc9.1.1.35-ca-macos_x64.tar.gz"), + ("zulu", MacARM64, "zmc9.1.1.35-ca-macos_aarch64.tar.gz"), + ("zulu", Windows, "zmc9.1.1.35-ca-win_x64.zip") ).map { - case (platform, binary) => + case ("adpt", platform, binary) => + Version( + "jmc", + "9.1.1-adpt", + s"https://github.com/adoptium/jmc-build/releases/download/9.1.1/$binary", + platform, + Some(AdoptOpenJDK) + ) + case ("amzn", platform, binary) => + Version( + "jmc", + "8.1.1.1-amzn", + s"https://corretto.aws/downloads/resources/jmc/8.1.1.1/$binary", + platform, + Some(Amazon) + ) + case ("librca", platform, binary) => + Version( + "jmc", + "8.3.0-librca", + s"https://download.bell-sw.com/lmc/8.3.0/$binary", + platform, + Some(Liberica) + ) + case ("zulu", platform, binary) => Version( "jmc", "9.1.1-zulu", @@ -69,8 +105,8 @@ class JdkMissionControlMigrations { Some(Zulu) ) } - .toList .validate() .insert() - + setCandidateDefault("jmc", "9.1.1-zulu") + } } From 63d2e54103485ab15952f45269fd86e3ec2ee1c2 Mon Sep 17 00:00:00 2001 From: sciencesakura Date: Thu, 13 Nov 2025 00:17:15 +0900 Subject: [PATCH 3/3] Upgrade CI to use the latest Java 11.x-tem. --- .github/workflows/migrate.yml | 10 ++++++---- .github/workflows/pr.yml | 10 ++++++---- .sdkmanrc | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/migrate.yml b/.github/workflows/migrate.yml index 558b97af3..b9e9eb12a 100644 --- a/.github/workflows/migrate.yml +++ b/.github/workflows/migrate.yml @@ -11,11 +11,13 @@ jobs: environment: Production steps: - name: Checkout source code - uses: actions/checkout@v2 - - name: Set up JDK 11.0.11 - uses: actions/setup-java@v1 + uses: actions/checkout@v4 + - name: Set up the latest JDK 11 + uses: actions/setup-java@v4 with: - java-version: 11.0.11 + java-version: 11 + distribution: temurin + cache: gradle - name: Run production migration env: MONGO_HOST: ${{ secrets.MONGO_HOST }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 2f3def936..e2b3b8f92 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -12,11 +12,13 @@ jobs: - 27017:27017 steps: - name: Checkout source code - uses: actions/checkout@v2 - - name: Set up JDK 11.0.11 - uses: actions/setup-java@v1 + uses: actions/checkout@v4 + - name: Set up the latest JDK 11 + uses: actions/setup-java@v4 with: - java-version: 11.0.11 + java-version: 11 + distribution: temurin + cache: gradle - name: Run local migration run: ./gradlew run - uses: kentaro-m/auto-assign-action@v1.1.2 diff --git a/.sdkmanrc b/.sdkmanrc index af44e2ac4..1aec4fce3 100644 --- a/.sdkmanrc +++ b/.sdkmanrc @@ -1 +1 @@ -java=11.0.16-tem +java=11.0.29-tem