Skip to content

Commit 84dc188

Browse files
author
iris
committed
8166799: ASSEMBLY_EXCEPTION contains historical company name
Reviewed-by: mchung, tbell
1 parent 11686de commit 84dc188

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

ASSEMBLY_EXCEPTION

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11

22
OPENJDK ASSEMBLY EXCEPTION
33

4-
The OpenJDK source code made available by Sun at openjdk.java.net and
5-
openjdk.dev.java.net ("OpenJDK Code") is distributed under the terms of the
6-
GNU General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
4+
The OpenJDK source code made available by Oracle America, Inc. (Oracle) at
5+
openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU
6+
General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
77
only ("GPL2"), with the following clarification and special exception.
88

99
Linking this OpenJDK Code statically or dynamically with other code
1010
is making a combined work based on this library. Thus, the terms
1111
and conditions of GPL2 cover the whole combination.
1212

13-
As a special exception, Sun gives you permission to link this
14-
OpenJDK Code with certain code licensed by Sun as indicated at
13+
As a special exception, Oracle gives you permission to link this
14+
OpenJDK Code with certain code licensed by Oracle as indicated at
1515
http://openjdk.java.net/legal/exception-modules-2007-05-08.html
1616
("Designated Exception Modules") to produce an executable,
1717
regardless of the license terms of the Designated Exception Modules,
1818
and to copy and distribute the resulting executable under GPL2,
1919
provided that the Designated Exception Modules continue to be
20-
governed by the licenses under which they were offered by Sun.
20+
governed by the licenses under which they were offered by Oracle.
2121

22-
As such, it allows licensees and sublicensees of Sun's GPL2 OpenJDK Code to
23-
build an executable that includes those portions of necessary code that Sun
24-
could not provide under GPL2 (or that Sun has provided under GPL2 with the
25-
Classpath exception). If you modify or add to the OpenJDK code, that new
26-
GPL2 code may still be combined with Designated Exception Modules if the
27-
new code is made subject to this exception by its copyright holder.
22+
As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code
23+
to build an executable that includes those portions of necessary code that
24+
Oracle could not provide under GPL2 (or that Oracle has provided under GPL2
25+
with the Classpath exception). If you modify or add to the OpenJDK code,
26+
that new GPL2 code may still be combined with Designated Exception Modules
27+
if the new code is made subject to this exception by its copyright holder.

0 commit comments

Comments
 (0)