From 74a098ef735c07d19027f3f15c6be8187e0fed98 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Thu, 17 Oct 2024 00:42:29 +0100 Subject: [PATCH] Update to jdk-21.0.5+11 (GA) - Update release notes to 21.0.5+11 - Remove local JDK-8327501 & JDK-8328366 backport as this is now upstream. - Related: RHEL-61276 --- .gitignore | 1 + NEWS | 1 + java-21-openjdk.spec | 14 ++++++---- jdk8327501-8328366-revert.patch | 49 --------------------------------- sources | 2 +- 5 files changed, 11 insertions(+), 56 deletions(-) delete mode 100644 jdk8327501-8328366-revert.patch diff --git a/.gitignore b/.gitignore index 32a0cd5..80004cf 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /openjdk-21.0.5+5-ea.tar.xz /openjdk-21.0.5+9-ea.tar.xz /openjdk-21.0.5+10.tar.xz +/openjdk-21.0.5+11.tar.xz diff --git a/NEWS b/NEWS index a98df8b..14892cb 100644 --- a/NEWS +++ b/NEWS @@ -376,6 +376,7 @@ Live versions of these release notes can be found at: - JDK-8341057: Add 2 SSL.com TLS roots - JDK-8341059: Change Entrust TLS distrust date to November 12, 2024 - JDK-8341674: [21u] Remove designator DEFAULT_PROMOTED_VERSION_PRE=ea for release 21.0.5 + - JDK-8341989: [21u] Back out JDK-8327501 and JDK-8328366 Notes on individual issues: =========================== diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index 2429f2d..cf38d07 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -365,8 +365,8 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 10 -%global rpmrelease 3 +%global buildver 11 +%global rpmrelease 2 # Settings used by the portable build %global portablerelease 1 # Portable suffix differs between RHEL and CentOS @@ -1420,8 +1420,6 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch # OpenJDK patches in need of upstreaming # ############################################# -# Revert backport of JDK-8327501 & JDK-8328366 -Patch2001: jdk8327501-8328366-revert.patch # Currently empty @@ -1897,8 +1895,6 @@ sh %{SOURCE12} %{top_level_dir_name} pushd %{top_level_dir_name} # Add crypto policy and FIPS support %patch -P1001 -p1 -# Backport reversion -%patch -P2001 -p1 popd # openjdk @@ -2536,6 +2532,12 @@ cjc.mainProgram(args) %endif %changelog +* Wed Oct 16 2024 Andrew Hughes - 1:21.0.5.0.11-2 +- Update to jdk-21.0.5+11 (GA) +- Update release notes to 21.0.5+11 +- Remove local JDK-8327501 & JDK-8328366 backport as this is now upstream. +- Related: RHEL-61276 + * Sun Oct 13 2024 Andrew Hughes - 1:21.0.5.0.10-3 - Sync the copy of the portable specfile with the latest update - ** This tarball is embargoed until 2024-10-15 @ 1pm PT. ** diff --git a/jdk8327501-8328366-revert.patch b/jdk8327501-8328366-revert.patch deleted file mode 100644 index ea5eb16..0000000 --- a/jdk8327501-8328366-revert.patch +++ /dev/null @@ -1,49 +0,0 @@ -commit f21b0a990905afe79b56919a5119e2c06e29d61a -Author: Andrew John Hughes -Date: Sat Oct 12 02:31:38 2024 +0100 - - Revert "8327501: Common ForkJoinPool prevents class unloading in some cases" - - This reverts commit eb103b0e1abeeee19779cafc763d3d159030fb48. - -diff --git a/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java b/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java -index 8aafda5312e..5e698b1540f 100644 ---- a/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java -+++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java -@@ -981,7 +981,9 @@ public class ForkJoinPool extends AbstractExecutorService { - boolean isCommon = (pool.workerNamePrefix == null); - @SuppressWarnings("removal") - SecurityManager sm = System.getSecurityManager(); -- if (sm != null && isCommon) -+ if (sm == null) -+ return new ForkJoinWorkerThread(null, pool, true, false); -+ else if (isCommon) - return newCommonWithACC(pool); - else - return newRegularWithACC(pool); -diff --git a/test/jdk/java/util/concurrent/tck/ForkJoinPool9Test.java b/test/jdk/java/util/concurrent/tck/ForkJoinPool9Test.java -index a87aa7b916b..266c2a036fe 100644 ---- a/test/jdk/java/util/concurrent/tck/ForkJoinPool9Test.java -+++ b/test/jdk/java/util/concurrent/tck/ForkJoinPool9Test.java -@@ -79,9 +79,6 @@ public class ForkJoinPool9Test extends JSR166TestCase { - assertSame(ForkJoinPool.commonPool(), ForkJoinTask.getPool()); - Thread currentThread = Thread.currentThread(); - -- ClassLoader preexistingContextClassLoader = -- currentThread.getContextClassLoader(); -- - Stream.of(systemClassLoader, null).forEach(cl -> { - if (randomBoolean()) - // should always be permitted, without effect -@@ -98,11 +95,6 @@ public class ForkJoinPool9Test extends JSR166TestCase { - () -> System.getProperty("foo"), - () -> currentThread.setContextClassLoader( - classLoaderDistinctFromSystemClassLoader)); -- else { -- currentThread.setContextClassLoader(classLoaderDistinctFromSystemClassLoader); -- assertSame(currentThread.getContextClassLoader(), classLoaderDistinctFromSystemClassLoader); -- currentThread.setContextClassLoader(preexistingContextClassLoader); -- } - // TODO ? - // if (haveSecurityManager - // && Thread.currentThread().getClass().getSimpleName() diff --git a/sources b/sources index ee521ec..5605926 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30 -SHA512 (openjdk-21.0.5+10.tar.xz) = 1fe2c4d9137c36171a729343051738177c1e65ad1b50de330115f8ccfa2008611dcb40ca1e158176a9ed77ecea33308ad6034985e0700fd0e96a151cd416f67b +SHA512 (openjdk-21.0.5+11.tar.xz) = f416e746593589cc7d37dbde55098038412939947c41c05baf2da31e44c42d0242cb8f6a4a5659d3d7b9a27e775d9ef375f754acda5e143ada5987e288dbe87a