Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk8-b16
authorduke
Wed, 05 Jul 2017 17:56:44 +0200
changeset 11078 736a63b854f3
parent 11077 a08e64f0dcf0 (diff)
parent 11060 3ca1bc9a9353 (current diff)
child 11079 7f97c811f967
child 11082 702e81145325
child 11145 893729a0ff19
child 11215 2a8340286f01
child 11220 f86053235ede
child 11236 0de47eef399c
child 11335 65ac42bcaf7b
Merge
--- a/.hgtags-top-repo	Wed Jul 05 17:56:19 2017 +0200
+++ b/.hgtags-top-repo	Wed Jul 05 17:56:44 2017 +0200
@@ -136,3 +136,4 @@
 8e2104d565baee473895d5eba20e39f85ab4bf9f jdk8-b12
 26fb81a1e9ceb9baffba216acd9ded62e9e9d5ab jdk8-b13
 23aa7f2c80a2fa354c80decf03e7c2018177ef4e jdk8-b14
+a4f28069d44a379cda99dd1d921d19f819726d22 jdk8-b15
--- a/corba/.hgtags	Wed Jul 05 17:56:19 2017 +0200
+++ b/corba/.hgtags	Wed Jul 05 17:56:44 2017 +0200
@@ -136,3 +136,4 @@
 31d70911b712c6b4e580a3110363d5f044cfed7a jdk8-b12
 5b9d9b839d3d7fe02347827221c97c6d242a6f96 jdk8-b13
 e59c47de1ad8982ff3b0e843773a6902b36c2337 jdk8-b14
+7da69e7175a7c7564ee6d0e52255cbb8a57ef577 jdk8-b15
--- a/hotspot/.hgtags	Wed Jul 05 17:56:19 2017 +0200
+++ b/hotspot/.hgtags	Wed Jul 05 17:56:44 2017 +0200
@@ -200,3 +200,4 @@
 b92ca8e229d29004f840c67e620833d23a346761 jdk8-b13
 088d09a130ff02d8f5f05e92256baabe412f0439 jdk8-b14
 6c2a55d4902f202e1c2de1df17b7da083a2c31e8 hs23-b06
+fde2a39ed7f39233b287fbc278f437aac06c275b jdk8-b15
--- a/jaxp/.hgtags	Wed Jul 05 17:56:19 2017 +0200
+++ b/jaxp/.hgtags	Wed Jul 05 17:56:44 2017 +0200
@@ -136,3 +136,4 @@
 ca977d167697a561c04894187fc1c4d927582ffa jdk8-b12
 bcc739229f6384786c7ac0b52c1822c85674dcf1 jdk8-b13
 9d0c9d638757cb09de18933b946fa04b4f3fb94f jdk8-b14
+804f666d6d44e33caac12ad8da3d2780ac44ef72 jdk8-b15
--- a/jaxp/build.properties	Wed Jul 05 17:56:19 2017 +0200
+++ b/jaxp/build.properties	Wed Jul 05 17:56:44 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, 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
@@ -25,7 +25,7 @@
 
 # Base locations where bundles are located
 slashjava=/java
-drops.dir=${slashjava}/devtools/share/jdk7-drops
+drops.dir=${slashjava}/devtools/share/jdk8-drops
 
 # This is the JDK used to build and run the bootstrap version of javac.
 # The bootstrap javac is used to compile both boostrap versions of the
--- a/jaxp/make/Makefile	Wed Jul 05 17:56:19 2017 +0200
+++ b/jaxp/make/Makefile	Wed Jul 05 17:56:44 2017 +0200
@@ -99,9 +99,9 @@
   DROPS_DIR = $(ALT_DROPS_DIR)
 else
   ifdef ALT_JDK_DEVTOOLS_DIR
-    DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops
+    DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk8-drops
   else
-    DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops
+    DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk8-drops
   endif
 endif
 
--- a/jaxws/.hgtags	Wed Jul 05 17:56:19 2017 +0200
+++ b/jaxws/.hgtags	Wed Jul 05 17:56:44 2017 +0200
@@ -136,3 +136,4 @@
 e6eed2ff5d5f62bdc815beb5276d23347600c760 jdk8-b12
 adf2a6b5fde14090beb9ebc40c4114132ddee731 jdk8-b13
 54c4bf4b83ecc191351747d5d28da849d34c0243 jdk8-b14
+c9ab96ff23d52d85d5dcce1f9c0fd7a3de418c74 jdk8-b15
--- a/jaxws/build.properties	Wed Jul 05 17:56:19 2017 +0200
+++ b/jaxws/build.properties	Wed Jul 05 17:56:44 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, 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
@@ -25,7 +25,7 @@
 
 # Base locations where bundles are located
 slashjava=/java
-drops.dir=${slashjava}/devtools/share/jdk7-drops
+drops.dir=${slashjava}/devtools/share/jdk8-drops
 
 # This is the JDK used to build and run the bootstrap version of javac.
 # The bootstrap javac is used to compile both boostrap versions of the
--- a/jaxws/make/Makefile	Wed Jul 05 17:56:19 2017 +0200
+++ b/jaxws/make/Makefile	Wed Jul 05 17:56:44 2017 +0200
@@ -99,9 +99,9 @@
   DROPS_DIR = $(ALT_DROPS_DIR)
 else
   ifdef ALT_JDK_DEVTOOLS_DIR
-    DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops
+    DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk8-drops
   else
-    DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops
+    DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk8-drops
   endif
 endif
 
--- a/jdk/.hgtags	Wed Jul 05 17:56:19 2017 +0200
+++ b/jdk/.hgtags	Wed Jul 05 17:56:44 2017 +0200
@@ -136,3 +136,4 @@
 09fd2067f715e4505c44b01c301258a4e8f8964e jdk8-b12
 4cb2e8679b27432854690cb688ea06d3b2d8e008 jdk8-b13
 99632935785e2038b2fc836da9f2ede69dea294b jdk8-b14
+3c248d0e2c486624cc0d7aba1e4df45ae5774ff7 jdk8-b15
--- a/langtools/.hgtags	Wed Jul 05 17:56:19 2017 +0200
+++ b/langtools/.hgtags	Wed Jul 05 17:56:44 2017 +0200
@@ -136,3 +136,4 @@
 f2d6ed25857dfa7f269ac66e13666d648cb988c6 jdk8-b12
 ae25163501bc7477cd907e26a006a6f1b05fdb6d jdk8-b13
 58f1325d72b2bacc901f5189ee5e4e81e81ea657 jdk8-b14
+07599bd780cab1f40da7915e1dc6774629b0cf8c jdk8-b15
jdk-sandbox