OpenJDK / amber / amber
changeset 41347:ddbbb16c6b6e
8166799: ASSEMBLY_EXCEPTION contains historical company name
Reviewed-by: mchung, tbell
| author | iris |
|---|---|
| date | Thu, 06 Oct 2016 18:05:53 -0700 |
| parents | 00e1ee42ec25 |
| children | f7adcb30658a |
| files | hotspot/ASSEMBLY_EXCEPTION |
| diffstat | 1 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/ASSEMBLY_EXCEPTION Thu Oct 06 23:12:14 2016 +0000 +++ b/hotspot/ASSEMBLY_EXCEPTION Thu Oct 06 18:05:53 2016 -0700 @@ -1,9 +1,9 @@ OPENJDK ASSEMBLY EXCEPTION -The OpenJDK source code made available by Oracle 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 @@ -19,9 +19,9 @@ provided that the Designated Exception Modules continue to be governed by the licenses under which they were offered by Oracle. -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. +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.