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
authorduke
Wed, 05 Jul 2017 17:56:38 +0200
changeset 11075 97bfcee56f44
parent 11074 76e4bc65bb65 (diff)
parent 11071 8d224669195f (current diff)
child 11077 a08e64f0dcf0
Merge
--- a/jaxws/.hgtags	Wed Jul 05 17:56:35 2017 +0200
+++ b/jaxws/.hgtags	Wed Jul 05 17:56:38 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:35 2017 +0200
+++ b/jaxws/build.properties	Wed Jul 05 17:56:38 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:35 2017 +0200
+++ b/jaxws/make/Makefile	Wed Jul 05 17:56:38 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
jdk-sandbox