Merge

.hgtags

@@ -984,3 +984,4 @@ d10b8de706c1ea867abc5518dbb1cf92f6965f6a jdk8u202-ga
 478a4add975beb90696a4ead5f8fcd9c17fc1a83 jdk8u212-b00
 fcf246aa327f6384be94464b2c8aa0ef03af473d jdk8u222-b00
 fcf246aa327f6384be94464b2c8aa0ef03af473d jdk8u212-b01
+acab6dbdd0b55e524d50e9b1c4f12c90e2f424c5 jdk8u212-b02

make/lib/CoreLibraries.gmk

 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, 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
@@ -169,7 +169,8 @@ LIBJAVA_CFLAGS := $(foreach dir, $(LIBJAVA_SRC_DIRS), -I$(dir)) \
 LIBJAVA_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
     -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
     -DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \
-     -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"'
+     -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"'  \
+     $(VERSION_CFLAGS)
 
 ifneq (, $(JDK_UPDATE_VERSION))
   LIBJAVA_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"'

src/share/native/java/lang/System.c

 /*
- * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2019, 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
@@ -108,9 +108,14 @@ Java_java_lang_System_identityHashCode(JNIEnv *env, jobject this, jobject x)
         (*env)->DeleteLocalRef(env, jkey);                            \
     } else ((void) 0)
 
-#ifndef VENDOR /* Third party may overwrite this. */
+/* Third party may overwrite these values. */
+#ifndef VENDOR
 #define VENDOR "Oracle Corporation"
+#endif
+#ifndef VENDOR_URL
 #define VENDOR_URL "http://java.oracle.com/"
+#endif
+#ifndef VENDOR_URL_BUG
 #define VENDOR_URL_BUG "http://bugreport.sun.com/bugreport/"
 #endif
 

test/sun/security/krb5/auto/KdcPolicy.java

@@ -39,8 +39,8 @@ import sun.security.krb5.Config;
 /*
  * @test
  * @bug 8164656
- * @run main/othervm KdcPolicy udp
- * @run main/othervm KdcPolicy tcp
+ * @run main/othervm -Dsun.net.spi.nameservice.provider.1=ns,mock KdcPolicy udp
+ * @run main/othervm -Dsun.net.spi.nameservice.provider.1=ns,mock KdcPolicy tcp
  * @summary krb5.kdc.bad.policy test
  */
 public class KdcPolicy {