From dd66b228fab221f6352eb69dc5adecbfcc18f184 Mon Sep 17 00:00:00 2001 From: "lvfei.lv" Date: Wed, 20 Jul 2022 17:41:19 +0800 Subject: [PATCH 01/11] [Misc] Add version.txt Summary: add version.txt Test Plan: CICD Reviewers: lei.yul, sendaoYan Issue: https://github.com/alibaba/dragonwell11/issues/246 --- version.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 version.txt diff --git a/version.txt b/version.txt new file mode 100644 index 00000000000..c59c0865c92 --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ +11.0.15.11.9-GA From 01249faa0bd3eff9a7d481247322dcc1467792c1 Mon Sep 17 00:00:00 2001 From: "lvfei.lv" Date: Fri, 22 Jul 2022 16:29:02 +0800 Subject: [PATCH 02/11] [Misc] Supports white spaces in vendor-version-string Summary: supports white spaces in vendor-version-string Test Plan: CICD Reviewed-by: lei.yul, sendaoYan Issue: https://github.com/alibaba/dragonwell11/issues/246 --- make/autoconf/jdk-version.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/make/autoconf/jdk-version.m4 b/make/autoconf/jdk-version.m4 index ede4e00ccfc..83fbaf257a1 100644 --- a/make/autoconf/jdk-version.m4 +++ b/make/autoconf/jdk-version.m4 @@ -505,7 +505,8 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS], [Set vendor version string @<:@not specified@:>@])]) if test "x$with_vendor_version_string" = xyes; then AC_MSG_ERROR([--with-vendor-version-string must have a value]) - elif [ ! [[ $with_vendor_version_string =~ ^[[:graph:]]*$ ]] ]; then + elif [ ! [[ $with_vendor_version_string =~ ^[[:print:]]*$ ]] ]; then + # Dragonwell supports white spaces in vendor-version-string AC_MSG_ERROR([--with--vendor-version-string contains non-graphical characters: $with_vendor_version_string]) else VENDOR_VERSION_STRING="$with_vendor_version_string" From 8b26dcf63d5a0750aeccb8bd1cac5b7b7f93ef07 Mon Sep 17 00:00:00 2001 From: "lvfei.lv" Date: Wed, 27 Jul 2022 12:02:04 +0800 Subject: [PATCH 03/11] [Misc] Update DRAGONWELL_VERSION to 11.0.16.12.8 Summary: Update dragonwell version Test Plan: CI pipeline Reviewed-by: D-D-H,yuleil Issue: https://github.com/alibaba/dragonwell11/issues/225 --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index c59c0865c92..908058a9f10 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -11.0.15.11.9-GA +11.0.16.12.8-GA From 9e37ea4aa6ebd5eb7510d08c957b6c8d577bb890 Mon Sep 17 00:00:00 2001 From: sendaoYan Date: Thu, 25 Aug 2022 16:41:17 +0800 Subject: [PATCH 04/11] [Misc] disable wisp testcase UnsafeIntrinsicsTest.java#z by problemlist Summary: disable wisp testcase compiler/gcbarriers/UnsafeIntrinsicsTest.java#z by problemlist, which run OOM on specific machine Test Plan: CI pipeline Reviewed-by: lei.yul, lvfei.lv Issue: https://github.com/alibaba/dragonwell11/issues/267 --- test/hotspot/jtreg/ProblemList.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt index 2068d759dc1..d85cd615747 100644 --- a/test/hotspot/jtreg/ProblemList.txt +++ b/test/hotspot/jtreg/ProblemList.txt @@ -95,6 +95,7 @@ gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java 8193639 solaris-all gc/stress/gcbasher/TestGCBasherWithCMS.java 8272195 generic-i586 gc/cms/TestBubbleUpRef.java 8272195 generic-i586 gc/stress/gcold/TestGCOldWithCMS.java 8272195 generic-i586 +compiler/gcbarriers/UnsafeIntrinsicsTest.java#z https://github.com/alibaba/dragonwell11/issues/267 generic-all ############################################################################# From 2644343e61ffa88e730d2e2e90fc1794c9bf5dd6 Mon Sep 17 00:00:00 2001 From: "lvfei.lv" Date: Thu, 3 Nov 2022 16:35:33 +0800 Subject: [PATCH 05/11] [Misc] Update version Summary: Update dragonwell version Test Plan: CICD Reviewed-by: D-D-H, yuleil Issue: https://github.com/alibaba/dragonwell11/issues/225 --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 908058a9f10..0e4dd49c42c 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -11.0.16.12.8-GA +11.0.17.13.8-GA From 411bdb1b7acd990c32bfeba5279aebf07765326d Mon Sep 17 00:00:00 2001 From: sendaoYan Date: Thu, 3 Nov 2022 19:22:25 +0800 Subject: [PATCH 06/11] [Misc] fix SpecTest.java intermittently timeout Summary: fix sun/security/provider/SecureRandom/AbstractDrbg/SpecTest.java intermittently fail, use /dev/urandom instead of /dev/random to avoid block for SecureRandom API Test Plan: CI pipeline Reviewed-by: lvfei.lv, lei.yul Issue: https://github.com/alibaba/dragonwell11/issues/322 --- .../security/provider/SecureRandom/AbstractDrbg/SpecTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/jdk/sun/security/provider/SecureRandom/AbstractDrbg/SpecTest.java b/test/jdk/sun/security/provider/SecureRandom/AbstractDrbg/SpecTest.java index 9ff9a1b9d51..a750ed4aa0e 100644 --- a/test/jdk/sun/security/provider/SecureRandom/AbstractDrbg/SpecTest.java +++ b/test/jdk/sun/security/provider/SecureRandom/AbstractDrbg/SpecTest.java @@ -25,7 +25,7 @@ * @bug 8051408 8157308 8130181 * @modules java.base/sun.security.provider * @build java.base/sun.security.provider.S - * @run main SpecTest + * @run main/othervm -Djava.security.egd=file:/dev/urandom SpecTest * @summary check the AbstractDrbg API etc */ From 6ba048fd5cfff51efa9c29cc168b1e0e2e918e56 Mon Sep 17 00:00:00 2001 From: sendaoYan Date: Wed, 9 Nov 2022 18:23:49 +0800 Subject: [PATCH 07/11] [Misc] fix TestPolicy.java and BuildEEBasicConstraints.java fail because of certificates expired Summary: fix TestPolicy.java and BuildEEBasicConstraints.java fail because of certificates expired Test Plan: CI pipeline Reviewed-by: lvfei.lv, lei.yul Issue: https://github.com/alibaba/dragonwell11/issues/327 --- .../targetConstraints/BuildEEBasicConstraints.java | 10 +++++++++- .../security/cert/pkix/policyChanges/TestPolicy.java | 7 ++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/test/jdk/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java b/test/jdk/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java index c7cc90f958f..fd4193207c0 100644 --- a/test/jdk/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java +++ b/test/jdk/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 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 @@ -45,9 +45,12 @@ import java.security.cert.TrustAnchor; import java.security.cert.X509Certificate; import java.security.cert.X509CertSelector; +import java.text.DateFormat; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Locale; + import jdk.test.lib.security.CertUtils; public final class BuildEEBasicConstraints { @@ -65,6 +68,11 @@ public static void main(String[] args) throws Exception { PKIXBuilderParameters params = new PKIXBuilderParameters (Collections.singleton(anchor), sel); params.setRevocationEnabled(false); + + // Certs expired on 7th Nov 2022 + params.setDate(DateFormat.getDateInstance(DateFormat.MEDIUM, + Locale.US).parse("June 01, 2022")); + X509Certificate eeCert = CertUtils.getCertFromFile("ee.cer"); X509Certificate caCert = CertUtils.getCertFromFile("ca.cer"); ArrayList certs = new ArrayList(); diff --git a/test/jdk/java/security/cert/pkix/policyChanges/TestPolicy.java b/test/jdk/java/security/cert/pkix/policyChanges/TestPolicy.java index a92eee2c5e0..de2f94d27b5 100644 --- a/test/jdk/java/security/cert/pkix/policyChanges/TestPolicy.java +++ b/test/jdk/java/security/cert/pkix/policyChanges/TestPolicy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 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 @@ -34,6 +34,7 @@ */ import java.io.*; +import java.text.DateFormat; import java.util.*; import java.security.Security; @@ -97,6 +98,10 @@ public static void main(String[] args) throws Exception { params.setRevocationEnabled(false); params.setInitialPolicies(testCase.initialPolicies); + // Certs expired on 7th Nov 2022 + params.setDate(DateFormat.getDateInstance(DateFormat.MEDIUM, + Locale.US).parse("June 01, 2022")); + CertPath path = factory.generateCertPath(Arrays.asList(new X509Certificate[] {ee, ca})); PKIXCertPathValidatorResult result = (PKIXCertPathValidatorResult)validator.validate(path, params); From 188fcb32fcefcdfc60f5e1512fcd17e7f5afdbf0 Mon Sep 17 00:00:00 2001 From: sendaoYan Date: Tue, 22 Nov 2022 10:52:15 +0800 Subject: [PATCH 08/11] [Misc] fix UnsafeIntrinsicsTest.java run OOM on same machine and revert commit 9e37ea4aa6ebd5eb7510d08c957b6c8d577bb890 Summary: fix test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java run OOM on same machine, and revert commit 9e37ea4aa6ebd5eb7510d08c957b6c8d577bb890 Test Plan: CI pipeline Reviewed-by: kuaiwei.kw, lvfei.lv Issue: https://github.com/alibaba/dragonwell11/issues/267 --- test/hotspot/jtreg/ProblemList.txt | 1 - test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt index 52a23221f0f..102aa3aeb33 100644 --- a/test/hotspot/jtreg/ProblemList.txt +++ b/test/hotspot/jtreg/ProblemList.txt @@ -95,7 +95,6 @@ gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java 8193639 solaris-all gc/stress/gcbasher/TestGCBasherWithCMS.java 8272195 generic-i586 gc/cms/TestBubbleUpRef.java 8272195 generic-i586 gc/stress/gcold/TestGCOldWithCMS.java 8272195 generic-i586 -compiler/gcbarriers/UnsafeIntrinsicsTest.java#z https://github.com/alibaba/dragonwell11/issues/267 generic-all ############################################################################# diff --git a/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java b/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java index 531d3ab4ff7..377564d4f16 100644 --- a/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java +++ b/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java @@ -32,6 +32,7 @@ * @run main/othervm -Xmx256m * -XX:+UnlockExperimentalVMOptions * -XX:+UseZGC + * -XX:ParallelGCThreads=5 * -XX:+UnlockDiagnosticVMOptions * -XX:+ZUnmapBadViews -XX:ZCollectionInterval=1 * -XX:-CreateCoredumpOnCrash From 3178d1e01bebda49e422ae4c52d49db61009ad6b Mon Sep 17 00:00:00 2001 From: "lvfei.lv" Date: Mon, 6 Feb 2023 10:44:44 +0800 Subject: [PATCH 09/11] [Misc] Update version Summary: Update dragonwell version Test Plan: CICD Reviewed-by: D-D-H, yuleil Issue: https://github.com/alibaba/dragonwell11/issues/225 --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 0e4dd49c42c..29b625d16c2 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -11.0.17.13.8-GA +11.0.18.14.9-GA From 6e46e1524f86ff6a24f51d5fcfe91cea204124b9 Mon Sep 17 00:00:00 2001 From: "lvfei.lv" Date: Tue, 9 May 2023 15:07:48 +0800 Subject: [PATCH 10/11] [Misc] Update version Summary: Update dragonwell version Test Plan: CICD Reviewed-by: D-D-H, yuleil Issue: https://github.com/alibaba/dragonwell11/issues/225 --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 29b625d16c2..1b02b8c03b7 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -11.0.18.14.9-GA +11.0.19.15.7-GA From 2d107088b9d5936ded709485a80aa4ef57ca07a3 Mon Sep 17 00:00:00 2001 From: "lvfei.lv" Date: Tue, 8 Aug 2023 15:09:46 +0800 Subject: [PATCH 11/11] [Misc] Update version Summary: Update dragonwell version Test Plan: CICD Reviewed-by: kuaiwei, yuleil Issue: https://github.com/dragonwell-project/dragonwell11/issues/225 --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 1b02b8c03b7..498c046ad0a 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -11.0.19.15.7-GA +11.0.20.16.8-GA