Skip to content

Commit f5fb746

Browse files
committedApr 20, 2018
8202036: Update OpenJFX license files to match OpenJDK
Reviewed-by: prr
1 parent 46b3e92 commit f5fb746

File tree

3 files changed

+67
-3
lines changed

3 files changed

+67
-3
lines changed
 

‎ADDITIONAL_LICENSE_INFO

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
ADDITIONAL INFORMATION ABOUT LICENSING
2+
3+
Certain files distributed by Oracle America, Inc. and/or its affiliates are
4+
subject to the following clarification and special exception to the GPLv2,
5+
based on the GNU Project exception for its Classpath libraries, known as the
6+
GNU Classpath Exception.
7+
8+
Note that Oracle includes multiple, independent programs in this software
9+
package. Some of those programs are provided under licenses deemed
10+
incompatible with the GPLv2 by the Free Software Foundation and others.
11+
For example, the package includes programs licensed under the Apache
12+
License, Version 2.0 and may include FreeType. Such programs are licensed
13+
to you under their original licenses.
14+
15+
Oracle facilitates your further distribution of this package by adding the
16+
Classpath Exception to the necessary parts of its GPLv2 code, which permits
17+
you to use that code in combination with other independent modules not
18+
licensed under the GPLv2. However, note that this would not permit you to
19+
commingle code under an incompatible license with Oracle's GPLv2 licensed
20+
code by, for example, cutting and pasting such code into a file also
21+
containing Oracle's GPLv2 licensed code and then distributing the result.
22+
23+
Additionally, if you were to remove the Classpath Exception from any of the
24+
files to which it applies and distribute the result, you would likely be
25+
required to license some or all of the other code in that distribution under
26+
the GPLv2 as well, and since the GPLv2 is incompatible with the license terms
27+
of some items included in the distribution by Oracle, removing the Classpath
28+
Exception could therefore effectively compromise your ability to further
29+
distribute the package.
30+
31+
Failing to distribute notices associated with some files may also create
32+
unexpected legal consequences.
33+
34+
Proceed with caution and we recommend that you obtain the advice of a lawyer
35+
skilled in open source matters before removing the Classpath Exception or
36+
making modifications to this package which may subsequently be redistributed
37+
and/or involve the use of third party software.

‎ASSEMBLY_EXCEPTION

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
2+
OPENJDK ASSEMBLY EXCEPTION
3+
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
7+
only ("GPL2"), with the following clarification and special exception.
8+
9+
Linking this OpenJDK Code statically or dynamically with other code
10+
is making a combined work based on this library. Thus, the terms
11+
and conditions of GPL2 cover the whole combination.
12+
13+
As a special exception, Oracle gives you permission to link this
14+
OpenJDK Code with certain code licensed by Oracle as indicated at
15+
http://openjdk.java.net/legal/exception-modules-2007-05-08.html
16+
("Designated Exception Modules") to produce an executable,
17+
regardless of the license terms of the Designated Exception Modules,
18+
and to copy and distribute the resulting executable under GPL2,
19+
provided that the Designated Exception Modules continue to be
20+
governed by the licenses under which they were offered by Oracle.
21+
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.

‎LICENSE

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ The GNU General Public License (GPL)
33
Version 2, June 1991
44

55
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
6-
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
6+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
77

88
Everyone is permitted to copy and distribute verbatim copies of this license
99
document, but changing it is not allowed.
@@ -287,8 +287,8 @@ pointer to where the full notice is found.
287287
more details.
288288

289289
You should have received a copy of the GNU General Public License along
290-
with this program; if not, write to the Free Software Foundation, Inc., 59
291-
Temple Place, Suite 330, Boston, MA 02111-1307 USA
290+
with this program; if not, write to the Free Software Foundation, Inc.,
291+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
292292

293293
Also add information on how to contact you by electronic and paper mail.
294294

0 commit comments

Comments
 (0)
Please sign in to comment.