From 2ea21ee0aeb3b5539b68558c506b77ee446f9795 Mon Sep 17 00:00:00 2001 From: Chad Wilson Date: Sun, 29 Aug 2021 23:42:24 +0800 Subject: [PATCH] Migrate to Adoptium Java `17.0.1+12` LTS builds --- .tool-versions | 2 +- build.gradle | 6 +++--- ...doptOpenJDKUrlHelper.groovy => AdoptiumUrlHelper.groovy} | 5 +++-- .../com/thoughtworks/go/build/docker/DistroBehavior.groovy | 4 ++-- installers/linux.gradle | 6 +++--- installers/osx.gradle | 6 +++--- installers/windows.gradle | 6 +++--- 7 files changed, 18 insertions(+), 17 deletions(-) rename buildSrc/src/main/groovy/com/thoughtworks/go/build/{AdoptOpenJDKUrlHelper.groovy => AdoptiumUrlHelper.groovy} (78%) diff --git a/.tool-versions b/.tool-versions index 7c46e994745..99ed337de24 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,4 +1,4 @@ # Configuration for https://github.com/asdf-vm/asdf as an alternative to jabba, rvm, nvm etc -java adoptopenjdk-15.0.2+7 +java temurin-17.0.1+12 ruby jruby-9.3.3.0 nodejs 16.13.1 diff --git a/build.gradle b/build.gradle index d462db63b20..694b4a9797e 100644 --- a/build.gradle +++ b/build.gradle @@ -166,10 +166,10 @@ project.ext.compilerOptions = [ project.ext.packaging = [ adoptOpenjdk: [ - featureVersion: 15, + featureVersion: 17, interimVersion: 0, // set to `null` for the first release - updateVersion : 2, // set to `null` for the first release - buildVersion : 7 + updateVersion : 1, // set to `null` for the first release + buildVersion : 12 ] ] diff --git a/buildSrc/src/main/groovy/com/thoughtworks/go/build/AdoptOpenJDKUrlHelper.groovy b/buildSrc/src/main/groovy/com/thoughtworks/go/build/AdoptiumUrlHelper.groovy similarity index 78% rename from buildSrc/src/main/groovy/com/thoughtworks/go/build/AdoptOpenJDKUrlHelper.groovy rename to buildSrc/src/main/groovy/com/thoughtworks/go/build/AdoptiumUrlHelper.groovy index 0b696f43154..ad269bc1bb2 100644 --- a/buildSrc/src/main/groovy/com/thoughtworks/go/build/AdoptOpenJDKUrlHelper.groovy +++ b/buildSrc/src/main/groovy/com/thoughtworks/go/build/AdoptiumUrlHelper.groovy @@ -26,11 +26,12 @@ enum OperatingSystem { } } -class AdoptOpenJDKUrlHelper { +class AdoptiumUrlHelper { static String downloadURL(OperatingSystem operatingSystem, Integer featureVersion, Integer interimVersion, Integer updateVersion, Integer buildVersion) { String versionComponent = [featureVersion, interimVersion, updateVersion].findAll({ it != null }).join('.') + String featureSuffix = updateVersion == null ? '' : 'U' - "https://github.com/AdoptOpenJDK/openjdk${featureVersion}-binaries/releases/download/jdk-${versionComponent}%2B${buildVersion}/OpenJDK${featureVersion}U-jre_x64_${operatingSystem.name()}_hotspot_${versionComponent}_${buildVersion}.${operatingSystem.extension}" + "https://github.com/adoptium/temurin${featureVersion}-binaries/releases/download/jdk-${versionComponent}%2B${buildVersion}/OpenJDK${featureVersion}${featureSuffix}-jre_x64_${operatingSystem.name()}_hotspot_${versionComponent}_${buildVersion}.${operatingSystem.extension}" } static String sha256sumURL(OperatingSystem operatingSystem, Integer featureVersion, Integer interimVersion, Integer updateVersion, Integer buildVersion) { diff --git a/buildSrc/src/main/groovy/com/thoughtworks/go/build/docker/DistroBehavior.groovy b/buildSrc/src/main/groovy/com/thoughtworks/go/build/docker/DistroBehavior.groovy index c1cc30e451f..470f91a3cf3 100644 --- a/buildSrc/src/main/groovy/com/thoughtworks/go/build/docker/DistroBehavior.groovy +++ b/buildSrc/src/main/groovy/com/thoughtworks/go/build/docker/DistroBehavior.groovy @@ -16,7 +16,7 @@ package com.thoughtworks.go.build.docker -import com.thoughtworks.go.build.AdoptOpenJDKUrlHelper +import com.thoughtworks.go.build.AdoptiumUrlHelper import org.gradle.api.Project trait DistroBehavior { @@ -53,7 +53,7 @@ trait DistroBehavior { } List getInstallJavaCommands(Project project) { - def downloadUrl = AdoptOpenJDKUrlHelper.downloadURL( + def downloadUrl = AdoptiumUrlHelper.downloadURL( com.thoughtworks.go.build.OperatingSystem.linux, project.packaging.adoptOpenjdk.featureVersion, project.packaging.adoptOpenjdk.interimVersion, diff --git a/installers/linux.gradle b/installers/linux.gradle index f2947423dab..a509d72a6aa 100644 --- a/installers/linux.gradle +++ b/installers/linux.gradle @@ -15,7 +15,7 @@ */ -import com.thoughtworks.go.build.AdoptOpenJDKUrlHelper +import com.thoughtworks.go.build.AdoptiumUrlHelper import com.thoughtworks.go.build.DownloadFile import com.thoughtworks.go.build.InstallerType import groovy.json.JsonOutput @@ -105,7 +105,7 @@ private File destFile(String url) { } task downloadLinuxJreChecksum(type: DownloadFile) { - def srcUrl = AdoptOpenJDKUrlHelper.sha256sumURL( + def srcUrl = AdoptiumUrlHelper.sha256sumURL( com.thoughtworks.go.build.OperatingSystem.linux, project.packaging.adoptOpenjdk.featureVersion, project.packaging.adoptOpenjdk.interimVersion, @@ -119,7 +119,7 @@ task downloadLinuxJreChecksum(type: DownloadFile) { task downloadLinuxJre(type: DownloadFile) { dependsOn downloadLinuxJreChecksum - def srcUrl = AdoptOpenJDKUrlHelper.downloadURL( + def srcUrl = AdoptiumUrlHelper.downloadURL( com.thoughtworks.go.build.OperatingSystem.linux, project.packaging.adoptOpenjdk.featureVersion, project.packaging.adoptOpenjdk.interimVersion, diff --git a/installers/osx.gradle b/installers/osx.gradle index ee6f7e9793c..2b74d5d7853 100644 --- a/installers/osx.gradle +++ b/installers/osx.gradle @@ -1,4 +1,4 @@ -import com.thoughtworks.go.build.AdoptOpenJDKUrlHelper +import com.thoughtworks.go.build.AdoptiumUrlHelper import com.thoughtworks.go.build.DownloadFile import com.thoughtworks.go.build.InstallerType import org.apache.commons.codec.digest.DigestUtils @@ -24,7 +24,7 @@ private File destFile(String url) { } task downloadOsxJreChecksum(type: DownloadFile) { - def srcUrl = AdoptOpenJDKUrlHelper.sha256sumURL( + def srcUrl = AdoptiumUrlHelper.sha256sumURL( com.thoughtworks.go.build.OperatingSystem.mac, project.packaging.adoptOpenjdk.featureVersion, project.packaging.adoptOpenjdk.interimVersion, @@ -37,7 +37,7 @@ task downloadOsxJreChecksum(type: DownloadFile) { task downloadOsxJre(type: DownloadFile) { dependsOn downloadOsxJreChecksum - def srcUrl = AdoptOpenJDKUrlHelper.downloadURL( + def srcUrl = AdoptiumUrlHelper.downloadURL( com.thoughtworks.go.build.OperatingSystem.mac, project.packaging.adoptOpenjdk.featureVersion, project.packaging.adoptOpenjdk.interimVersion, diff --git a/installers/windows.gradle b/installers/windows.gradle index 54882e31c11..6e5805b7f56 100644 --- a/installers/windows.gradle +++ b/installers/windows.gradle @@ -15,7 +15,7 @@ */ -import com.thoughtworks.go.build.AdoptOpenJDKUrlHelper +import com.thoughtworks.go.build.AdoptiumUrlHelper import com.thoughtworks.go.build.DownloadFile import com.thoughtworks.go.build.InstallerType import org.apache.commons.codec.digest.DigestUtils @@ -26,7 +26,7 @@ private File destFile(String url) { } task downloadWindowsJreChecksum(type: DownloadFile) { - def srcUrl = AdoptOpenJDKUrlHelper.sha256sumURL( + def srcUrl = AdoptiumUrlHelper.sha256sumURL( com.thoughtworks.go.build.OperatingSystem.windows, project.packaging.adoptOpenjdk.featureVersion, project.packaging.adoptOpenjdk.interimVersion, @@ -39,7 +39,7 @@ task downloadWindowsJreChecksum(type: DownloadFile) { task downloadWindowsJre(type: DownloadFile) { dependsOn downloadWindowsJreChecksum - def srcUrl = AdoptOpenJDKUrlHelper.downloadURL( + def srcUrl = AdoptiumUrlHelper.downloadURL( com.thoughtworks.go.build.OperatingSystem.windows, project.packaging.adoptOpenjdk.featureVersion, project.packaging.adoptOpenjdk.interimVersion,