aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Dahlstrom <dahlstrom@google.com>2019-07-25 22:00:00 -0700
committerDana Dahlstrom <dahlstrom@google.com>2019-07-25 22:00:00 -0700
commit93d146c43904aab68befc1f758147525e6ef566d (patch)
treeaddc731f2aab38e1bef8cf45db4d463d3cabe841
parent352af6792d991f0c1db783cd204caf5946d59124 (diff)
parent1f43ec13b78b1f994df9fbc2955925121934e155 (diff)
downloadjdk8u_jaxws-93d146c43904aab68befc1f758147525e6ef566d.tar.gz
Merge tag jb8u212-b1586.4
Change-Id: I1f43ec13b78b1f994df9fbc2955925121934e155
-rw-r--r--.hgtags51
-rw-r--r--THIRD_PARTY_README31
2 files changed, 53 insertions, 29 deletions
diff --git a/.hgtags b/.hgtags
index feb19af2..1f2f1647 100644
--- a/.hgtags
+++ b/.hgtags
@@ -945,3 +945,54 @@ fc43bdbb9cae112367b564042bc1927763f6d45d jdk8u192-b25
4b335cfde8d80a6b6d855cb34b88bd1951528d54 jdk8u192-b12
b08cb2197601730fd15145f8a15949239d5113e6 jdk8u192-b26
761258c45a3a7b0ab2a3b9e9ab23e6783ae48b61 jdk8u202-b01
+691079f04a6f4c16ef5a017e86c58dd3b37f0b1a jdk8u202-b02
+2b50ba9b5d20cb0fdc70d98a41d7d3d439ca0cea jdk8u202-b03
+a24e8384bfc34d7df62b6707b5e8b4d403b6a3b6 jdk8u202-b04
+5c07b99ec182521b715bcaa71270c75ff0c5d232 jdk8u202-b05
+5d5ab74320dbc93ad8b4a0e91c5f3b9c663d84b8 jdk8u202-b06
+7458800f0a265f1b8d939e982ffbed62f8262d22 jdk8u202-b07
+99fbc435f2faedf1dd68e80d679ebf4abd8c98c9 jdk8u202-b08
+a51e13337c7b4575acf7930ebf80ccbfc405fa17 jdk8u202-b25
+81d8126f05e5290e3974d4f3ea7360481676a78c jdk8u202-b26
+99fbc435f2faedf1dd68e80d679ebf4abd8c98c9 jdk8u202-ga
+5e461ff70eb58fad69ba1b8e8679844ea73e75de jdk8u181-b31
+0863510c03b3cb58e828cfb65440c5abb1977135 jdk8u181-b32
+334e595ce7f864e74ee64e45fb691e49307c5e9a jdk8u181-b33
+fae6db55e87d68f9bd8a032a264790e0346a731a jdk8u181-b34
+b902d38c0248dc41d36d9ab3aca7c8467d7be1f1 jdk8u181-b35
+cca9c1360a2b21d5bfef529b8a3ee39ed28f385a jdk8u181-b36
+33917cdb4dda8981c82963dbffe0544ae8ad488f jdk8u181-b37
+1ec054bb0782f7ca23830e32c9ed1a7d3ebec018 jdk8u201-b01
+aef7385318ae1a1f4c57b017e2aa1a676543a1b5 jdk8u201-b02
+db3500b8fe16bdfd13f5dd0ced863fb93bede820 jdk8u201-b03
+830a687a30bf89259113c00ae8e4d8233e71fba4 jdk8u201-b04
+a65d21aa3c55a805e99bbbc783d7e94bf5893c1b jdk8u201-b74
+d1b19f1d67134ec1aa84b8960808069cfbb70cd1 jdk8u201-b05
+c8f4a6774b2b13061ece887281940b3da4ee3272 jdk8u201-b75
+bf2d0accffad4a9cbdad680fdee9d4f363772ddb jdk8u201-b06
+bb7ce3a38afba40711f4adaf11227f2ea0fcd223 jdk8u201-b76
+50f48f1d242d36f9f0bf2da0a075037467488207 jdk8u201-b07
+8396aa331353d281ebd65054159268456a482718 jdk8u201-b77
+8485292c47007c567bdc055d66b8b22486c7014f jdk8u201-b08
+05542ff5d183b9dba079abd407acddf7d42069a0 jdk8u201-b09
+ec98fab8b31a36cee3c0c547589b3f58d113d1da jdk8u201-b79
+636a528d16b81cff34a5fdfdf812cc1f0bc73585 jdk8u201-b25
+0e9ea4e611870472ba1b4bbd565b723c331572e3 jdk8u201-b26
+05542ff5d183b9dba079abd407acddf7d42069a0 jdk8u201-ga
+761258c45a3a7b0ab2a3b9e9ab23e6783ae48b61 jdk8u202-b01
+691079f04a6f4c16ef5a017e86c58dd3b37f0b1a jdk8u202-b02
+2b50ba9b5d20cb0fdc70d98a41d7d3d439ca0cea jdk8u202-b03
+a24e8384bfc34d7df62b6707b5e8b4d403b6a3b6 jdk8u202-b04
+5c07b99ec182521b715bcaa71270c75ff0c5d232 jdk8u202-b05
+5d5ab74320dbc93ad8b4a0e91c5f3b9c663d84b8 jdk8u202-b06
+7458800f0a265f1b8d939e982ffbed62f8262d22 jdk8u202-b07
+99fbc435f2faedf1dd68e80d679ebf4abd8c98c9 jdk8u202-b08
+a51e13337c7b4575acf7930ebf80ccbfc405fa17 jdk8u202-b25
+81d8126f05e5290e3974d4f3ea7360481676a78c jdk8u202-b26
+99fbc435f2faedf1dd68e80d679ebf4abd8c98c9 jdk8u202-ga
+d5402443e9392243c6de6b6d7d7453364d7f9dc1 jdk8u212-b00
+5f9530ebac26be622a64638b669ba13030a6a2b2 jdk8u212-b01
+b6ace99fbdc10bac6c84b0dbce5bfee6d13e2888 jdk8u212-b02
+edd8659683b4aeca051e32f9a9da2c6c1f4c1313 jdk8u212-b03
+f8ab1759ad91015f7caf41d7b515423fb8600c0f jdk8u212-b04
+edd8659683b4aeca051e32f9a9da2c6c1f4c1313 jdk8u212-ga
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
index a1662fe0..22473560 100644
--- a/THIRD_PARTY_README
+++ b/THIRD_PARTY_README
@@ -1096,33 +1096,6 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
OF SUCH DAMAGE.
--- end of LICENSE ---
-%% This notice is provided with respect to FontConfig 2.5, which may be
-included with JRE 8, JDK 8, and OpenJDK 8 source distributions on
-Linux and Solaris.
-
---- begin of LICENSE ---
-
-Copyright ?? 2001,2003 Keith Packard
-
-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, and that
-the name of Keith Packard not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior permission.
-Keith Packard makes no representations about the suitability of this software
-for any purpose. It is provided "as is" without express or implied warranty.
-
-KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL KEITH
-PACKARD 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 ---
-
-------------------------------------------------------------------------------
%% This notice is provided with respect to freebXML Registry 3.0 & 3.1,
@@ -1668,13 +1641,13 @@ THE SOFTWARE.
-------------------------------------------------------------------------------
-%% This notice is provided with respect to Little CMS 2.7, which may be
+%% This notice is provided with respect to Little CMS 2.9, which may be
included with JRE 8, JDK 8, and OpenJDK 8.
--- begin of LICENSE ---
Little CMS
-Copyright (c) 1998-2015 Marti Maria Saguer
+Copyright (c) 1998-2011 Marti Maria Saguer
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal