changeset 39895:7cbf99c673d8

Merge
author duke
date Wed, 05 Jul 2017 22:00:43 +0200
parents cd4f403f9618 d1d45e7e1a92
children 3082bae7dd91
files
diffstat 4 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags-top-repo	Tue Aug 02 07:19:06 2016 +0530
+++ b/.hgtags-top-repo	Wed Jul 05 22:00:43 2017 +0200
@@ -371,3 +371,4 @@
 3a58466296d36944454756ef01e7513ac5e14a16 jdk-9+126
 8fa686245bd2a072ece3392743460030f0854520 jdk-9+127
 b30ae794d974d7dd3eb4e84203f70021823fa6c6 jdk-9+128
+f5902d3841b82cac6e7716a20c24e8e916fb14a8 jdk-9+129
--- a/common/autoconf/spec.gmk.in	Tue Aug 02 07:19:06 2016 +0530
+++ b/common/autoconf/spec.gmk.in	Wed Jul 05 22:00:43 2017 +0200
@@ -175,8 +175,8 @@
 VERSION_STRING := @VERSION_STRING@
 # The short version string, without trailing zeroes and just PRE, if present.
 VERSION_SHORT := @VERSION_SHORT@
-# The Java specification version. It should be equal to version number.
-VERSION_SPECIFICATION := @VERSION_NUMBER@
+# The Java specification version. It usually equals to the major version number.
+VERSION_SPECIFICATION := @VERSION_MAJOR@
 # A GA version is defined by the PRE string being empty. Rather than testing for
 # that, this variable defines it with true/false.
 VERSION_IS_GA := @VERSION_IS_GA@
--- a/hotspot/.hgtags	Tue Aug 02 07:19:06 2016 +0530
+++ b/hotspot/.hgtags	Wed Jul 05 22:00:43 2017 +0200
@@ -531,3 +531,4 @@
 adc8c84b7cf8c540d920182f78a2bc982366432a jdk-9+126
 352357128f602dcf0426b1cbe011a4685a4d9f97 jdk-9+127
 22bf6db9767b1b3a1994cbf32eb3331f31ae2093 jdk-9+128
+e96b34b76d863ed1fa04e0eeb3f297ac17b490fd jdk-9+129
--- a/make/common/Modules.gmk	Tue Aug 02 07:19:06 2016 +0530
+++ b/make/common/Modules.gmk	Wed Jul 05 22:00:43 2017 +0200
@@ -55,16 +55,12 @@
     java.naming \
     java.prefs \
     java.rmi \
-    java.security.jgss \
     java.security.sasl \
     java.xml \
-    java.xml.crypto \
     jdk.httpserver \
     jdk.management \
     jdk.net \
     jdk.sctp \
-    jdk.security.auth \
-    jdk.security.jgss \
     jdk.unsupported \
     jdk.vm.ci \
     #
@@ -103,19 +99,23 @@
 PLATFORM_MODULES += \
     java.compiler \
     java.scripting \
+    java.security.jgss \
     java.smartcardio \
     java.sql \
     java.sql.rowset \
+    java.xml.crypto \
     jdk.accessibility \
     jdk.charsets \
     jdk.crypto.ec \
     jdk.crypto.pkcs11 \
     jdk.dynalink \
     jdk.jsobject \
-    jdk.xml.dom \
     jdk.localedata \
     jdk.naming.dns \
     jdk.scripting.nashorn \
+    jdk.security.auth \
+    jdk.security.jgss \
+    jdk.xml.dom \
     jdk.zipfs \
     #