# HG changeset patch
# User kcr
# Date 1555974879 25200
# Mon Apr 22 16:14:39 2019 -0700
# Node ID c652ba78fcfe4caa5d7254b4205b8c0bc9688aa3
# Parent b854a3a2d17d7c5a12f66995a3bdfe52cec58b04
8222746: Cleanup third-party legal files
Reviewed-by:
diff --git a/modules/javafx.graphics/src/main/legal/jpeg_fx.md b/modules/javafx.graphics/src/main/legal/jpeg_fx.md
--- a/modules/javafx.graphics/src/main/legal/jpeg_fx.md
+++ b/modules/javafx.graphics/src/main/legal/jpeg_fx.md
@@ -1,7 +1,8 @@
## Independent JPEG Group (IJG) JPEG v9c
### IJG License
-
+```
+
/*
* jcapimin.c
*
@@ -10,6 +11,7 @@
* This file is part of the Independent JPEG Group's software.
* For conditions of distribution and use, see the accompanying README file.
*/
+
[From the README file]
The authors make NO WARRANTY or representation, either express or implied,
with respect to this software, its quality, accuracy, merchantability, or
@@ -46,4 +48,4 @@
commercial products, provided that all warranty or liability claims are
assumed by the product vendor.
-
+```
diff --git a/modules/javafx.graphics/src/main/legal/mesa3d.md b/modules/javafx.graphics/src/main/legal/mesa3d.md
--- a/modules/javafx.graphics/src/main/legal/mesa3d.md
+++ b/modules/javafx.graphics/src/main/legal/mesa3d.md
@@ -1,7 +1,7 @@
## Mesa 3-D Graphics Library v5.0
### Mesa License
-
+```
Mesa 3-D graphics library
Version: 5.0
@@ -25,4 +25,4 @@
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+```
diff --git a/modules/javafx.graphics/src/main/legal/opengl_fx.md b/modules/javafx.graphics/src/main/legal/opengl_fx.md
--- a/modules/javafx.graphics/src/main/legal/opengl_fx.md
+++ b/modules/javafx.graphics/src/main/legal/opengl_fx.md
@@ -1,7 +1,7 @@
## Khronos Group OpenGL Headers v4.6
### Khronos Group License
-
+```
Copyright (c) 2008-2018 The Khronos Group Inc.
@@ -24,4 +24,4 @@
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-
+```
diff --git a/modules/javafx.media/src/main/legal/applecoreaudio.md b/modules/javafx.media/src/main/legal/applecoreaudio.md
--- a/modules/javafx.media/src/main/legal/applecoreaudio.md
+++ b/modules/javafx.media/src/main/legal/applecoreaudio.md
@@ -4,7 +4,7 @@
This software is present only on Mac OS X systems.
### Apple Computer CoreAudio License
-
+```
File:
Abstract: Part of CoreAudio Utility Classes
@@ -50,4 +50,4 @@
Copyright (C) 2014 Apple Inc. All Rights Reserved.
-
+```
diff --git a/modules/javafx.media/src/main/legal/glib.md b/modules/javafx.media/src/main/legal/glib.md
--- a/modules/javafx.media/src/main/legal/glib.md
+++ b/modules/javafx.media/src/main/legal/glib.md
@@ -1,7 +1,8 @@
## GNU Glib v2.58.2
### Glib Notice
-
+```
+
You are receiving a copy of GNU Glib, Version: 2.58.2 in either source or
object code in the JavaFX runtime or JavaFX SDK. The terms of the
Oracle license do NOT apply to the GNU Glib, Version: 2.58.2; it is
@@ -23,10 +24,13 @@
code is here:
rt/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/
-
+
+
+```
### LGPL 2.1
-
+```
+
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
@@ -530,6 +534,4 @@
That's all there is to it!
-
-
-
+```
diff --git a/modules/javafx.media/src/main/legal/gstreamer.md b/modules/javafx.media/src/main/legal/gstreamer.md
--- a/modules/javafx.media/src/main/legal/gstreamer.md
+++ b/modules/javafx.media/src/main/legal/gstreamer.md
@@ -1,7 +1,8 @@
## GStreamer v1.14.4
### GStreamer Notice
-
+```
+
You are receiving a copy of GStreamer, Version: 1.14.4 in either source or
object code in the JavaFX runtime or JavaFX SDK. The terms of the
Oracle license do NOT apply to the GStreamer, Version: 1.14.4; it is
@@ -23,10 +24,11 @@
code is here:
rt/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/
-
+```
### LGPL 2.1
-
+```
+
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
@@ -84,7 +86,7 @@
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
-
+
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
@@ -530,4 +532,4 @@
That's all there is to it!
-
+```
diff --git a/modules/javafx.media/src/main/legal/libffi.md b/modules/javafx.media/src/main/legal/libffi.md
--- a/modules/javafx.media/src/main/legal/libffi.md
+++ b/modules/javafx.media/src/main/legal/libffi.md
@@ -1,7 +1,7 @@
## LibFFI v3.2.1
### LibFFI License
-
+```
libffi - Copyright (c) 1996-2014 Anthony Green, Red Hat, Inc and others.
See source files for details.
@@ -25,5 +25,4 @@
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
+```
diff --git a/modules/javafx.web/src/main/legal/icu_web.md b/modules/javafx.web/src/main/legal/icu_web.md
--- a/modules/javafx.web/src/main/legal/icu_web.md
+++ b/modules/javafx.web/src/main/legal/icu_web.md
@@ -1,7 +1,8 @@
## IBM International Components for Unicode (ICU4C) v62.1
### ICU License
-
+```
+
COPYRIGHT AND PERMISSION NOTICE (ICU 58 and later)
Copyright © 1991-2018 Unicode, Inc. All rights reserved.
@@ -416,4 +417,5 @@
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+
+```
diff --git a/modules/javafx.web/src/main/legal/libxml2.md b/modules/javafx.web/src/main/legal/libxml2.md
--- a/modules/javafx.web/src/main/legal/libxml2.md
+++ b/modules/javafx.web/src/main/legal/libxml2.md
@@ -1,7 +1,14 @@
## xmlsoft.org: libxml2 v2.9.9
### libxml2 License
-
+```
+
+Except where otherwise noted in the source code (e.g. the files hash.c,
+list.c and the trio files, which are covered by a similar licence but
+with different Copyright notices) all the files are:
+
+Copyright (C) 1998-2012 Daniel Veillard. All Rights Reserved.
+
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
@@ -20,4 +27,4 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-
+```
diff --git a/modules/javafx.web/src/main/legal/libxslt.md b/modules/javafx.web/src/main/legal/libxslt.md
--- a/modules/javafx.web/src/main/legal/libxslt.md
+++ b/modules/javafx.web/src/main/legal/libxslt.md
@@ -1,7 +1,8 @@
-## xmlsoft.org: libxslt v1.1.33
+## xmlsoft.org: libxslt v1.1.32
### libxslt License
-
+```
+
Copyright (C) 1998-2012 Daniel Veillard. All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a
@@ -21,4 +22,37 @@
CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+Except as contained in this notice, the name of Daniel Veillard shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from him.
+
+----------------------------------------------------------------------
+
+Licence for libexslt
+----------------------------------------------------------------------
+ Copyright (C) 2001-2002 Thomas Broyer, Charlie Bozeman and Daniel Veillard.
+ All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the authors shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from him.
+----------------------------------------------------------------------
+
+```
diff --git a/modules/javafx.web/src/main/legal/webkit.md b/modules/javafx.web/src/main/legal/webkit.md
--- a/modules/javafx.web/src/main/legal/webkit.md
+++ b/modules/javafx.web/src/main/legal/webkit.md
@@ -1,7 +1,8 @@
## WebKit Open Source Project: WebKit v607.1
### WebKit Notice
-
+```
+
You are receiving a copy of WebKit in either source or
object code in the JavaFX runtime or JavaFX SDK. The terms of the
Oracle license do NOT apply to WebKit; it is
@@ -23,10 +24,11 @@
code is here:
rt/modules/javafx.web/src/main/native/
-
+```
### LGPL 2.1
-
+```
+
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
@@ -530,4 +532,4 @@
That's all there is to it!
-
+```