7013964: openjdk LICENSE file needs rebranding
authorohair
Wed Feb 16 13:26:18 2011 -0800 (2 years ago)
changeset 55bcff848e8d12
parent 54954daf5cf0c2
child 57fd448e7369f8
7013964: openjdk LICENSE file needs rebranding
Reviewed-by: darcy, katleman, jjg
LICENSE
--- a/LICENSE Fri Jan 21 16:20:35 2011 -0800
+++ b/LICENSE Wed Feb 16 13:26:18 2011 -0800
@@ -325,11 +325,11 @@ License instead of this License.
"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