diff options
author | Alexey Ushakov <alexey.v.ushakov@gmail.com> | 2019-08-15 16:33:57 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-15 16:33:57 +0300 |
commit | e3f47d6da48e9874e3c37aded45af9420a606681 (patch) | |
tree | 24fe177c3e43c00926c0ec23eac4cc6b47cb98dd | |
parent | 5190cfb569e64864978012a086ec4818d4eb4da3 (diff) | |
parent | aedf8ebe390f7c449ee2bbba3a228d5886d4ee6d (diff) | |
download | jdk8u_nashorn-e3f47d6da48e9874e3c37aded45af9420a606681.tar.gz |
Merge pull request #3 from bell-sw/update_8u222jb8u222-b1626.3jb8u222-b1626jb8u222-b1624jb8u222-b1621.1jb8u222-b1618jb8u222-b1613.2jb8u212-b1613
Update 8u222
-rw-r--r-- | .hgtags | 11 | ||||
-rw-r--r-- | THIRD_PARTY_README | 110 |
2 files changed, 15 insertions, 106 deletions
@@ -1037,3 +1037,14 @@ b16b59c5f123fa516e71d5636e582ae6a935e974 jdk8u202-b06 f470f90fa4f757ea435ad48def6146f6a35bdee3 jdk8u212-b03 32c18a79003ad846811955f7348ea73061e91c40 jdk8u212-b04 f470f90fa4f757ea435ad48def6146f6a35bdee3 jdk8u212-ga +60065d9e17b0851add37f73c75189e98cdf22b35 jdk8u222-b01 +4e370d5e4c5661d0ce075154afe52ae3514eb0ef jdk8u222-b02 +e4becf2f38cea0539e7f12ba27e596e1d48e34b0 jdk8u222-b03 +990b6af1a5e7ab526804061a2c6b47d24c799b57 jdk8u222-b04 +22144dab9c5d489af564e1d3ffbadc293c8dc445 jdk8u222-b05 +8c7734737f76cbb888ddd78689cbe446b976a6b4 jdk8u222-b06 +2ce015266d7555da1b4dea46df7044d1c942180c jdk8u222-b07 +e18754960730dea198e73d07a17c79bc1c30e51f jdk8u222-b08 +6e564bba54d07236fbe0b3e756aca5c7df38a952 jdk8u222-b09 +0a5ba9e191cf8978fd3c66a53ea41b2bbdeec10b jdk8u222-b10 +0a5ba9e191cf8978fd3c66a53ea41b2bbdeec10b jdk8u222-ga diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README index 22473560..814e5f23 100644 --- a/THIRD_PARTY_README +++ b/THIRD_PARTY_README @@ -1612,7 +1612,7 @@ July 15, 2018 ------------------------------------------------------------------------------- -%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3, +%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- @@ -1682,7 +1682,7 @@ which may be included with JRE 8, JDK 8, and OpenJDK 8 source distributions. --- begin of LICENSE --- Mesa 3-D graphics library - Version: 4.1 + Version: 5.0 Copyright (C) 1999-2002 Brian Paul All Rights Reserved. @@ -2797,61 +2797,8 @@ Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. -___________________________ -The files in motif/lib/Xm/util included this copyright:mkdirhier.man, -xmkmf.man, chownxterm.c, makeg.man, mergelib.cpp, lndir.man, makestrs.man, -checktree.c, lndir.c, makestrs.c -Copyright (c) 1993, 1994 X Consortium - -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 furnished 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, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN 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. - -Except as contained in this notice, the name of the X Consortium shall not -be used in advertising or otherwise to promote the sale, use or other -dealing in this Software without prior written authorization from the -X Consortium. -_____________________________ -Xmos_r.h: -/* -Copyright (c) 1996 X Consortium - -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 -furnished 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, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -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. - -Except as contained in this notice, the name of the X Consortium shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from the X Consortium. -*/ +--- end of LICENSE --- _____________________________ Copyright notice for HPkeysym.h: /* @@ -2906,55 +2853,6 @@ consequential damages in connection with the furnishing, performance, or use of this material. */ -_____________________________________ -Copyright notice in keysym2ucs.h: - -Copyright 1987, 1994, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -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, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN 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. - -Except as contained in this notice, the name of The Open Group shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization -from The Open Group. - - -Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts - -All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Digital not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -*/ --- end of LICENSE --- @@ -3000,7 +2898,7 @@ included with JRE 8, JDK 8, and OpenJDK 8. Apache Jakarta BCEL 5.1 Apache Jakarta Regexp 1.4 Apache Santuario XML Security for Java 1.5.4 - Apache Xalan-Java 2.7.1 + Apache Xalan-Java 2.7.2 Apache Xerces Java 2.10.0 Apache XML Resolver 1.1 |