Merge jdk8u20-b24 jdk8u20-b25

Tue, 22 Jul 2014 20:53:00 +0100

author
coffeys
date
Tue, 22 Jul 2014 20:53:00 +0100
changeset 595
1277c0d492fd
parent 593
56f6800afdd5
parent 594
a98fa74e9f41
child 596
6f52ec23b43e
child 597
eb34fc2c4fe2
child 624
594ca0fb9a9b

Merge

     1.1 --- a/THIRD_PARTY_README	Wed Jul 16 11:40:07 2014 -0700
     1.2 +++ b/THIRD_PARTY_README	Tue Jul 22 20:53:00 2014 +0100
     1.3 @@ -2,7 +2,7 @@
     1.4  -----------------------------
     1.5  
     1.6  %% This notice is provided with respect to ASM Bytecode Manipulation 
     1.7 -Framework v5.0, which may be included with JRE 8, and JDK 8, and 
     1.8 +Framework v5.0.3, which may be included with JRE 8, and JDK 8, and 
     1.9  OpenJDK 8.
    1.10  
    1.11  --- begin of LICENSE ---
    1.12 @@ -1471,7 +1471,7 @@
    1.13  version 2.0.
    1.14  
    1.15  The NSS libraries are supplied in executable form, built from unmodified
    1.16 -NSS source code labeled with the "NSS_3.13.1_RTM" release tag.
    1.17 +NSS source code labeled with the "NSS_3_16_RTM" HG tag.
    1.18  
    1.19  The NSS source code is available in the OpenJDK source code repository at:
    1.20      jdk/test/sun/security/pkcs11/nss/src
    1.21 @@ -3349,14 +3349,14 @@
    1.22  
    1.23  -------------------------------------------------------------------------------
    1.24  
    1.25 -%% This notice is provided with respect to zlib v1.2.5, which may be included 
    1.26 +%% This notice is provided with respect to zlib v1.2.8, which may be included 
    1.27  with JRE 8, JDK 8, and OpenJDK 8.
    1.28  
    1.29  --- begin of LICENSE ---
    1.30  
    1.31 -  version 1.2.5, July 18th, 2005
    1.32 -
    1.33 -  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
    1.34 +  version 1.2.8, April 28th, 2013
    1.35 +
    1.36 +  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
    1.37  
    1.38    This software is provided 'as-is', without any express or implied
    1.39    warranty.  In no event will the authors be held liable for any damages
    1.40 @@ -3382,11 +3382,11 @@
    1.41  -------------------------------------------------------------------------------
    1.42  
    1.43  %% This notice is provided with respect to the following which may be 
    1.44 -included with JRE 8, JDK 8, and OpenJDK 8, except where noted:
    1.45 -
    1.46 -  Apache Commons Math 2.2
    1.47 -  Apache Derby 10.10.1.2        [included with JDK 8]
    1.48 -  Apache Jakarta BCEL 5.2 
    1.49 +included with JRE 8, JDK 8, and OpenJDK 8.
    1.50 +
    1.51 +  Apache Commons Math 3.2
    1.52 +  Apache Derby 10.10.1.3        
    1.53 +  Apache Jakarta BCEL 5.1 
    1.54    Apache Jakarta Regexp 1.4 
    1.55    Apache Santuario XML Security for Java 1.5.4
    1.56    Apache Xalan-Java 2.7.1 

mercurial