changeset 2534:ca516bc459f6

Merge
author coffeys
date Fri, 01 Aug 2014 11:06:04 +0100
parents ea76c5c3adbe eee827744830
children 42175c1524a6
files .hgtags
diffstat 2 files changed, 16 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jul 22 10:48:08 2014 -0700
+++ b/.hgtags	Fri Aug 01 11:06:04 2014 +0100
@@ -309,6 +309,9 @@
 7de1481c6cd88b42d815ae65e2d5b1cd918e11d1 jdk8u20-b21
 61fb0d8b169164ad5db15b6c497489cb30efb9c6 jdk8u20-b22
 5c1d6da1445aa3a2e5cf6101c70e79bfbe2745a5 jdk8u20-b23
+9239118487dfb47ee850d2cc9b10a0a2e510da3c jdk8u20-b24
+9239118487dfb47ee850d2cc9b10a0a2e510da3c jdk8u20-b25
+5e6d409a72327a31b8a8f9aa0b32ef213c8b629c jdk8u20-b26
 f491f1581f196950c2cb858508dd06601968c417 jdk8u25-b00
 5bc865e0a2e3c59c1c8bc41e731509e1737ddea1 jdk8u25-b01
 4dec0c684a9ead80ea2bca6b042682367c1abf90 jdk8u25-b02
@@ -318,4 +321,6 @@
 7a6309461a7294cc78789f547b0a652757d17156 jdk8u25-b06
 aad835b33337c22f4d632c2531c453de00a8f778 jdk8u25-b07
 224b8260b2c72e2902e48522240c97de11b3570a jdk8u25-b08
+a5fa1a2bd63cfcce67dae074c07cd0f2baa8ddc0 jdk8u25-b09
+0dfd4099658397efa118918cd43f79e194c320ea jdk8u25-b10
 c4bd223559aad3d152968a09d56241175d82c561 jdk8u31-b00
--- a/THIRD_PARTY_README	Tue Jul 22 10:48:08 2014 -0700
+++ b/THIRD_PARTY_README	Fri Aug 01 11:06:04 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