diff --git a/8205921-Optimizing-best_of_2-work-stealing-queue-selection.patch b/8205921-Optimizing-best_of_2-work-stealing-queue-selection.patch index 9035b81ded2d705234ebbaeeed67e83ad0415594..e608dec3d89481239927dc2e2c0ebb817dbf785e 100644 --- a/8205921-Optimizing-best_of_2-work-stealing-queue-selection.patch +++ b/8205921-Optimizing-best_of_2-work-stealing-queue-selection.patch @@ -84,7 +84,7 @@ index 5fc5ee8..708e92c 100644 }; @@ -5127,8 +5122,7 @@ void CMSRefProcTaskProxy::work(uint worker_id) { CMSIsAliveClosure is_alive_closure(_span, _mark_bit_map); - _task.work(worker_id, is_alive_closure, par_keep_alive, par_drain_stack); + _task.work(worker_id, is_alive_closure, par_keep_alive, enqueue, par_drain_stack); if (_task.marks_oops_alive()) { - do_work_steal(worker_id, &par_drain_stack, &par_keep_alive, - _collector->hash_seed(worker_id)); diff --git a/8225648-TESTBUG-java-lang-annotation-loaderLeak-Main.patch b/8225648-TESTBUG-java-lang-annotation-loaderLeak-Main.patch deleted file mode 100644 index 7645eaec0d8a17d4941f6c6132fb4652e0b6e7e5..0000000000000000000000000000000000000000 --- a/8225648-TESTBUG-java-lang-annotation-loaderLeak-Main.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 96ac09c507a663b853235c29a607aca2c1edfc10 Mon Sep 17 00:00:00 2001 -Date: Mon, 2 Dec 2019 17:42:17 +0000 -Subject: [PATCH] 8225648: [TESTBUG]java/lang/annotation/loaderLeak/Main.java - fails with -Xcomp - -Summary: : annotations cause memory leak -LLT: NA -Bug url: https://bugs.openjdk.java.net/browse/JDK-8225648 ---- - test/jdk/java/lang/annotation/loaderLeak/Main.java | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/test/jdk/java/lang/annotation/loaderLeak/Main.java b/test/jdk/java/lang/annotation/loaderLeak/Main.java -index 58bd63b..aedbc2e 100644 ---- a/test/jdk/java/lang/annotation/loaderLeak/Main.java -+++ b/test/jdk/java/lang/annotation/loaderLeak/Main.java -@@ -54,6 +54,7 @@ public class Main { - System.gc(); - System.gc(); - if (c.get() == null) throw new AssertionError(); -+ Reference.reachabilityFence(loader); - System.gc(); - System.gc(); - loader = null; --- -2.12.3 - diff --git a/Add-KAE-implementation.patch b/Add-KAE-implementation.patch index 3006f64e91171c742a9e466fcda08e6883b3daaa..db5193ad1e4cc9000d4ab544cacccf47b1e0404b 100644 --- a/Add-KAE-implementation.patch +++ b/Add-KAE-implementation.patch @@ -220,7 +220,7 @@ index 41533e566..9fa545605 100644 + endif +endif + - ifeq ($(OPENJDK_TARGET_OS), windows) + ifeq ($(call isTargetOs, windows), true) PLATFORM_MODULES += jdk.crypto.mscapi endif @@ -228,6 +234,13 @@ ifeq ($(ENABLE_AOT), false) diff --git a/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch b/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch index 6d22453e729e946dc2769b0b3803ac773b443b91..de07fd8e73579473af4c7060520a47bf3cb405e9 100755 --- a/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch +++ b/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch @@ -290,9 +290,9 @@ index 94c79c9c2..780c09211 100644 /* - * Copyright (c) 2019, Huawei Technologies Co. Ltd. All rights reserved. + * Copyright (c) 2019, Huawei Technologies Co., Ltd. All rights reserved. + * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestSearchAlignment.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestSearchAlignment.java index 37be01524..5242adb43 100644 --- a/test/hotspot/jtreg/compiler/loopopts/superword/TestSearchAlignment.java @@ -367,4 +367,4 @@ index 000000000..85b49171c --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ -+11.0.18.0.13 ++11.0.19.0.13 diff --git a/delete_expired_certificates.patch b/delete_expired_certificates.patch index 2f9cd73af0c69bcff2de77fda6efc027b38ff729..340c9a19032ab3ed94cb301f4c449734d2aff333 100644 --- a/delete_expired_certificates.patch +++ b/delete_expired_certificates.patch @@ -120,14 +120,14 @@ index 122a01901..c131bd493 100644 + File.separator + "security" + File.separator + "cacerts"; // The numbers of certs now. -- private static final int COUNT = 89; -+ private static final int COUNT = 86; +- private static final int COUNT = 90; ++ private static final int COUNT = 87; // SHA-256 of cacerts, can be generated with // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95 private static final String CHECKSUM -- = "CC:AD:BB:49:70:97:3F:42:AD:73:91:A0:A2:C4:B8:AA:D1:95:59:F3:B3:22:09:2A:1F:2C:AB:04:47:08:EF:AA"; -+ = "89:78:5A:96:F4:B2:68:4C:91:C0:32:2C:ED:2D:6B:3B:26:B8:37:C3:07:DD:9E:50:87:53:53:7A:24:98:97:E0"; +- = "21:8C:35:29:4C:E2:49:D2:83:30:DF:8B:5E:39:F8:8C:D6:C5:2B:59:05:32:74:E5:79:A5:91:9F:3C:57:B9:E3"; ++ = "D5:5B:7A:BD:8F:4A:DA:19:75:90:28:61:E7:40:6D:A2:54:F5:64:C0:F0:30:29:16:FB:46:9B:57:D5:F7:04:D7"; // map of cert alias to SHA-256 fingerprint @SuppressWarnings("serial") diff --git a/jdk-updates-jdk11u-jdk-11.0.18-ga.tar.xz b/jdk-updates-jdk11u-jdk-11.0.19-ga.tar.gz similarity index 63% rename from jdk-updates-jdk11u-jdk-11.0.18-ga.tar.xz rename to jdk-updates-jdk11u-jdk-11.0.19-ga.tar.gz index ae527d93cd132bbf4eea04390dacd2fad1c7427d..360f3a82edd09a7f20ac98f878f2b1bdd6566009 100644 Binary files a/jdk-updates-jdk11u-jdk-11.0.18-ga.tar.xz and b/jdk-updates-jdk11u-jdk-11.0.19-ga.tar.gz differ diff --git a/openjdk-11.spec b/openjdk-11.spec index 1096232b4b16794013cbcd5dd0a595504582c3f9..7f41cf631e6c104ce0063a5b5661ea104655c029 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -114,7 +114,7 @@ # New Version-String scheme-style defines %global majorver 11 -%global securityver 18 +%global securityver 19 # buildjdkver is usually same as %%{majorver}, # but in time of bootstrap of next jdk, it is majorver-1, # and this it is better to change it here, on single place @@ -130,12 +130,12 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 10 +%global buildver 7 %global patchver 0 %global project jdk-updates %global repo jdk11u -%global revision jdk-11.0.18-ga +%global revision jdk-11.0.19-ga %global full_revision %{project}-%{repo}-%{revision} # priority must be 7 digits in total # setting to 1, so debug ones can have 0 @@ -773,7 +773,7 @@ License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv URL: http://openjdk.java.net/ -Source0: %{full_revision}.tar.xz +Source0: %{full_revision}.tar.gz # Use 'icedtea_sync.sh' to update the following # They are based on code contained in the IcedTea project (3.x). @@ -801,7 +801,6 @@ Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch # ############################################# -Patch2: 8225648-TESTBUG-java-lang-annotation-loaderLeak-Main.patch Patch5: Add-ability-to-configure-third-port-for-remote-JMX.patch Patch6: 8214527-AArch64-ZGC-for-Aarch64.patch Patch7: 8224675-Late-GC-barrier-insertion-for-ZGC.patch @@ -1110,7 +1109,6 @@ fi pushd %{top_level_dir_name} # OpenJDK patches -%patch2 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 @@ -1679,6 +1677,14 @@ cjc.mainProgram(arg) %changelog +* Thu Apr 202023 DXwangg - 1:11.0.19.7-0 +- update to 11.0.19+7(GA) +- deleted 8225648-TESTBUG-java-lang-annotation-loaderLeak-Main.patch +- modified Add-KAE-implementation.patch +- modified G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch +- modified delete_expired_certificates.patch +- modified 8205921-Optimizing-best_of_2-work-stealing-queue-selection.patch + * Thu Jan 5 2023 Henry_Yang - 1:11.0.18.10-1 - add 8222289-Overhaul-logic-for-reading-writing-constant-pool-entries.patch