From 117713bd928ee0398ea33fad44d06f032413db4a Mon Sep 17 00:00:00 2001 From: Valerie Peng Date: Wed, 27 Jul 2016 01:26:47 +0000 Subject: [PATCH 1/5] 8159488: Deprivilege java.xml.crypto Moved java.xml.crypto module from boot modules to platform modules Reviewed-by: mullan --- make/common/Modules.gmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk index bd4747891f8..fa68288c226 100644 --- a/make/common/Modules.gmk +++ b/make/common/Modules.gmk @@ -58,7 +58,6 @@ BOOT_MODULES += \ java.security.jgss \ java.security.sasl \ java.xml \ - java.xml.crypto \ jdk.httpserver \ jdk.management \ jdk.net \ @@ -106,6 +105,7 @@ PLATFORM_MODULES += \ java.smartcardio \ java.sql \ java.sql.rowset \ + java.xml.crypto \ jdk.accessibility \ jdk.charsets \ jdk.crypto.ec \ From eb5d47885168209b68acb708db661f69b079eb5c Mon Sep 17 00:00:00 2001 From: Alejandro Murillo Date: Thu, 28 Jul 2016 16:08:13 +0000 Subject: [PATCH 2/5] Added tag jdk-9+129 for changeset ed24939e8679 --- .hgtags-top-repo | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags-top-repo b/.hgtags-top-repo index c2c23ebab23..918c4e57478 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -371,3 +371,4 @@ f80c841ae2545eaf9acd2724bccc305d98cefbe2 jdk-9+124 3a58466296d36944454756ef01e7513ac5e14a16 jdk-9+126 8fa686245bd2a072ece3392743460030f0854520 jdk-9+127 b30ae794d974d7dd3eb4e84203f70021823fa6c6 jdk-9+128 +f5902d3841b82cac6e7716a20c24e8e916fb14a8 jdk-9+129 From 19fa760d9c578de7aabfccf1a222cc142aa2df2f Mon Sep 17 00:00:00 2001 From: Volker Simonis Date: Mon, 4 Apr 2016 18:35:51 +0200 Subject: [PATCH 3/5] 8149519: Set java.specification.version to the MAJOR java version Reviewed-by: alanb, dholmes, iris --- common/autoconf/spec.gmk.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in index 26705337a95..0efabd42a15 100644 --- a/common/autoconf/spec.gmk.in +++ b/common/autoconf/spec.gmk.in @@ -175,8 +175,8 @@ VERSION_NUMBER_FOUR_POSITIONS := @VERSION_NUMBER_FOUR_POSITIONS@ 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@ From 9abe2deac30e76783901b4b710c426fe00e6fc01 Mon Sep 17 00:00:00 2001 From: Alejandro Murillo Date: Thu, 28 Jul 2016 16:08:14 +0000 Subject: [PATCH 4/5] Added tag jdk-9+129 for changeset 3b5633fa6073 --- hotspot/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/.hgtags b/hotspot/.hgtags index 71f4f526f73..16c8be595e2 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -531,3 +531,4 @@ bb640b49741af3f57f9994129934c46fc173219f jdk-9+125 adc8c84b7cf8c540d920182f78a2bc982366432a jdk-9+126 352357128f602dcf0426b1cbe011a4685a4d9f97 jdk-9+127 22bf6db9767b1b3a1994cbf32eb3331f31ae2093 jdk-9+128 +e96b34b76d863ed1fa04e0eeb3f297ac17b490fd jdk-9+129 From 272662060174eccf8f541c5524b48cb114bedf9c Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Sun, 31 Jul 2016 09:36:28 +0800 Subject: [PATCH 5/5] 8159528: Deprivilege java.security.jgss, jdk.security.jgss and jdk.security.auth Reviewed-by: mchung, mullan --- make/common/Modules.gmk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk index fa68288c226..ef77ffd5213 100644 --- a/make/common/Modules.gmk +++ b/make/common/Modules.gmk @@ -55,15 +55,12 @@ BOOT_MODULES += \ java.naming \ java.prefs \ java.rmi \ - java.security.jgss \ java.security.sasl \ java.xml \ jdk.httpserver \ jdk.management \ jdk.net \ jdk.sctp \ - jdk.security.auth \ - jdk.security.jgss \ jdk.unsupported \ jdk.vm.ci \ # @@ -102,6 +99,7 @@ PLATFORM_MODULES += \ PLATFORM_MODULES += \ java.compiler \ java.scripting \ + java.security.jgss \ java.smartcardio \ java.sql \ java.sql.rowset \ @@ -112,10 +110,12 @@ PLATFORM_MODULES += \ 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 \ #