Merge
authorduke
Wed, 05 Jul 2017 17:35:41 +0200
changeset 8284 a81c63929a9e
parent 8283 a13a950d71df (diff)
parent 8280 911e751d2519 (current diff)
child 8288 52cf09ae8c6d
Merge
--- a/jaxws/.hgtags	Wed Jul 05 17:35:38 2017 +0200
+++ b/jaxws/.hgtags	Wed Jul 05 17:35:41 2017 +0200
@@ -104,3 +104,4 @@
 ef19f173578c804772d586a959fa3ab8a12c0598 jdk7-b127
 88d74afc55938033e744b537a22714bb2c82c9c0 jdk7-b128
 0f7b39ad902424e949e3d2dca8411b884888a76f jdk7-b129
+ba1fac1c2083196422a12130db174334179a4d44 jdk7-b130
--- a/jaxws/LICENSE	Wed Jul 05 17:35:38 2017 +0200
+++ b/jaxws/LICENSE	Wed Jul 05 17:35:41 2017 +0200
@@ -325,11 +325,11 @@
 
 "CLASSPATH" EXCEPTION TO THE GPL
 
-Certain source files distributed by Sun Microsystems, Inc.  are subject to
-the following clarification and special exception to the GPL, but only where
-Sun has expressly included in the particular source file's header the words
-"Sun designates this particular file as subject to the "Classpath" exception
-as provided by Sun in the LICENSE file that accompanied this code."
+Certain source files distributed by Oracle America and/or its affiliates are
+subject to the following clarification and special exception to the GPL, but
+only where Oracle has expressly included in the particular source file's header
+the words "Oracle designates this particular file as subject to the "Classpath"
+exception as provided by Oracle in the LICENSE file that accompanied this code."
 
     Linking this library statically or dynamically with other modules is making
     a combined work based on this library.  Thus, the terms and conditions of