Merge
diff --git a/.hgtags b/.hgtags
index 974c4b2..2bdb9e7 100644
--- a/.hgtags
+++ b/.hgtags
@@ -850,6 +850,30 @@
5a5ebaf38e63c4afa1554fdbadc6192bc01dfeb9 jdk8u162-b11
fa7504e2b2410e4a0a1fe3dc93fb4fcb6bd1533d jdk8u162-b12
ecdf7d13fd8ba2b366e3a72cbb9bceba484489e7 jdk8u162-b31
+71194348ef551f9f646e4ab1658d38477c041143 jdk8u162-b32
+7d5f26e2dbe45acf22730ae0128afb149c18ee08 jdk8u162-b33
+133bf94b8bc90c8d4ddf9b7364362ab42d4a3800 jdk8u162-b34
+099bc2c3852c5ab7c5ad9502360eb83b8329bd28 jdk8u162-b35
+093c1f6ae899b8cf6608e80162323c41c167c7d7 jdk8u162-b36
+fbc5640f9de7f243407ea92bec9f2b70eae960f2 jdk8u162-b37
+bcec94dc82ad46f6a716b60b2b5bdfb7b1410e84 jdk8u162-b38
+7984f6d87395d9ed0397137be97670c1f12543b0 jdk8u171-b00
+3a4b6f741a1b1ed06a56262ae69e36d4f4d4637c jdk8u171-b01
+0eb59cc7716f47525b80b9764c86188063e7cfff jdk8u171-b02
+1e523ce5792f08f3dc015084e3f018d6ee0c5859 jdk8u171-b03
+a19f8b3a9242df77ed3df29ceefc30d0b0d2766c jdk8u171-b04
+5279c6da822efa9073793968777a2b3a65376e8e jdk8u171-b05
+dcef061c36284bbf5a9f7093dcbc134b9f62e9f5 jdk8u172-b00
+a8bd8d03df39500a37fd8066104bfd02daae9d5c jdk8u172-b01
+78e071b5c0675416e499e26d82903f436de83156 jdk8u172-b02
+f6f4bebcbf4b7df5eca6e253b596851cca18b5c4 jdk8u172-b03
+d7f51a2cb3fac2d3a7a3ebcd55adaf7b251a3973 jdk8u172-b04
+1e523ce5792f08f3dc015084e3f018d6ee0c5859 jdk8u181-b00
+a56ca62af8987f5a532e0290a99e3da47458957c jdk8u191-b00
+264518389b7f9b5969aa6914f83cc70f527ec4c9 jdk8u172-b05
+099bc2c3852c5ab7c5ad9502360eb83b8329bd28 jdk8u162-b35
+093c1f6ae899b8cf6608e80162323c41c167c7d7 jdk8u162-b36
+fbc5640f9de7f243407ea92bec9f2b70eae960f2 jdk8u162-b37
7984f6d87395d9ed0397137be97670c1f12543b0 jdk8u171-b00
3a4b6f741a1b1ed06a56262ae69e36d4f4d4637c jdk8u171-b01
0eb59cc7716f47525b80b9764c86188063e7cfff jdk8u171-b02
@@ -875,6 +899,13 @@
81808062121ea018f93fe834a77069a1f1a41205 jdk8u172-b09
ed6b3d50e81221b439f942d56002b760e6b242b8 jdk8u172-b10
257c09605def81666af2e696212dd27458fb59d4 jdk8u172-b11
+da88c57953bc3a6adb2bcaec204fdc613e41431f jdk8u172-b31
+0e7fe394fa9ed92862348fa37499ff4ed865a07d jdk8u172-b32
+d96e2b804bcd8e69f4b667cc0766c3619f032242 jdk8u172-b33
+100de781988dc7b1e234a8ee9076b25442c9a5ac jdk8u172-b34
+d6075b4648f25d8a47e25dc5c838fb550c67a30f jdk8u172-b35
+70138507060656f166d613e3d717206cbb22720c jdk8u172-b36
+8182425105506f8ce15a7ec1c6e87bd5c10aa9f2 jdk8u172-b37
9fd0ff00a2457dd46aeecfed5c9381ce3a35750b jdk8u181-b01
42930d218e2a32e0d1ed6a3adba7ff5fc0032517 jdk8u181-b02
39229ae0bafff1999db8cf127db6183922a2f545 jdk8u181-b03
@@ -888,9 +919,34 @@
f32e6dfd8c7bfdc6f44cb0cff9702d50e96debe7 jdk8u181-b11
d347fe847fc2a5d59b753631404839f8b6fb2f29 jdk8u181-b12
79cd9a0e041e64443d9d0bf29baf46c7459b3e91 jdk8u181-b13
+102e8b07bdda4263087593b0a52a90a7a64b4956 jdk8u191-b01
+ecdbe3bf911c3f1f4eceb895f0f7513a8d3964e0 jdk8u191-b02
+a7ad7ceac906d5f609ddcecbd20fe82b6edf9491 jdk8u191-b03
+12a53eff34938f836f2c09b1c288da6ce783f795 jdk8u191-b04
+32aa1c40e8fb784c2ac021db6f70eb6b20bffc88 jdk8u191-b05
+9c6c6e24e8f68be0b6bd238a05e147f65ad873ab jdk8u191-b06
+66f5468a9c1316df2b097c2ff103c6e869f70fe1 jdk8u191-b07
+556336c606f5c658d5ec1251783a31de62c83e4b jdk8u191-b08
+92543f5f314603d6b0d8f751a8b06c1035466aeb jdk8u191-b09
+a41e15076d5f67d99aaa37991decb9b38e658c89 jdk8u191-b10
+798d69bfddf8e5608697d45aa114a4ab54efe8ad jdk8u191-b25
+fd65844e4d543242337923f528fe9f7f52171f74 jdk8u191-b11
+6da26fc7da9a1e687eb0fcc5f4b223fffc1b352b jdk8u191-b12
+a873d847260cd1859d8c66ddb73ed45eb9581ae1 jdk8u191-b26
5d207173975cd987c4ae4095b32d2634ed6bc885 jdk8u182-b00
647b038457fedd3585a57b834f28a3cf8594991d jdk8u192-b00
36c7f3e58a3e86b190bf2496680d8d6f02210b52 jdk8u192-b01
72f340b55d0d1644a0ac38dec67c022d3b267229 jdk8u192-b02
b24c6e9c70ef4baed503f2b0810f24ebf3c22272 jdk8u192-b03
b24c6e9c70ef4baed503f2b0810f24ebf3c22272 jdk8u202-b00
+fefb283a1b806ff994f056189aa979a3e821360a jdk8u192-b04
+e0a490830e538bcbc2195978a37cbe29f222dee2 jdk8u192-b05
+e10b4a75899385daf0b2a2391c61ecaf12dbe91e jdk8u192-b06
+caaaa4cd887e6309787f58dec132dfda48f6ff9d jdk8u192-b07
+43a0b8cdaad50270174ecdee108302b587ddbc94 jdk8u192-b08
+f65aaf9bd53f10402d445cb63b20846c0768ae2a jdk8u192-b09
+fef9633ef67ec6b39ea4f749182dfe7eb6daf455 jdk8u192-b10
+c3b62807c5a1bfa28dcdc2c60242cb29bb2f0ffb jdk8u192-b25
+9d7a44710de5d6b42773b956407e4549a381d907 jdk8u192-b11
+6465f54b4b63be0234480d2f9aad1dca893d2f9e jdk8u192-b12
+fce0c0377cbd8471283bb6ba5900120f1505c7cc jdk8u192-b26
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
index dbed92c..a1662fe 100644
--- a/THIRD_PARTY_README
+++ b/THIRD_PARTY_README
@@ -1497,7 +1497,7 @@
-------------------------------------------------------------------------------
-%% 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 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 @@
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 @@
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 @@
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 @@
source code in a product, acknowledgment is not required but would be
appreciated.
+END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
-A "png_get_copyright" function is available, for convenient use in "about"
-boxes and the like:
+TRADEMARK:
- printf("%s",png_get_copyright(NULL));
+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.
-Also, the PNG logo (in PNG format, of course) is supplied in the
-files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
+OSI CERTIFICATION:
-Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a
-certification mark of the Open Source Initiative.
+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.
+
+EXPORT CONTROL:
+
+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 ---
diff --git a/src/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java b/src/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java
index 84543ec..025aa1d 100644
--- a/src/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java
+++ b/src/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -189,6 +189,7 @@
* @version $Revision: 1.14 $, $Date: 2010-11-10 07:41:41 $
* @see javax.xml.datatype.Duration
* @since 1.5
+ * @LastModified: June 2018
*/
public class XMLGregorianCalendarImpl
@@ -2730,7 +2731,7 @@
if ((fractional.compareTo(DECIMAL_ZERO) < 0) ||
(fractional.compareTo(DECIMAL_ONE) > 0)) {
throw new IllegalArgumentException(DatatypeMessageFormatter.formatMessage(null,
- "InvalidFractional", new Object[]{fractional}));
+ "InvalidFractional", new Object[]{fractional.toString()}));
}
}
this.fractionalSecond = fractional;
