mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-31 12:44:44 +00:00
0057e680db
Gradle7 is phased out in nixpkgs but corretto <= 21 does not support Gradle8. See https://github.com/corretto/corretto-21/issues/114#issuecomment-3198171683. Hence, ./corretto17-gradle8.patch is added. This patch is loosely based on https://github.com/corretto/corretto-jdk/pull/135.
291 lines
11 KiB
Diff
291 lines
11 KiB
Diff
diff --git a/build.gradle b/build.gradle
|
|
index f678379aa..62df526d4 100644
|
|
--- a/build.gradle
|
|
+++ b/build.gradle
|
|
@@ -231,7 +231,7 @@ project(':prebuild') {
|
|
def generateToolMain = "build.tools.generatecacerts.GenerateCacerts"
|
|
|
|
task copyToolSrc(type: Copy) {
|
|
- description 'Copy utility tool source to the project root'
|
|
+ description = 'Copy utility tool source to the project root'
|
|
from fileTree("$rootDir/make/jdk/src/classes") {
|
|
include 'build/tools/generatecacerts/*'
|
|
}
|
|
@@ -241,7 +241,7 @@ project(':prebuild') {
|
|
task buildTool(type: JavaCompile) {
|
|
dependsOn copyToolSrc
|
|
source = fileTree(dir: preBuildSrc, include: '**/*.java')
|
|
- destinationDir = file(classPath)
|
|
+ destinationDirectory = file(classPath)
|
|
classpath = files(classPath)
|
|
}
|
|
|
|
@@ -282,9 +282,9 @@ project(':openjdksrc') {
|
|
* Compresses a snapshot of the source code used to perform the build.
|
|
*/
|
|
task sourceDistributionTarball(type: Tar) {
|
|
- description 'Assemble source files required for building and distributing Corretto.'
|
|
- compression Compression.GZIP
|
|
- archiveName sourceTar
|
|
+ description = 'Assemble source files required for building and distributing Corretto.'
|
|
+ compression = Compression.GZIP
|
|
+ archiveFileName = sourceTar
|
|
from fileTree(rootDir) {
|
|
include 'LICENSE',
|
|
'ADDITIONAL_LICENSE_INFO',
|
|
diff --git a/installers/linux/al2/spec/build.gradle b/installers/linux/al2/spec/build.gradle
|
|
index a5a1b9a7c..201283213 100644
|
|
--- a/installers/linux/al2/spec/build.gradle
|
|
+++ b/installers/linux/al2/spec/build.gradle
|
|
@@ -62,8 +62,8 @@ task inflateRpmSpec {
|
|
|
|
task copySourceTar(type: Tar) {
|
|
dependsOn project.configurations.compile, inflateRpmSpec
|
|
- compression Compression.GZIP
|
|
- archiveName project.configurations.compile.singleFile.name
|
|
+ compression = Compression.GZIP
|
|
+ archiveFileName = project.configurations.compile.singleFile.name
|
|
from("$buildDir") {
|
|
include "java-${project.version.major}-amazon-corretto.spec"
|
|
into 'rpm'
|
|
diff --git a/installers/linux/alpine/tar/build.gradle b/installers/linux/alpine/tar/build.gradle
|
|
index d0f95bd42..60bc9d40a 100644
|
|
--- a/installers/linux/alpine/tar/build.gradle
|
|
+++ b/installers/linux/alpine/tar/build.gradle
|
|
@@ -132,9 +132,9 @@ task bundleThirdPartyBinaries {
|
|
|
|
task packageTestImage(type: Tar) {
|
|
dependsOn createTestImage
|
|
- description 'Package test results'
|
|
- archiveName "amazon-corretto-testimage-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
|
|
- compression Compression.GZIP
|
|
+ description = 'Package test results'
|
|
+ archiveFileName = "amazon-corretto-testimage-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
|
|
+ compression = Compression.GZIP
|
|
from(testResultingImage) {
|
|
include '**'
|
|
}
|
|
@@ -143,9 +143,9 @@ task packageTestImage(type: Tar) {
|
|
|
|
task packageDebugSymbols(type: Tar) {
|
|
dependsOn packageTestImage
|
|
- description 'Package debug symbols'
|
|
- archiveName "amazon-corretto-debugsymbols-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
|
|
- compression Compression.GZIP
|
|
+ description = 'Package debug symbols'
|
|
+ archiveFileName = "amazon-corretto-debugsymbols-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
|
|
+ compression = Compression.GZIP
|
|
from(jdkResultingImage) {
|
|
include 'bin/*.diz'
|
|
include 'lib/*.diz'
|
|
@@ -155,12 +155,12 @@ task packageDebugSymbols(type: Tar) {
|
|
}
|
|
|
|
task packageBuildResults(type: Tar) {
|
|
- description 'Compresses the JDK image and puts the results in build/distributions.'
|
|
+ description = 'Compresses the JDK image and puts the results in build/distributions.'
|
|
dependsOn packageDebugSymbols
|
|
dependsOn executeBuild
|
|
dependsOn bundleThirdPartyBinaries
|
|
- archiveName "amazon-corretto-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
|
|
- compression Compression.GZIP
|
|
+ archiveFileName = "amazon-corretto-${project.version.full}-alpine-linux-${arch_alias}.tar.gz"
|
|
+ compression = Compression.GZIP
|
|
from(buildRoot) {
|
|
include 'ADDITIONAL_LICENSE_INFO'
|
|
include 'ASSEMBLY_EXCEPTION'
|
|
diff --git a/installers/linux/universal/deb/build.gradle b/installers/linux/universal/deb/build.gradle
|
|
index 118ad0b74..54f7e0c50 100644
|
|
--- a/installers/linux/universal/deb/build.gradle
|
|
+++ b/installers/linux/universal/deb/build.gradle
|
|
@@ -20,7 +20,7 @@
|
|
*/
|
|
|
|
plugins {
|
|
- id 'nebula.ospackage' version 'latest.release'
|
|
+ id 'com.netflix.nebula.ospackage' version 'latest.release'
|
|
}
|
|
|
|
dependencies {
|
|
@@ -54,22 +54,22 @@ def jinfoName = ".${jdkInstallationDirName}.jinfo"
|
|
ospackage {
|
|
// Valid version must start with a digit and only contain [A-Za-z0-9.+:~-]
|
|
// See http://manpages.ubuntu.com/manpages/artful/en/man5/deb-version.5.html
|
|
- version project.version.upstream
|
|
- release project.version.revision
|
|
-
|
|
- url "${packageInfo.url}"
|
|
- vendor "${packageInfo.vendor}"
|
|
- packager "${packageInfo.packager}"
|
|
- license "${packageInfo.license}"
|
|
- buildHost "${packageInfo.buildHost}"
|
|
- maintainer "${packageInfo.maintainer}"
|
|
- packageGroup 'java'
|
|
- priority 'optional'
|
|
- user 'root'
|
|
- permissionGroup 'root'
|
|
- epoch 1
|
|
- arch arch_deb
|
|
- multiArch SAME
|
|
+ version = project.version.upstream
|
|
+ release = project.version.revision
|
|
+
|
|
+ url = "${packageInfo.url}"
|
|
+ vendor = "${packageInfo.vendor}"
|
|
+ packager = "${packageInfo.packager}"
|
|
+ license = "${packageInfo.license}"
|
|
+ buildHost = "${packageInfo.buildHost}"
|
|
+ maintainer = "${packageInfo.maintainer}"
|
|
+ packageGroup = 'java'
|
|
+ priority = 'optional'
|
|
+ user = 'root'
|
|
+ permissionGroup = 'root'
|
|
+ epoch = 1
|
|
+ arch = arch_deb
|
|
+ multiArch = SAME
|
|
}
|
|
|
|
/**
|
|
@@ -124,13 +124,13 @@ task inflateJinfoTemplate(type: Copy) {
|
|
* distributions folder.
|
|
*/
|
|
task generateJdkDeb(type: Deb) {
|
|
- description 'Create the DEB package for Corretto JDK'
|
|
+ description = 'Create the DEB package for Corretto JDK'
|
|
dependsOn inflateDebScriptTemplate
|
|
dependsOn inflateJinfoTemplate
|
|
|
|
- packageName jdkPackageName
|
|
- packageDescription "Amazon Corretto\'s packaging of the OpenJDK ${project.version.major} code."
|
|
- summary "Amazon Corretto ${project.version.major} development environment"
|
|
+ packageName = jdkPackageName
|
|
+ packageDescription = "Amazon Corretto\'s packaging of the OpenJDK ${project.version.major} code."
|
|
+ summary = "Amazon Corretto ${project.version.major} development environment"
|
|
|
|
postInstall file("$buildRoot/scripts/postin_jdk.sh")
|
|
preUninstall file("$buildRoot/scripts/preun_jdk.sh")
|
|
diff --git a/installers/linux/universal/rpm/build.gradle b/installers/linux/universal/rpm/build.gradle
|
|
index 2883b16ac..ed914b679 100644
|
|
--- a/installers/linux/universal/rpm/build.gradle
|
|
+++ b/installers/linux/universal/rpm/build.gradle
|
|
@@ -20,7 +20,7 @@
|
|
*/
|
|
|
|
plugins {
|
|
- id 'nebula.ospackage' version 'latest.release'
|
|
+ id 'com.netflix.nebula.ospackage' version 'latest.release'
|
|
}
|
|
|
|
dependencies {
|
|
@@ -48,20 +48,20 @@ def jdkBinaryDir = "${buildRoot}/${project.correttoJdkArchiveName}"
|
|
def jdkPackageName = "java-${project.version.major}-amazon-corretto-devel"
|
|
|
|
ospackage {
|
|
- version project.version.upstream
|
|
- release project.version.revision
|
|
-
|
|
- url "${packageInfo.url}"
|
|
- vendor "${packageInfo.vendor}"
|
|
- packager "${packageInfo.packager}"
|
|
- license "${packageInfo.license}"
|
|
- buildHost "${packageInfo.buildHost}"
|
|
- user 'root'
|
|
- permissionGroup 'root'
|
|
- epoch 1
|
|
- arch arch_redline
|
|
- os LINUX
|
|
- type BINARY
|
|
+ version = project.version.upstream
|
|
+ release = project.version.revision
|
|
+
|
|
+ url = "${packageInfo.url}"
|
|
+ vendor = "${packageInfo.vendor}"
|
|
+ packager = "${packageInfo.packager}"
|
|
+ license = "${packageInfo.license}"
|
|
+ buildHost = "${packageInfo.buildHost}"
|
|
+ user = 'root'
|
|
+ permissionGroup = 'root'
|
|
+ epoch = 1
|
|
+ arch = arch_redline
|
|
+ os = LINUX
|
|
+ type = BINARY
|
|
}
|
|
|
|
/**
|
|
@@ -97,14 +97,14 @@ task inflateRpmScriptTemplate(type: Copy) {
|
|
* distributions folder.
|
|
*/
|
|
task generateJdkRpm(type: Rpm) {
|
|
- description 'Create the RPM package for Corretto JDK'
|
|
+ description = 'Create the RPM package for Corretto JDK'
|
|
dependsOn inflateRpmScriptTemplate
|
|
- packageName jdkPackageName
|
|
- packageDescription packageInfo.description
|
|
- summary "Amazon Corretto ${project.version.major} development environment"
|
|
- packageGroup 'Development/Tools'
|
|
+ packageName = jdkPackageName
|
|
+ packageDescription = packageInfo.description
|
|
+ summary = "Amazon Corretto ${project.version.major} development environment"
|
|
+ packageGroup = 'Development/Tools'
|
|
// Remove after https://github.com/nebula-plugins/gradle-ospackage-plugin/issues/401 is merged and released
|
|
- sourcePackage "${jdkPackageName}-${project.version.major}.${project.version.minor}.${project.version.security}.${project.version.build}-${project.version.revision}.src.rpm"
|
|
+ sourcePackage = "${jdkPackageName}-${project.version.major}.${project.version.minor}.${project.version.security}.${project.version.build}-${project.version.revision}.src.rpm"
|
|
|
|
prefix(jdkHome)
|
|
postInstall file("$buildRoot/scripts/postin_java.sh")
|
|
diff --git a/installers/linux/universal/tar/build.gradle b/installers/linux/universal/tar/build.gradle
|
|
index 17491d830..9ec3280e6 100644
|
|
--- a/installers/linux/universal/tar/build.gradle
|
|
+++ b/installers/linux/universal/tar/build.gradle
|
|
@@ -122,9 +122,9 @@ task bundleThirdPartyBinaries {
|
|
|
|
task packageTestImage(type: Tar) {
|
|
dependsOn createTestImage
|
|
- description 'Package test results'
|
|
- archiveName "${project.correttoTestImageArchiveName}.tar.gz"
|
|
- compression Compression.GZIP
|
|
+ description = 'Package test results'
|
|
+ archiveFileName = "${project.correttoTestImageArchiveName}.tar.gz"
|
|
+ compression = Compression.GZIP
|
|
from(testResultingImage) {
|
|
include '**'
|
|
}
|
|
@@ -132,10 +132,10 @@ task packageTestImage(type: Tar) {
|
|
}
|
|
|
|
task packageDebugSymbols(type: Tar) {
|
|
- description 'Package debug results'
|
|
+ description = 'Package debug results'
|
|
dependsOn packageTestImage
|
|
- archiveName "${project.correttoDebugSymbolsArchiveName}.tar.gz"
|
|
- compression Compression.GZIP
|
|
+ archiveFileName = "${project.correttoDebugSymbolsArchiveName}.tar.gz"
|
|
+ compression = Compression.GZIP
|
|
from(jdkResultingImage) {
|
|
include 'bin/*.diz'
|
|
include 'lib/*.diz'
|
|
@@ -145,11 +145,11 @@ task packageDebugSymbols(type: Tar) {
|
|
}
|
|
|
|
task packageBuildResults(type: Tar) {
|
|
- description 'Compresses the JDK image and puts the results in build/distributions.'
|
|
+ description = 'Compresses the JDK image and puts the results in build/distributions.'
|
|
dependsOn packageDebugSymbols
|
|
dependsOn bundleThirdPartyBinaries
|
|
- archiveName "${project.correttoJdkArchiveName}.tar.gz"
|
|
- compression Compression.GZIP
|
|
+ archiveFileName = "${project.correttoJdkArchiveName}.tar.gz"
|
|
+ compression = Compression.GZIP
|
|
from(buildRoot) {
|
|
include 'ADDITIONAL_LICENSE_INFO'
|
|
include 'ASSEMBLY_EXCEPTION'
|
|
@@ -175,7 +175,7 @@ task packageBuildResults(type: Tar) {
|
|
// See https://github.com/corretto/corretto-11/issues/129
|
|
from("${jdkResultingImage}/legal") {
|
|
include '**'
|
|
- fileMode 0444
|
|
+ fileMode = 0444
|
|
into "${project.correttoJdkArchiveName}/legal"
|
|
}
|
|
}
|