From c386646926cb0d5c319d2e018eef1dda4ece9748 Mon Sep 17 00:00:00 2001 From: iris Date: Mon, 10 Oct 2016 20:28:13 -0700 Subject: [PATCH] 8166799: ASSEMBLY_EXCEPTION contains historical company name Reviewed-by: mchung, tbell --- ASSEMBLY_EXCEPTION | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ASSEMBLY_EXCEPTION b/ASSEMBLY_EXCEPTION index 3e78398d9..065b8d902 100644 --- a/ASSEMBLY_EXCEPTION +++ b/ASSEMBLY_EXCEPTION @@ -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 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 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 @@ only ("GPL2"), with the following clarification and special exception. 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. -- GitLab