Merge branch 'master' into jdk8.jan.release

adoptium · Jan 26, 2024 · 861c11d · 861c11d
2 parents 34a3b10 + 7dc6c10
commit 861c11d
Show file tree

Hide file tree

Showing 21 changed files with 57 additions and 37 deletions.
diff --git a/linux/ca-certificates/debian/build.gradle b/linux/ca-certificates/debian/build.gradle
@@ -5,7 +5,7 @@ plugins {
 ext {
 	junitVersion = "5.10.1"
 	testcontainersVersion = "1.19.3"
-	assertjCoreVersion = "3.25.1"
+	assertjCoreVersion = "3.25.2"
 }
 
 repositories {

diff --git a/linux/jdk/alpine/build.gradle b/linux/jdk/alpine/build.gradle
@@ -5,7 +5,7 @@ plugins {
 ext {
 	junitVersion = "5.10.1"
 	testcontainersVersion = "1.19.3"
-	assertjCoreVersion = "3.25.1"
+	assertjCoreVersion = "3.25.2"
 }
 
 repositories {

diff --git a/linux/jdk/alpine/src/main/packaging/temurin/21/APKBUILD b/linux/jdk/alpine/src/main/packaging/temurin/21/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Eclipse Adoptium Package Maintainers <[email protected]>
 pkgname=temurin-21
-pkgver=21.0.1_p12
+pkgver=21.0.2_p13
 # replace _p1 with _1
 _pkgver=${pkgver/_p/_}
 _pkgverplus=${pkgver/_p/+}
@@ -97,10 +97,10 @@ _jdk() {
 
 case "$CARCH" in
 	x86_64)
-		_arch_sum="422f23f5109056cacb9227247bebf8532e2dc3c9d505e71637ba610569d6b3ff"
+		_arch_sum="f1aef3652dd52778e81eb4897a88a34e38ca0159d22f160f7205e69907a0f14d"
 		;;
 	aarch64)
-		_arch_sum="77006c0a753808c2a6662007906eb6eb230f2fb6eb9d201a39cc46113e68f82c"
+		_arch_sum="ae933ea8eeb4a077f19277842ba95ba93d29177e44d53cec7a98afd3b9abb2c3"
 		;;
 esac
 

diff --git a/linux/jdk/debian/build.gradle b/linux/jdk/debian/build.gradle
@@ -5,7 +5,7 @@ plugins {
 ext {
 	junitVersion = "5.10.1"
 	testcontainersVersion = "1.19.3"
-	assertjCoreVersion = "3.25.1"
+	assertjCoreVersion = "3.25.2"
 }
 
 repositories {

diff --git a/linux/jdk/debian/src/main/packaging/temurin/21/debian/changelog b/linux/jdk/debian/src/main/packaging/temurin/21/debian/changelog
@@ -1,3 +1,9 @@
+temurin-21-jdk (21.0.2.0.0+13) STABLE; urgency=medium
+
+  * Eclipse Temurin 21.0.2.0.0+13 release.
+
+ -- Eclipse Adoptium Package Maintainers <[email protected]>  Tue, 23 Jan 2024 00:00:00 +0000
+
 temurin-21-jdk (21.0.1.0.0+12) STABLE; urgency=medium
 
   * Eclipse Temurin 21.0.1.0.0+12 release.

diff --git a/linux/jdk/debian/src/main/packaging/temurin/21/debian/rules b/linux/jdk/debian/src/main/packaging/temurin/21/debian/rules
@@ -3,12 +3,12 @@
 pkg_name = temurin-21-jdk
 priority = 2111
 jvm_tools = jar jarsigner java javac javadoc javap jcmd jconsole jdb jdeprscan jdeps jfr jhsdb jimage jinfo jlink jmap jmod jpackage jps jrunscript jshell jstack jstat jstatd jwebserver keytool rmiregistry serialver jexec jspawnhelper
-amd64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz
-amd64_checksum = 1a6fa8abda4c5caed915cfbeeb176e7fbd12eb6b222f26e290ee45808b529aa1
-arm64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.1_12.tar.gz
-arm64_checksum = e184dc29a6712c1f78754ab36fb48866583665fa345324f1a79e569c064f95e9
-ppc64el_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.1_12.tar.gz
-ppc64el_checksum = 9574828ef3d735a25404ced82e09bf20e1614f7d6403956002de9cfbfcb8638f
+amd64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jdk_x64_linux_hotspot_21.0.2_13.tar.gz
+amd64_checksum = 454bebb2c9fe48d981341461ffb6bf1017c7b7c6e15c6b0c29b959194ba3aaa5
+arm64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.2_13.tar.gz
+arm64_checksum = 3ce6a2b357e2ef45fd6b53d6587aa05bfec7771e7fb982f2c964f6b771b7526a
+ppc64el_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.2_13.tar.gz
+ppc64el_checksum = d08de863499d8851811c893e8915828f2cd8eb67ed9e29432a6b4e222d80a12f
 
 d = debian/$(pkg_name)
 jvm_home = usr/lib/jvm

diff --git a/linux/jdk/redhat/build.gradle b/linux/jdk/redhat/build.gradle
@@ -5,7 +5,7 @@ plugins {
 ext {
 	junitVersion = "5.10.1"
 	testcontainersVersion = "1.19.3"
-	assertjCoreVersion = "3.25.1"
+	assertjCoreVersion = "3.25.2"
 }
 
 repositories {

diff --git a/linux/jdk/redhat/src/main/packaging/temurin/21/temurin-21-jdk.spec b/linux/jdk/redhat/src/main/packaging/temurin/21/temurin-21-jdk.spec
@@ -1,10 +1,10 @@
-%global upstream_version 21.0.1+12
+%global upstream_version 21.0.2+13
 # Only [A-Za-z0-9.] allowed in version:
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version
 # also not very intuitive:
 #  $ rpmdev-vercmp 21.0.0.0.0___21.0.0.0.0+1
 #  21.0.0.0.0___1 == 21.0.0.0.0+35
-%global spec_version 21.0.1.0.0.12
+%global spec_version 21.0.2.0.0.13
 %global spec_release 1
 %global priority 1161
 
@@ -226,6 +226,8 @@ fi
 /usr/lib/tmpfiles.d/%{name}.conf
 
 %changelog
+* Tue Jan 23 2024 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.2.0.0.13-1
+- Eclipse Temurin 21.0.2+13 release.
 * Tue Oct 24 2023 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.1.0.0.12-1
 - Eclipse Temurin 21.0.1+12 release.
 * Wed Sep 20 2023 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.0.0.0.35-1

diff --git a/linux/jdk/suse/build.gradle b/linux/jdk/suse/build.gradle
@@ -5,7 +5,7 @@ plugins {
 ext {
 	junitVersion = "5.10.1"
 	testcontainersVersion = "1.19.3"
-	assertjCoreVersion = "3.25.1"
+	assertjCoreVersion = "3.25.2"
 }
 
 repositories {

diff --git a/linux/jdk/suse/src/main/packaging/temurin/21/temurin-21-jdk.spec b/linux/jdk/suse/src/main/packaging/temurin/21/temurin-21-jdk.spec
@@ -1,10 +1,10 @@
-%global upstream_version 21.0.1+12
+%global upstream_version 21.0.2+13
 # Only [A-Za-z0-9.] allowed in version:
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version
 # also not very intuitive:
 #  $ rpmdev-vercmp 21.0.0.0.0___21.0.0.0.0+1
 #  21.0.0.0.0___1 == 21.0.0.0.0+35
-%global spec_version 21.0.1.0.0.12
+%global spec_version 21.0.2.0.0.13
 %global spec_release 1
 %global priority 1161
 
@@ -215,6 +215,8 @@ fi
 %{prefix}
 
 %changelog
+* Tue Jan 23 2024 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.2.0.0.13-1
+- Eclipse Temurin 21.0.2+13 release.
 * Tue Oct 24 2023 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.1.0.0.12-1
 - Eclipse Temurin 21.0.1+12 release.
 * Wed Sep 20 2023 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.0.0.0.35-1

diff --git a/linux/jre/alpine/build.gradle b/linux/jre/alpine/build.gradle
@@ -5,7 +5,7 @@ plugins {
 ext {
 	junitVersion = "5.10.1"
 	testcontainersVersion = "1.19.3"
-	assertjCoreVersion = "3.25.1"
+	assertjCoreVersion = "3.25.2"
 }
 
 repositories {

diff --git a/linux/jre/alpine/src/main/packaging/temurin/21/APKBUILD b/linux/jre/alpine/src/main/packaging/temurin/21/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Eclipse Adoptium Package Maintainers <[email protected]>
 pkgname=temurin-21
-pkgver=21.0.1_p12
+pkgver=21.0.2_p13
 # replace _p1 with _1
 _pkgver=${pkgver/_p/_}
 _pkgverplus=${pkgver/_p/+}
@@ -71,10 +71,10 @@ _jre() {
 
 case "$CARCH" in
 	x86_64)
-		_arch_sum="a8fcc43927664ba191c9a77d1013f1f32fec1acc22fe6f0c29d687221f2cc95d"
+		_arch_sum="7077b9e42b40f1ed8d59a71ae59a57d5d55de2685cc5efd70a0405618da616d7"
 		;;
 	aarch64)
-		_arch_sum="2898ea1ddf6f70f09b09cf99d928f6d4c862f78f81104f5dce3e44a832b8444a"
+		_arch_sum="e961c43fa418a74d5349d519d4f05b70f2017b13420812946be88349729c8ff3"
 		;;
 esac
 

diff --git a/linux/jre/debian/build.gradle b/linux/jre/debian/build.gradle
@@ -5,7 +5,7 @@ plugins {
 ext {
 	junitVersion = "5.10.1"
 	testcontainersVersion = "1.19.3"
-	assertjCoreVersion = "3.25.1"
+	assertjCoreVersion = "3.25.2"
 }
 
 repositories {

diff --git a/linux/jre/debian/src/main/packaging/temurin/11/debian/rules b/linux/jre/debian/src/main/packaging/temurin/11/debian/rules
@@ -7,7 +7,7 @@ amd64_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/down
 amd64_checksum = 3a0fec1b9ef38d6abd86cf11f6001772b086096b6ec2588d2a02f1fa86b2b1de
 arm64_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.22%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.22_7.tar.gz
 arm64_checksum = 46e2bff7d5f419ac7c2fad29e78bfacf49ead4a2de1aba73b6329128f6d1f707
-armhf_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.22%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.22_7.tar.gz
+armhf_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.22%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.22_7.tar.gz
 armhf_checksum = a5ab40aa53ecd413a8af738e66855d423e64b5389f876a4825e2cbdb45e9cfb3
 ppc64el_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.22%2B7/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.22_7.tar.gz
 ppc64el_checksum = a6719f71217d0b6f931461acec465ca3a1eb0b0e94942fe165e27b30ecc341c2

diff --git a/linux/jre/debian/src/main/packaging/temurin/17/debian/rules b/linux/jre/debian/src/main/packaging/temurin/17/debian/rules
@@ -11,7 +11,7 @@ armhf_tarball_url = https://github.com/adoptium/temurin17-binaries/releases/down
 armhf_checksum = 0378bdf6769632b182b27ba4e53b17eaefefdbafa3845c15e1bd88a5aeec8442
 ppc64el_tarball_url = https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.10%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.10_7.tar.gz
 ppc64el_checksum = 4e18b60dba540b5c431ff03f74a1c73b22d83151f93b8768241d264d1a53582d
-s390x_tarball_url = https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.10%2B7/OpenJDK17U-jdk_s390x_linux_hotspot_17.0.10_7.tar.gz
+s390x_tarball_url = https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.10%2B7/OpenJDK17U-jre_s390x_linux_hotspot_17.0.10_7.tar.gz
 s390x_checksum = c1b2fd232fc55e814479d7585d7ec45bae952a2f4137084f1d99f958c6880a49
 
 d = debian/$(pkg_name)

diff --git a/linux/jre/debian/src/main/packaging/temurin/21/debian/changelog b/linux/jre/debian/src/main/packaging/temurin/21/debian/changelog
@@ -1,3 +1,9 @@
+temurin-21-jre (21.0.2.0.0+13) STABLE; urgency=medium
+
+  * Eclipse Temurin 21.0.2.0.0+13 release.
+
+ -- Eclipse Adoptium Package Maintainers <[email protected]>  Tue, 23 Jan 2024 00:00:00 +0000
+
 temurin-21-jre (21.0.1.0.0+12) STABLE; urgency=medium
 
   * Eclipse Temurin 21.0.1.0.0+12 release.

diff --git a/linux/jre/debian/src/main/packaging/temurin/21/debian/rules b/linux/jre/debian/src/main/packaging/temurin/21/debian/rules
@@ -3,12 +3,12 @@
 pkg_name = temurin-21-jre
 priority = 2112
 jvm_tools = java jfr jrunscript jwebserver keytool rmiregistry
-amd64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_x64_linux_hotspot_21.0.1_12.tar.gz
-amd64_checksum = 277f4084bee875f127a978253cfbaad09c08df597feaf5ccc82d2206962279a3
-arm64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.1_12.tar.gz
-arm64_checksum = 4582c4cc0c6d498ba7a23fdb0a5179c9d9c0d7a26f2ee8610468d5c2954fcf2f
-ppc64el_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.1_12.tar.gz
-ppc64el_checksum = 05cc9b7bfbe246c27d307783b3d5095797be747184b168018ae3f7cc55608db2
+amd64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jre_x64_linux_hotspot_21.0.2_13.tar.gz
+amd64_checksum = 51141204fe01a9f9dd74eab621d5eca7511eac67315c9975dbde5f2625bdca55
+arm64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.2_13.tar.gz
+arm64_checksum = 64c78854184c92a4da5cda571c8e357043bfaf03a03434eef58550cc3410d8a4
+ppc64el_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.2_13.tar.gz
+ppc64el_checksum = caaf48e50787b80b810dc08ee91bd4ffe0d0696bd14906a92f05bf8c14aabb22
 
 d = debian/$(pkg_name)
 jvm_home = usr/lib/jvm

diff --git a/linux/jre/redhat/build.gradle b/linux/jre/redhat/build.gradle
@@ -5,7 +5,7 @@ plugins {
 ext {
 	junitVersion = "5.10.1"
 	testcontainersVersion = "1.19.3"
-	assertjCoreVersion = "3.25.1"
+	assertjCoreVersion = "3.25.2"
 }
 
 repositories {

diff --git a/linux/jre/redhat/src/main/packaging/temurin/21/temurin-21-jre.spec b/linux/jre/redhat/src/main/packaging/temurin/21/temurin-21-jre.spec
@@ -1,10 +1,10 @@
-%global upstream_version 21.0.1+12
+%global upstream_version 21.0.2+13
 # Only [A-Za-z0-9.] allowed in version:
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version
 # also not very intuitive:
 #  $ rpmdev-vercmp 21.0.0.0.0___21.0.0.0.0+1
 #  20.0.0.0.0___1 == 21.0.0.0.0+35
-%global spec_version 21.0.1.0.0.12
+%global spec_version 21.0.2.0.0.13
 %global spec_release 1
 %global priority 2100
 
@@ -157,6 +157,8 @@ fi
 /usr/lib/tmpfiles.d/%{name}.conf
 
 %changelog
+* Tue Jan 23 2024 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.2.0.0.13-1
+- Eclipse Temurin 21.0.2+13 release.
 * Tue Oct 24 2023 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.1.0.0.12-1
 - Eclipse Temurin 21.0.1+12 release.
 * Wed Sep 20 2023 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.0.0.0.35-1

diff --git a/linux/jre/suse/build.gradle b/linux/jre/suse/build.gradle
@@ -5,7 +5,7 @@ plugins {
 ext {
 	junitVersion = "5.10.1"
 	testcontainersVersion = "1.19.3"
-	assertjCoreVersion = "3.25.1"
+	assertjCoreVersion = "3.25.2"
 }
 
 repositories {

diff --git a/linux/jre/suse/src/main/packaging/temurin/21/temurin-21-jre.spec b/linux/jre/suse/src/main/packaging/temurin/21/temurin-21-jre.spec
@@ -1,10 +1,10 @@
-%global upstream_version 21.0.1+12
+%global upstream_version 21.0.2+13
 # Only [A-Za-z0-9.] allowed in version:
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version
 # also not very intuitive:
 #  $ rpmdev-vercmp 21.0.0.0.0___21.0.0.0.0+1
 #  20.0.0.0.0___1 == 21.0.0.0.0+35
-%global spec_version 21.0.1.0.0.12
+%global spec_version 21.0.2.0.0.13
 %global spec_release 1
 %global priority 2100
 
@@ -147,6 +147,8 @@ fi
 %{prefix}
 
 %changelog
+* Tue Jan 23 2024 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.2.0.0.13-1
+- Eclipse Temurin 21.0.2+13 release.
 * Tue Oct 24 2023 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.1.0.0.12-1
 - Eclipse Temurin 21.0.1+12 release.
 * Wed Sep 20 2023 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.0.0.0.35-1