changeset 753:bd1f9bcb0992

Merge
author coffeys
date Fri, 01 Aug 2014 11:04:27 +0100
parents f51697805b1c 11f77cdff0b2
children 34d6b84ef530
files .hgtags
diffstat 2 files changed, 16 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jul 22 10:38:15 2014 -0700
+++ b/.hgtags	Fri Aug 01 11:04:27 2014 +0100
@@ -309,6 +309,9 @@
 7d1e0f0b63f1d66c77924d8b2a1accdf8f7480db jdk8u20-b21
 7677bf14d105ca23ab045f5041ceb19ee88b86c6 jdk8u20-b22
 919405d7316dfcbddee5ad8dd08905916df88e04 jdk8u20-b23
+34c930eaa6b591621afde05ca2e24571c91cdc9b jdk8u20-b24
+34c930eaa6b591621afde05ca2e24571c91cdc9b jdk8u20-b25
+37bde23c96f66912c44b1b893c08d4ad4cff5f4e jdk8u20-b26
 08aa9f55fe5bce1f04cfd2958f71e8df18643e29 jdk8u25-b00
 31f50e3c0dcbdfa7f11a895179065e6888c2cf3c jdk8u25-b01
 162703b7c2f16ce00d1b54a8f95d12eda9753eba jdk8u25-b02
@@ -318,4 +321,6 @@
 76068779ea16c40a9d3c14751a3bbd6c21f09cfd jdk8u25-b06
 db4d845d6a4d71ef5e48a8888f71375b0e21959f jdk8u25-b07
 afd9d9e1bbb5ab77c95a8750d2df164e05088d09 jdk8u25-b08
+1322b445ab39930c50c3901f6c439aad99a62fe8 jdk8u25-b09
+2e6da97d338ad5a65bf07f9d9648dcb74b5776b4 jdk8u25-b10
 69793b08060c9d216fa84d679c48b9e22d2400ac jdk8u31-b00
--- a/THIRD_PARTY_README	Tue Jul 22 10:38:15 2014 -0700
+++ b/THIRD_PARTY_README	Fri Aug 01 11:04:27 2014 +0100
@@ -2,7 +2,7 @@
 -----------------------------
 
 %% This notice is provided with respect to ASM Bytecode Manipulation 
-Framework v5.0, which may be included with JRE 8, and JDK 8, and 
+Framework v5.0.3, which may be included with JRE 8, and JDK 8, and 
 OpenJDK 8.
 
 --- begin of LICENSE ---
@@ -1471,7 +1471,7 @@
 version 2.0.
 
 The NSS libraries are supplied in executable form, built from unmodified
-NSS source code labeled with the "NSS_3.13.1_RTM" release tag.
+NSS source code labeled with the "NSS_3_16_RTM" HG tag.
 
 The NSS source code is available in the OpenJDK source code repository at:
     jdk/test/sun/security/pkcs11/nss/src
@@ -3349,14 +3349,14 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to zlib v1.2.5, which may be included 
+%% This notice is provided with respect to zlib v1.2.8, which may be included 
 with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-  version 1.2.5, July 18th, 2005
-
-  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+  version 1.2.8, April 28th, 2013
+
+  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -3382,11 +3382,11 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to the following which may be 
-included with JRE 8, JDK 8, and OpenJDK 8, except where noted:
-
-  Apache Commons Math 2.2
-  Apache Derby 10.10.1.2        [included with JDK 8]
-  Apache Jakarta BCEL 5.2 
+included with JRE 8, JDK 8, and OpenJDK 8.
+
+  Apache Commons Math 3.2
+  Apache Derby 10.10.1.3        
+  Apache Jakarta BCEL 5.1 
   Apache Jakarta Regexp 1.4 
   Apache Santuario XML Security for Java 1.5.4
   Apache Xalan-Java 2.7.1