Merge branch 'standard' into wip_dragonwell_standard_merge_branch

common/autoconf/spec.gmk.in

@@ -725,3 +725,9 @@ JRE_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_BUNDLE_SUBDIR)
 
 # Include the custom-spec.gmk file if it exists
 -include $(dir @SPEC@)/custom-spec.gmk
+
+# Include Dragonwell version information
+-include @TOPDIR@/dragonwell_version
+DISTRO_NAME=Alibaba Dragonwell Standard Edition
+COMPANY_NAME=Alibaba
+DISTRO_VERSION=$(DRAGONWELL_VERSION)

dragonwell_version

@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2020 Alibaba Group Holding Limited. 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Alibaba designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+DRAGONWELL_VERSION=8.16.17
+DRAGONWELL_JDK_UPDATE_VERSION=382

jdk/make/gensrc/GensrcMisc.gmk

@@ -41,6 +41,8 @@ $(PROFILE_VERSION_JAVA_TARGETS): \
 	    -e 's/@@java_runtime_version@@/$(FULL_VERSION)/g' \
 	    -e 's/@@java_runtime_name@@/$(RUNTIME_NAME)/g' \
 	    -e 's/@@java_profile_name@@/$(call profile_version_name, $@)/g' \
+            -e 's/@@java_distro_name@@/$(DISTRO_NAME)/g' \
+            -e 's/@@java_distro_version@@/$(DISTRO_VERSION)/g' \
 	    $< > [email protected]
 	$(MV) [email protected] $@
 

jdk/src/share/classes/sun/misc/Version.java.template

@@ -44,6 +44,12 @@ public class Version {
     private static final String java_runtime_version =
         "@@java_runtime_version@@";
 
+    private static final String java_distro_name =
+        "@@java_distro_name@@";
+
+    private static final String java_distro_version =
+        "@@java_distro_version@@";
+
     static {
         init();
     }
@@ -103,7 +109,9 @@ public class Version {
 
         /* Second line: runtime version (ie, libraries). */
 
-        ps.print(java_runtime_name + " (build " + java_runtime_version);
+        ps.print(java_runtime_name +
+                 " (" + java_distro_name + " " + java_distro_version + ")" +
+                 " (build " + java_runtime_version);
 
         if (java_profile_name.length() > 0) {
             // profile name
@@ -120,7 +128,9 @@ public class Version {
         String java_vm_name    = System.getProperty("java.vm.name");
         String java_vm_version = System.getProperty("java.vm.version");
         String java_vm_info    = System.getProperty("java.vm.info");
-        ps.println(java_vm_name + " (build " + java_vm_version + ", " +
+        ps.println(java_vm_name +
+                   " (" + java_distro_name + " " + java_distro_version + ")" +
+                   " (build " + java_vm_version + ", " +
                    java_vm_info + ")");
     }
 

jdk/test/ProblemList.txt

@@ -385,3 +385,11 @@ sun/tools/jps/TestJpsJarRelative.java				generic-all
 
 sample/mergesort/MergeSortTest.java				8178912 generic-all
 sample/chatserver/ChatTest.java					8178912 generic-all
+
+############################################################################
+
+# china mainland network
+
+############################################################################
+
+security/infra/java/security/cert/CertPathValidator/certification/CertignaCA.java generic-all

jdk/test/java/util/SplittableRandom/SplittableRandomTest.java

@@ -36,8 +36,8 @@
 
 /**
  * @test
- * @run testng SplittableRandomTest
- * @run testng/othervm -Djava.util.secureRandomSeed=true SplittableRandomTest
+ * @run testng/othervm -Djava.security.egd=file:/dev/urandom SplittableRandomTest
+ * @run testng/othervm -Djava.security.egd=file:/dev/urandom -Djava.util.secureRandomSeed=true SplittableRandomTest
  * @summary test methods on SplittableRandom
  * @key randomness
  */

jdk/test/jdk/jfr/event/gc/stacktrace/TestG1OldAllocationPendingStackTrace.java

@@ -31,7 +31,7 @@
  *
  *
  * @library /lib /
- * @run main/othervm -XX:MaxNewSize=10M -Xmx128M -XX:+UseG1GC -XX:+PrintGCDetails -XX:+PrintGC jdk.jfr.event.gc.stacktrace.TestG1OldAllocationPendingStackTrace
+ * @run main/othervm -XX:MaxNewSize=10M -Xmx100M -XX:+UseG1GC -XX:+PrintGCDetails -XX:+PrintGC jdk.jfr.event.gc.stacktrace.TestG1OldAllocationPendingStackTrace
  */
 public class TestG1OldAllocationPendingStackTrace {
 

version.txt

@@ -0,0 +1 @@
+8.382.8.16.17.01-GA