Merge mips64el-jdk8u222-b11

Thu, 05 Sep 2019 18:59:46 +0800

author
aoqi
date
Thu, 05 Sep 2019 18:59:46 +0800
changeset 2493
2093c4a7abf0
parent 2471
0f5cf4e26a8d
parent 2492
0a5ba9e191cf
child 2494
080ab2bb1806

Merge

.hgtags file | annotate | diff | comparison | revisions
THIRD_PARTY_README file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Thu Sep 05 18:40:52 2019 +0800
     1.2 +++ b/.hgtags	Thu Sep 05 18:59:46 2019 +0800
     1.3 @@ -1039,7 +1039,20 @@
     1.4  513bdfdab61ccae75ceb3df1d5e656d32e65e1dc jdk8u202-b26
     1.5  7aeae6eb62362bd676ed9f809d8fa1c12295a843 jdk8u202-ga
     1.6  8949d12e49e32711a0fb4079e2da7eb4f9ee426b jdk8u212-b00
     1.7 +203712f71207bc1ed45ef9c3f4c11d367699e2d0 jdk8u222-b00
     1.8  203712f71207bc1ed45ef9c3f4c11d367699e2d0 jdk8u212-b01
     1.9  8fa8a4821ec34b99c3dcfd5f6a67fba0813e7bbe jdk8u212-b02
    1.10 +f470f90fa4f757ea435ad48def6146f6a35bdee3 jdk8u212-b03
    1.11 +32c18a79003ad846811955f7348ea73061e91c40 jdk8u212-b04
    1.12 +f470f90fa4f757ea435ad48def6146f6a35bdee3 jdk8u212-ga
    1.13  4e89f96a09f7212479315b1af7d4f74d1c0e718b mips64el-jdk8u212-b04
    1.14  26f7b66f02f1a26bf53ba94d465c700444cfcba4 mips64el-jdk8u212-b05
    1.15 +60065d9e17b0851add37f73c75189e98cdf22b35 jdk8u222-b01
    1.16 +4e370d5e4c5661d0ce075154afe52ae3514eb0ef jdk8u222-b02
    1.17 +e4becf2f38cea0539e7f12ba27e596e1d48e34b0 jdk8u222-b03
    1.18 +990b6af1a5e7ab526804061a2c6b47d24c799b57 jdk8u222-b04
    1.19 +22144dab9c5d489af564e1d3ffbadc293c8dc445 jdk8u222-b05
    1.20 +8c7734737f76cbb888ddd78689cbe446b976a6b4 jdk8u222-b06
    1.21 +2ce015266d7555da1b4dea46df7044d1c942180c jdk8u222-b07
    1.22 +e18754960730dea198e73d07a17c79bc1c30e51f jdk8u222-b08
    1.23 +6e564bba54d07236fbe0b3e756aca5c7df38a952 jdk8u222-b09
     2.1 --- a/THIRD_PARTY_README	Thu Sep 05 18:40:52 2019 +0800
     2.2 +++ b/THIRD_PARTY_README	Thu Sep 05 18:59:46 2019 +0800
     2.3 @@ -1612,7 +1612,7 @@
     2.4  
     2.5  -------------------------------------------------------------------------------
     2.6  
     2.7 -%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3, 
     2.8 +%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3, 
     2.9  which may be included with JRE 8, JDK 8, and OpenJDK 8.
    2.10  
    2.11  --- begin of LICENSE ---
    2.12 @@ -1682,7 +1682,7 @@
    2.13  --- begin of LICENSE ---
    2.14  
    2.15   Mesa 3-D graphics library
    2.16 - Version:  4.1
    2.17 + Version:  5.0
    2.18  
    2.19   Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
    2.20  
    2.21 @@ -2797,61 +2797,8 @@
    2.22  not be used in advertising or otherwise to promote the sale, use or
    2.23  other dealings in this Software without prior written authorization
    2.24  from the X Consortium.
    2.25 -___________________________
    2.26 -The files in motif/lib/Xm/util included this copyright:mkdirhier.man,
    2.27 -xmkmf.man, chownxterm.c, makeg.man, mergelib.cpp, lndir.man, makestrs.man, 
    2.28 -checktree.c, lndir.c, makestrs.c
    2.29 -Copyright (c) 1993, 1994 X Consortium
    2.30 -
    2.31 -Permission is hereby granted, free of charge, to any person obtaining a
    2.32 -copy of this software and associated documentation files (the "Software"),
    2.33 -to deal in the Software without restriction, including without limitation
    2.34 -the rights to use, copy, modify, merge, publish, distribute, sublicense,
    2.35 -and/or sell copies of the Software, and to permit persons to whom the
    2.36 -Software furnished to do so, subject to the following conditions:
    2.37 -
    2.38 -The above copyright notice and this permission notice shall be included in
    2.39 -all copies or substantial portions of the Software.
    2.40 -
    2.41 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    2.42 -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    2.43 -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
    2.44 -THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
    2.45 -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
    2.46 -OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    2.47 -SOFTWARE.
    2.48 -
    2.49 -Except as contained in this notice, the name of the X Consortium shall not
    2.50 -be used in advertising or otherwise to promote the sale, use or other
    2.51 -dealing in this Software without prior written authorization from the
    2.52 -X Consortium.
    2.53 -_____________________________
    2.54 -Xmos_r.h:
    2.55 -/*
    2.56 -Copyright (c) 1996 X Consortium
    2.57 -
    2.58 -Permission is hereby granted, free of charge, to any person obtaining a copy
    2.59 -of this software and associated documentation files (the "Software"), to deal
    2.60 -in the Software without restriction, including without limitation the rights
    2.61 -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    2.62 -copies of the Software, and to permit persons to whom the Software is
    2.63 -furnished to do so, subject to the following conditions:
    2.64 -
    2.65 -The above copyright notice and this permission notice shall be included in
    2.66 -all copies or substantial portions of the Software.
    2.67 -
    2.68 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    2.69 -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    2.70 -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    2.71 -X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
    2.72 -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
    2.73 -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    2.74 -
    2.75 -Except as contained in this notice, the name of the X Consortium shall not be
    2.76 -used in advertising or otherwise to promote the sale, use or other dealings
    2.77 -in this Software without prior written authorization from the X Consortium.
    2.78 -*/
    2.79 -
    2.80 +
    2.81 +--- end of LICENSE ---
    2.82  _____________________________
    2.83  Copyright notice for HPkeysym.h:
    2.84  /*
    2.85 @@ -2906,55 +2853,6 @@
    2.86  performance, or use of this material.
    2.87  
    2.88  */
    2.89 -_____________________________________
    2.90 -Copyright notice in keysym2ucs.h:
    2.91 -
    2.92 -Copyright 1987, 1994, 1998 The Open Group
    2.93 -
    2.94 -Permission to use, copy, modify, distribute, and sell this software and its
    2.95 -documentation for any purpose is hereby granted without fee, provided that
    2.96 -the above copyright notice appear in all copies and that both that
    2.97 -copyright notice and this permission notice appear in supporting
    2.98 -documentation.
    2.99 -
   2.100 -The above copyright notice and this permission notice shall be included
   2.101 -in all copies or substantial portions of the Software.
   2.102 -
   2.103 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   2.104 -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   2.105 -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   2.106 -IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
   2.107 -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
   2.108 -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
   2.109 -OTHER DEALINGS IN THE SOFTWARE.
   2.110 -
   2.111 -Except as contained in this notice, the name of The Open Group shall
   2.112 -not be used in advertising or otherwise to promote the sale, use or
   2.113 -other dealings in this Software without prior written authorization
   2.114 -from The Open Group.
   2.115 -
   2.116 -
   2.117 -Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts
   2.118 -
   2.119 -All Rights Reserved
   2.120 -
   2.121 -Permission to use, copy, modify, and distribute this software and its
   2.122 -documentation for any purpose and without fee is hereby granted,
   2.123 -provided that the above copyright notice appear in all copies and that
   2.124 -both that copyright notice and this permission notice appear in
   2.125 -supporting documentation, and that the name of Digital not be
   2.126 -used in advertising or publicity pertaining to distribution of the
   2.127 -software without specific, written prior permission.
   2.128 -
   2.129 -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
   2.130 -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
   2.131 -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
   2.132 -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
   2.133 -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
   2.134 -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
   2.135 -SOFTWARE.
   2.136 -
   2.137 -*/
   2.138  
   2.139  --- end of LICENSE ---
   2.140  
   2.141 @@ -3000,7 +2898,7 @@
   2.142    Apache Jakarta BCEL 5.1 
   2.143    Apache Jakarta Regexp 1.4 
   2.144    Apache Santuario XML Security for Java 1.5.4
   2.145 -  Apache Xalan-Java 2.7.1 
   2.146 +  Apache Xalan-Java 2.7.2
   2.147    Apache Xerces Java 2.10.0 
   2.148    Apache XML Resolver 1.1 
   2.149  

mercurial