Merge
authorduke
Wed, 05 Jul 2017 17:28:44 +0200
changeset 7325 3c9670ddb2a8
parent 7324 1813eb437117 (diff)
parent 7320 941e76c5100a (current diff)
child 7338 567d424fccea
Merge
jdk/src/share/classes/sun/net/httpserver/SelectorCache.java
--- a/jaxws/.hgtags	Wed Jul 05 17:28:40 2017 +0200
+++ b/jaxws/.hgtags	Wed Jul 05 17:28:44 2017 +0200
@@ -94,3 +94,4 @@
 1320fb3bb588298c79716bd2d10b5b4afacb9370 jdk7-b117
 19a2fab3f91a275f90791c15d1c21a24e820ff2d jdk7-b118
 41fa02b3663795ddf529690df7aa6714210093ec jdk7-b119
+a4f2e1ca67163ef79555082809d7cd719893c338 jdk7-b120
--- a/jaxws/jaxws.properties	Wed Jul 05 17:28:40 2017 +0200
+++ b/jaxws/jaxws.properties	Wed Jul 05 17:28:44 2017 +0200
@@ -28,14 +28,14 @@
 jaxws_src.bundle.name= jdk7-jaxws2_2-2010_08_19.zip
 jaxws_src.bundle.md5.checksum=8775ccefd3b4fa2dde5155ec4b7e4ceb
 jaxws_src.master.bundle.dir=${drops.master.copy.base}
-jaxws_src.master.bundle.url.base=https://jax-ws.dev.java.net/files/documents/4202/152532
+jaxws_src.master.bundle.url.base=https://java.net/downloads/jax-ws/JDK7
 
 jaf_src.bundle.name=jdk7-jaf-2010_08_19.zip
 jaf_src.bundle.md5.checksum=18d15dfd71117daadb332af003d08212
 jaf_src.master.bundle.dir=${drops.master.copy.base}
-jaf_src.master.bundle.url.base=https://jax-ws.dev.java.net/files/documents/4202/152336
+jaf_src.master.bundle.url.base=https://java.net/downloads/jax-ws/JDK7
 
 #jaxws_tests.bundle.name=jdk7-jaxws-tests-2009_08_28.zip
 #jaxws_tests.master.bundle.dir=${drops.master.copy.base}
-#jaxws_tests.master.bundle.url.base=http://kenai.com/projects/jdk7-drops/downloads/download
+#jaxws_tests.master.bundle.url.base=https://java.net/downloads/jax-ws/JDK7