Merge

2 files changed, 130 insertions, 32 deletions

diff --git a/.hgtags b/.hgtags
index 6dee53c1..db8a175b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -824,9 +824,24 @@ da9dd222e677405802abb329ccf4c37334394d05 jdk8u162-b09
 7b5ea369d72a15f8c2f2b299a0e0c94a9f6299c9 jdk8u162-b11
 b73f27fc902bdd1eb47e57ad1d72e40d37d16db2 jdk8u162-b12
 b2dfabe81b62db3668f75cdce74c749241bd35d2 jdk8u162-b31
+f9bd31b2202d3db0b3fd6f09aa1f32005011d704 jdk8u162-b32
+15b35c21a296d36f9145e2ccf18fecf584c9ee99 jdk8u162-b33
+783ed73023f5168d67624eae02a0caa0441552ad jdk8u162-b34
+7a536f0ffba631f36c43820df8eb201886c4f6b7 jdk8u162-b35
+518c46fee6170452a8e0376e08cc9de4a1db339b jdk8u162-b36
+57fac9abdbddf9fc875f31aefeb2623b443607cd jdk8u162-b37
+cfde39a81b5dbeb17920efce8e96d6968685e72b jdk8u162-b38
 b43391a4015f0c890c90ab33fe03b941876d2ee6 jdk8u171-b00
 25e6ecbfeb092b43c2a04014fe8f1bf03e005c63 jdk8u171-b01
 294248d232cf45819af0d15000b0e172953f3fa9 jdk8u171-b02
+2e4cccb6df4802405c21078b905f9c9db74fea04 jdk8u171-b03
+068b0c57acac24edcf925e3cca73afe671ed7cac jdk8u171-b04
+8479be9da1fa9572a36adcfce19bd36579c9c37c jdk8u171-b05
+16be4c9dff93fdcdb2b705680b641e26320cfd5a jdk8u172-b00
+c4309a2d981b00619635888a63a75b1f32f34555 jdk8u172-b01
+703e4709edae7f83c3794009954f453d6f3706e8 jdk8u172-b02
+b327c90d911f7ad1cfdf32cc18c5f32514b9ce2f jdk8u172-b03
+e9368eb17ab6b839b20f4ff6bd657329aac788b4 jdk8u172-b04
 2e4cccb6df4802405c21078b905f9c9db74fea04 jdk8u181-b00
 2e4cccb6df4802405c21078b905f9c9db74fea04 jdk8u171-b03
 068b0c57acac24edcf925e3cca73afe671ed7cac jdk8u171-b04
@@ -849,9 +864,45 @@ ef209b1aa531edb8eaee608e851b8df844d476fa jdk8u172-b08
 fc695409c23dca5cb6c0ebe22ee48100fe7aa893 jdk8u172-b09
 7287e0008d111fdd1c259432f4883bb859d84221 jdk8u172-b10
 980c4675006fb42ef630d3020f502635bd8811e3 jdk8u172-b11
+112ddcc5f7c071c89bf23d5ab2a678f29e464ca2 jdk8u172-b31
+e716ed4b0efb1792ff1ad0ec8fdfdc30fdec40ef jdk8u172-b32
+f8e3998fe3d6657c7634e59d49f064169fb295c9 jdk8u172-b33
+fb84bb8b59a762e7f48789df98a816ea131c4f54 jdk8u172-b34
+15d23e3bac63e5e5e3afe5bc4e345227e940aa5e jdk8u172-b35
+285e9030fcc7f91a8a38aff1acc548344f75e9bc jdk8u172-b36
+9cdcca47c0b4cf24b1dd8dd82f51a7cf2b445f2c jdk8u172-b37
 878ad885b1cf41de2bdcf143f15edc10c0238920 jdk8u181-b01
 7a978c1e3ac0f8ef05c4b1ca3526db204f978f2e jdk8u181-b02
 291ef420de8c8c5eb6c7004dd99c41d150f59696 jdk8u181-b03
+35053a2559d252b12754fc30694d61cbd688dcdb jdk8u191-b00
+570a943deff0a58a1c78d6ae392b8f7664189639 jdk8u172-b05
+7a536f0ffba631f36c43820df8eb201886c4f6b7 jdk8u162-b35
+518c46fee6170452a8e0376e08cc9de4a1db339b jdk8u162-b36
+57fac9abdbddf9fc875f31aefeb2623b443607cd jdk8u162-b37
+b43391a4015f0c890c90ab33fe03b941876d2ee6 jdk8u171-b00
+25e6ecbfeb092b43c2a04014fe8f1bf03e005c63 jdk8u171-b01
+294248d232cf45819af0d15000b0e172953f3fa9 jdk8u171-b02
+2e4cccb6df4802405c21078b905f9c9db74fea04 jdk8u171-b03
+068b0c57acac24edcf925e3cca73afe671ed7cac jdk8u171-b04
+8479be9da1fa9572a36adcfce19bd36579c9c37c jdk8u171-b05
+bd5a858e029446e777a99835482ccb389c417299 jdk8u171-b06
+9a1b6701c75304bf9522b75ce20449aa5ee9b4b7 jdk8u171-b07
+3a59623f4028e807b45186078aab1e85958c1172 jdk8u171-b08
+615e81982055c9082c795f793ef6fd7fa13b2105 jdk8u171-b09
+6b406f0e2b54cff29ec3da1c4d7b34af1590748f jdk8u171-b10
+45e4320c2c64893fc20a8b46ff80df92021526cf jdk8u171-b11
+16be4c9dff93fdcdb2b705680b641e26320cfd5a jdk8u172-b00
+c4309a2d981b00619635888a63a75b1f32f34555 jdk8u172-b01
+703e4709edae7f83c3794009954f453d6f3706e8 jdk8u172-b02
+b327c90d911f7ad1cfdf32cc18c5f32514b9ce2f jdk8u172-b03
+e9368eb17ab6b839b20f4ff6bd657329aac788b4 jdk8u172-b04
+570a943deff0a58a1c78d6ae392b8f7664189639 jdk8u172-b05
+d214e78a945098244a79a0066b827769ea189e29 jdk8u172-b06
+db5f564ce31b9b9abe5966138c6d45adc608b80e jdk8u172-b07
+ef209b1aa531edb8eaee608e851b8df844d476fa jdk8u172-b08
+fc695409c23dca5cb6c0ebe22ee48100fe7aa893 jdk8u172-b09
+7287e0008d111fdd1c259432f4883bb859d84221 jdk8u172-b10
+980c4675006fb42ef630d3020f502635bd8811e3 jdk8u172-b11
 711ace1c558d14a086481048254bab4821489533 jdk8u181-b04
 09b083e0759c73cd8c3aae6940c9ffb890e66b80 jdk8u181-b05
 49f87757336025a7caa1b9b5100358fe67ef17ab jdk8u181-b06
@@ -862,9 +913,34 @@ cc55da2f27700b75f83b0501660cff4e63ad27d9 jdk8u181-b10
 1ce36a1fca8d437720b014c0123ce87ff89131ab jdk8u181-b11
 0e8e98ee9f488e885295d4a4fa2f38ab2e123c77 jdk8u181-b12
 2a12eb329cb9457033a16fe8ebc14a9c5b16e83d jdk8u181-b13
+bc04ed57bd9748b241599af98c7b9fb878cbcaf9 jdk8u191-b01
+d25514e95cfb9ad9d2afbc17c2eb6f5a4b162cd4 jdk8u191-b02
+09ee8f82ecab760192aa7689ceb2cbce881dbf42 jdk8u191-b03
+e545fe27629455481aa1cfc96694747c18d51f44 jdk8u191-b04
+7aeacf26b3832f7796ea8a16bffbe2ea392e0219 jdk8u191-b05
+56f7f52f57fe4aaabf613f6295c6f1ce4032f9c2 jdk8u191-b06
+0fdc1c2cdad0cdd44427a647b7c4c630107db7ca jdk8u191-b07
+a45582ee03c59bda9b305b24d104052e1ca9f5a9 jdk8u191-b08
+2fbd39f7ce39fe7001474fda85edf490e09a66ec jdk8u191-b09
+9f2a9efa1739dca8e522ba03ad309318b2d66daf jdk8u191-b10
+f1c4301a31a34fbed4c9ce115313340dfdd921be jdk8u191-b25
+0299e5e837b8aa7b5a65b306eaadc7095df38211 jdk8u191-b11
+b32d941559901f8f7e24701fd86885dad09b8492 jdk8u191-b12
+b0d7d6afebacc6ab0a5aa2e5079be6e749c09153 jdk8u191-b26
 8ff1173372e327cc0e82091052d048260f021515 jdk8u182-b00
 4cf1454fc10c841f6e4b4d3b5fa8cd6f6b9510cc jdk8u192-b00
 6ac8c8bf6b7860ec93ccc3080fdd6b80d2f6cccb jdk8u192-b01
 6e80b9808bec68bc5d3b53e16b4033b5fc01f237 jdk8u192-b02
 93a40adb036da5fbb6ef88af3f4a58d33b20883b jdk8u192-b03
 93a40adb036da5fbb6ef88af3f4a58d33b20883b jdk8u202-b00
+174559c44f89897e9bb1461e443e0a4650633195 jdk8u192-b04
+806cb57c2b08a693b3b5a546c1a7c0487b46679a jdk8u192-b05
+641489dd36c039a48e7979ec5d19470fe3481632 jdk8u192-b06
+c735d9e2d6046786f58d7ac3db5766865c1fe6c8 jdk8u192-b07
+2d48e86e236a9ac01906c4790c155de38a24a673 jdk8u192-b08
+b54d13ae94929dbd512063270f9f32c0dc8abebb jdk8u192-b09
+c1d86695c8dcf790eb4bcb8cdb1990203eba725c jdk8u192-b10
+fc43bdbb9cae112367b564042bc1927763f6d45d jdk8u192-b25
+4134dd880b2d2975e42b5491a59c70e92e30d739 jdk8u192-b11
+4b335cfde8d80a6b6d855cb34b88bd1951528d54 jdk8u192-b12
+b08cb2197601730fd15145f8a15949239d5113e6 jdk8u192-b26
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
index dbed92cd..a1662fe0 100644
--- a/THIRD_PARTY_README
+++ b/THIRD_PARTY_README
@@ -1497,7 +1497,7 @@ included with JDK 8 and OpenJDK 8 source distributions.
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to libpng 1.6.16, which may be 
+%% This notice is provided with respect to libpng 1.6.35, which may be
 included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
@@ -1513,21 +1513,21 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
-Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-1.2.5
-with the following individual added to the list of Contributing Authors
-
-   Cosmin Truta
-
-libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
-Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-1.0.6
-with the following individuals added to the list of Contributing Authors
+libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
+Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
+derived from libpng-1.0.6, and are distributed according to the same
+disclaimer and license as libpng-1.0.6 with the following individuals
+added to the list of Contributing Authors:
 
    Simon-Pierre Cadieux
    Eric S. Raymond
+   Mans Rullgard
+   Cosmin Truta
    Gilles Vollant
+   James Yu
+   Mandar Sahastrabuddhe
+   Google Inc.
+   Vadim Barkov
 
 and with the following additions to the disclaimer:
 
@@ -1538,19 +1538,25 @@ and with the following additions to the disclaimer:
    risk of satisfactory quality, performance, accuracy, and effort is with
    the user.
 
+Some files in the "contrib" directory and some configure-generated
+files that are distributed with libpng have other copyright owners and
+are released under other open source licenses.
+
 libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
-Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-0.96,
-with the following individuals added to the list of Contributing Authors:
+Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
+libpng-0.96, and are distributed according to the same disclaimer and
+license as libpng-0.96, with the following individuals added to the list
+of Contributing Authors:
 
    Tom Lane
    Glenn Randers-Pehrson
    Willem van Schaik
 
 libpng versions 0.89, June 1996, through 0.96, May 1997, are
-Copyright (c) 1996, 1997 Andreas Dilger
-Distributed according to the same disclaimer and license as libpng-0.88,
-with the following individuals added to the list of Contributing Authors:
+Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
+and are distributed according to the same disclaimer and license as
+libpng-0.88, with the following individuals added to the list of
+Contributing Authors:
 
    John Bowler
    Kevin Bracey
@@ -1559,8 +1565,11 @@ with the following individuals added to the list of Contributing Authors:
    Greg Roelofs
    Tom Tanner
 
+Some files in the "scripts" directory have other copyright owners
+but are released under this license.
+
 libpng versions 0.5, May 1995, through 0.88, January 1996, are
-Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
 
 For the purposes of this copyright and license, "Contributing Authors"
 is defined as the following set of individuals:
@@ -1583,13 +1592,13 @@ Permission is hereby granted to use, copy, modify, and distribute this
 source code, or portions hereof, for any purpose, without fee, subject
 to the following restrictions:
 
-1. The origin of this source code must not be misrepresented.
+  1. The origin of this source code must not be misrepresented.
 
-2. Altered versions must be plainly marked as such and must not
-   be misrepresented as being the original source.
+  2. Altered versions must be plainly marked as such and must not
+     be misrepresented as being the original source.
 
-3. This Copyright notice may not be removed or altered from any
-   source or altered source distribution.
+  3. This Copyright notice may not be removed or altered from any
+     source or altered source distribution.
 
 The Contributing Authors and Group 42, Inc. specifically permit, without
 fee, and encourage the use of this source code as a component to
@@ -1597,21 +1606,34 @@ supporting the PNG file format in commercial products.  If you use this
 source code in a product, acknowledgment is not required but would be
 appreciated.
 
+END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
+
+TRADEMARK:
+
+The name "libpng" has not been registered by the Copyright owner
+as a trademark in any jurisdiction.  However, because libpng has
+been distributed and maintained world-wide, continually since 1995,
+the Copyright owner claims "common-law trademark protection" in any
+jurisdiction where common-law trademark is recognized.
 
-A "png_get_copyright" function is available, for convenient use in "about"
-boxes and the like:
+OSI CERTIFICATION:
 
-   printf("%s",png_get_copyright(NULL));
+Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is
+a certification mark of the Open Source Initiative. OSI has not addressed
+the additional disclaimers inserted at version 1.0.7.
 
-Also, the PNG logo (in PNG format, of course) is supplied in the
-files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
+EXPORT CONTROL:
 
-Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
-certification mark of the Open Source Initiative.
+The Copyright owner believes that the Export Control Classification
+Number (ECCN) for libpng is EAR99, which means not subject to export
+controls or International Traffic in Arms Regulations (ITAR) because
+it is open source, publicly available software, that does not contain
+any encryption software.  See the EAR, paragraphs 734.3(b)(3) and
+734.7(b).
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-December 22, 2014
+July 15, 2018
 
 --- end of LICENSE ---