Merge
authorasaha
Thu, 13 Jul 2017 21:33:35 -0700
changeset 46011 08e2a28966ff
parent 46009 d23691199308 (diff)
parent 46010 d72565e4d8cf (current diff)
child 46012 91449fa67cd1
child 46030 29450b4343e9
Merge
--- a/jaxws/.hgtags	Sat Jun 24 22:10:40 2017 +0100
+++ b/jaxws/.hgtags	Thu Jul 13 21:33:35 2017 -0700
@@ -421,3 +421,6 @@
 2bd967aa452c1e0e87a6173bef6fbb96ef1c521b jdk-9+173
 c2296642010f1b215ac35da89e92c3ce44104e32 jdk-9+174
 a5d361b9d1f7f78a675f3baef0d1fd32deee9ea2 jdk-9+175
+ea819b6009d33a72e6672bab6c101d51db0cfb4c jdk-9+176
+b44a721aee3d3b2537754e559fe9ecccadea548b jdk-9+177
+d0190aaf1816081d9b2e0577b65b793804896d1e jdk-9+178
--- a/jaxws/src/java.activation/share/classes/module-info.java	Sat Jun 24 22:10:40 2017 +0100
+++ b/jaxws/src/java.activation/share/classes/module-info.java	Thu Jul 13 21:33:35 2017 -0700
@@ -26,7 +26,7 @@
 /**
  * Defines the JavaBeans Activation Framework (JAF) API.
  *
- * <p> This module is upgradeble.
+ * <p> This module is upgradeable.
  *
  * @moduleGraph
  * @since 9
--- a/jaxws/src/java.xml.bind/share/classes/module-info.java	Sat Jun 24 22:10:40 2017 +0100
+++ b/jaxws/src/java.xml.bind/share/classes/module-info.java	Thu Jul 13 21:33:35 2017 -0700
@@ -26,7 +26,7 @@
 /**
  * Defines the Java Architecture for XML Binding (JAXB) API.
  *
- * <p> This module is upgradeble.
+ * <p> This module is upgradeable.
  *
  * @uses javax.xml.bind.JAXBContextFactory
  *
--- a/jaxws/src/java.xml.ws.annotation/share/classes/module-info.java	Sat Jun 24 22:10:40 2017 +0100
+++ b/jaxws/src/java.xml.ws.annotation/share/classes/module-info.java	Thu Jul 13 21:33:35 2017 -0700
@@ -27,7 +27,7 @@
  * Defines a subset of the Common Annotations API to support programs running
  * on the Java SE Platform.
  *
- * <p> This module is upgradeble.
+ * <p> This module is upgradeable.
  *
  * @moduleGraph
  * @since 9
--- a/jaxws/src/java.xml.ws/share/classes/module-info.java	Sat Jun 24 22:10:40 2017 +0100
+++ b/jaxws/src/java.xml.ws/share/classes/module-info.java	Thu Jul 13 21:33:35 2017 -0700
@@ -27,7 +27,7 @@
  * Defines the Java API for XML-Based Web Services (JAX-WS), and
  * the Web Services Metadata API.
  *
- * <p> This module is upgradeble.
+ * <p> This module is upgradeable.
  *
  * @uses javax.xml.soap.MessageFactory
  * @uses javax.xml.soap.SAAJMetaFactory