Fri, 01 Aug 2014 11:04:21 +0100
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Tue Jul 22 10:37:51 2014 -0700 1.2 +++ b/.hgtags Fri Aug 01 11:04:21 2014 +0100 1.3 @@ -311,6 +311,9 @@ 1.4 0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u20-b21 1.5 6c1fb59fa5d7095d93a023553a949f873f324c6b jdk8u20-b22 1.6 b14daf2459c5430dfe5d435483d6f424cff09584 jdk8u20-b23 1.7 +1710841b0229403f4af85eac8b68ea5065a26c81 jdk8u20-b24 1.8 +1710841b0229403f4af85eac8b68ea5065a26c81 jdk8u20-b25 1.9 +d1a7ea2c3e1091e0df1285963328a96f475f240d jdk8u20-b26 1.10 97c6d6a8e5bb3dfc24b9a32711aa0906ea110e23 jdk8u25-b00 1.11 c4cfb4376f5916c5d7eb1f39a0e23402de0d9818 jdk8u25-b01 1.12 b4d29a751077e5500e766b8104dd1cb7148a550f jdk8u25-b02 1.13 @@ -320,4 +323,6 @@ 1.14 69d17ee59c0e77033aca293501a642d0abc20c85 jdk8u25-b06 1.15 561d066eaa6428088b4f7e273a8caed90e8f6073 jdk8u25-b07 1.16 c2a5ad21d01c5d921c4e928edcb14cc3d61eb62b jdk8u25-b08 1.17 +1249614d7f1d9bf8443f0abd0622b4d2a3ab0638 jdk8u25-b09 1.18 +0c5d41165be3f4bb989bd84283c2df3e37b9845d jdk8u25-b10 1.19 6db0898d3f90ad9eae2f017299314b88766446e3 jdk8u31-b00
2.1 --- a/THIRD_PARTY_README Tue Jul 22 10:37:51 2014 -0700 2.2 +++ b/THIRD_PARTY_README Fri Aug 01 11:04:21 2014 +0100 2.3 @@ -2,7 +2,7 @@ 2.4 ----------------------------- 2.5 2.6 %% This notice is provided with respect to ASM Bytecode Manipulation 2.7 -Framework v5.0, which may be included with JRE 8, and JDK 8, and 2.8 +Framework v5.0.3, which may be included with JRE 8, and JDK 8, and 2.9 OpenJDK 8. 2.10 2.11 --- begin of LICENSE --- 2.12 @@ -1471,7 +1471,7 @@ 2.13 version 2.0. 2.14 2.15 The NSS libraries are supplied in executable form, built from unmodified 2.16 -NSS source code labeled with the "NSS_3.13.1_RTM" release tag. 2.17 +NSS source code labeled with the "NSS_3_16_RTM" HG tag. 2.18 2.19 The NSS source code is available in the OpenJDK source code repository at: 2.20 jdk/test/sun/security/pkcs11/nss/src 2.21 @@ -3349,14 +3349,14 @@ 2.22 2.23 ------------------------------------------------------------------------------- 2.24 2.25 -%% This notice is provided with respect to zlib v1.2.5, which may be included 2.26 +%% This notice is provided with respect to zlib v1.2.8, which may be included 2.27 with JRE 8, JDK 8, and OpenJDK 8. 2.28 2.29 --- begin of LICENSE --- 2.30 2.31 - version 1.2.5, July 18th, 2005 2.32 - 2.33 - Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler 2.34 + version 1.2.8, April 28th, 2013 2.35 + 2.36 + Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler 2.37 2.38 This software is provided 'as-is', without any express or implied 2.39 warranty. In no event will the authors be held liable for any damages 2.40 @@ -3382,11 +3382,11 @@ 2.41 ------------------------------------------------------------------------------- 2.42 2.43 %% This notice is provided with respect to the following which may be 2.44 -included with JRE 8, JDK 8, and OpenJDK 8, except where noted: 2.45 - 2.46 - Apache Commons Math 2.2 2.47 - Apache Derby 10.10.1.2 [included with JDK 8] 2.48 - Apache Jakarta BCEL 5.2 2.49 +included with JRE 8, JDK 8, and OpenJDK 8. 2.50 + 2.51 + Apache Commons Math 3.2 2.52 + Apache Derby 10.10.1.3 2.53 + Apache Jakarta BCEL 5.1 2.54 Apache Jakarta Regexp 1.4 2.55 Apache Santuario XML Security for Java 1.5.4 2.56 Apache Xalan-Java 2.7.1