7013964: openjdk LICENSE file needs rebranding
authorohair
Wed, 16 Feb 2011 13:29:58 -0800
changeset 8268 e14766c8302a
parent 8250 a36beda9b9de
child 8269 f32efe2fd5f5
7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg
jdk/LICENSE
--- a/jdk/LICENSE	Wed Jul 05 17:35:15 2017 +0200
+++ b/jdk/LICENSE	Wed Feb 16 13:29:58 2011 -0800
@@ -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