Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8

changeset 1161:9b642949563e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author coffeys
date Wed, 30 Jul 2014 05:48:15 -0700
parents c38ad4b5ca01 (diff) 077479dd354f (current diff)
children d1bd752f8095
files .hgtags
diffstat 2 files changed, 13 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jul 30 05:40:16 2014 -0700
+++ b/.hgtags	Wed Jul 30 05:48:15 2014 -0700
@@ -311,6 +311,7 @@
 0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u20-b21
 6c1fb59fa5d7095d93a023553a949f873f324c6b jdk8u20-b22
 b14daf2459c5430dfe5d435483d6f424cff09584 jdk8u20-b23
+1710841b0229403f4af85eac8b68ea5065a26c81 jdk8u20-b25
 97c6d6a8e5bb3dfc24b9a32711aa0906ea110e23 jdk8u25-b00
 c4cfb4376f5916c5d7eb1f39a0e23402de0d9818 jdk8u25-b01
 b4d29a751077e5500e766b8104dd1cb7148a550f jdk8u25-b02
@@ -321,3 +322,4 @@
 561d066eaa6428088b4f7e273a8caed90e8f6073 jdk8u25-b07
 c2a5ad21d01c5d921c4e928edcb14cc3d61eb62b jdk8u25-b08
 1249614d7f1d9bf8443f0abd0622b4d2a3ab0638 jdk8u25-b09
+0c5d41165be3f4bb989bd84283c2df3e37b9845d jdk8u25-b10
--- a/THIRD_PARTY_README	Wed Jul 30 05:40:16 2014 -0700
+++ b/THIRD_PARTY_README	Wed Jul 30 05:48:15 2014 -0700
@@ -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