aboutsummaryrefslogtreecommitdiffhomepage
path: root/ASSEMBLY_EXCEPTION
diff options
context:
space:
mode:
authorGravatar Iris Clark <iris@openjdk.org> 2016-10-06 18:06:04 -0700
committerGravatar Iris Clark <iris@openjdk.org> 2016-10-06 18:06:04 -0700
commit36bc804e6bd876224b2abe3a8f6b81f906e6a9e7 (patch)
treef41a4c30da6d57f23e5d90a6e4b69a8952c917c2 /ASSEMBLY_EXCEPTION
parent121ffd6f678115f8081e1254a353f6be76515b68 (diff)
downloadjdk-36bc804e6bd876224b2abe3a8f6b81f906e6a9e7.tar.gz
jdk-36bc804e6bd876224b2abe3a8f6b81f906e6a9e7.zip
8166799: ASSEMBLY_EXCEPTION contains historical company name
Reviewed-by: mchung, tbell
Diffstat (limited to 'ASSEMBLY_EXCEPTION')
-rw-r--r--ASSEMBLY_EXCEPTION24
1 files changed, 12 insertions, 12 deletions
diff --git a/ASSEMBLY_EXCEPTION b/ASSEMBLY_EXCEPTION
index 8b7ac1d0813..065b8d90239 100644
--- a/ASSEMBLY_EXCEPTION
+++ b/ASSEMBLY_EXCEPTION
@@ -1,27 +1,27 @@
OPENJDK ASSEMBLY EXCEPTION
-The OpenJDK source code made available by Sun at openjdk.java.net and
-openjdk.dev.java.net ("OpenJDK Code") is distributed under the terms of the
-GNU General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
+The OpenJDK source code made available by Oracle America, Inc. (Oracle) at
+openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU
+General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
only ("GPL2"), with the following clarification and special exception.
Linking this OpenJDK Code statically or dynamically with other code
is making a combined work based on this library. Thus, the terms
and conditions of GPL2 cover the whole combination.
- As a special exception, Sun gives you permission to link this
- OpenJDK Code with certain code licensed by Sun as indicated at
+ As a special exception, Oracle gives you permission to link this
+ OpenJDK Code with certain code licensed by Oracle as indicated at
http://openjdk.java.net/legal/exception-modules-2007-05-08.html
("Designated Exception Modules") to produce an executable,
regardless of the license terms of the Designated Exception Modules,
and to copy and distribute the resulting executable under GPL2,
provided that the Designated Exception Modules continue to be
- governed by the licenses under which they were offered by Sun.
+ governed by the licenses under which they were offered by Oracle.
-As such, it allows licensees and sublicensees of Sun's GPL2 OpenJDK Code to
-build an executable that includes those portions of necessary code that Sun
-could not provide under GPL2 (or that Sun has provided under GPL2 with the
-Classpath exception). If you modify or add to the OpenJDK code, that new
-GPL2 code may still be combined with Designated Exception Modules if the
-new code is made subject to this exception by its copyright holder.
+As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code
+to build an executable that includes those portions of necessary code that
+Oracle could not provide under GPL2 (or that Oracle has provided under GPL2
+with the Classpath exception). If you modify or add to the OpenJDK code,
+that new GPL2 code may still be combined with Designated Exception Modules
+if the new code is made subject to this exception by its copyright holder.