RFR (s) 8166799: ASSEMBLY_EXCEPTION contians historical company name
iris.clark at oracle.com
Thu Oct 6 21:00:17 UTC 2016
Please review changes to address the following bug:
8166799: ASSEMBLY_EXCEPTION contains historical company name
The ASSEMBLY_EXCEPION file  across all JDK releases and open repositories
(<top>, corba, hotspot, jaxp, jaxws, jdk, langtools, nashorn) contains
multiple references to "Sun". We should stop using the historical company
name. We should also remove reference to "openjdk.dev.java.net" which does
Reformatting of the file causes more diffs than are strictly necessary so
I've appended an unformatted diff to this message for your convenience.
The same reformatted file is used across all repositories.
----- unformatted diffs -----
diff -r 81435a812f59 ASSEMBLY_EXCEPTION
--- a/ASSEMBLY_EXCEPTION Thu Oct 06 14:03:14 2016 +0200
+++ b/ASSEMBLY_EXCEPTION Thu Oct 06 13:09:44 2016 -0700
@@ -1,8 +1,8 @@
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
+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.
@@ -10,18 +10,18 @@
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
("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
+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.
More information about the jdk9-dev