Merge
diff --git a/.hgtags b/.hgtags
index 7f5eb47..ea4f9ad 100644
--- a/.hgtags
+++ b/.hgtags
@@ -285,3 +285,5 @@
a4b40051d762d972172a28dadf07557987124fee jdk8u20-b14
adf8dfcbcf48460b3d749afe5ffdb1c1f96508bd jdk8u20-b15
03b461ae1b8cabd5247ff68eeaed961f5ec0a595 jdk8u20-b16
+d03dce14fc24537e4aaf8b938361bac014e3d394 jdk8u20-b24
+1c02c6d547e6aa7aaa5149e3edac60189896f94f jdk8u20-b25
diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index e6190f5..2b4ff20 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -310,3 +310,6 @@
5b76ecd0cdcf899261da2c9965862771f6da4e26 jdk8u20-b20
0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u20-b21
6c1fb59fa5d7095d93a023553a949f873f324c6b jdk8u20-b22
+b14daf2459c5430dfe5d435483d6f424cff09584 jdk8u20-b23
+1710841b0229403f4af85eac8b68ea5065a26c81 jdk8u20-b24
+1710841b0229403f4af85eac8b68ea5065a26c81 jdk8u20-b25
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
index ce01810..6d1c60f 100644
--- a/THIRD_PARTY_README
+++ b/THIRD_PARTY_README
@@ -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
+ version 1.2.8, April 28th, 2013
- Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+ 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:
+included with JRE 8, JDK 8, and OpenJDK 8.
- Apache Commons Math 2.2
- Apache Derby 10.10.1.2 [included with JDK 8]
- Apache Jakarta BCEL 5.2
+ 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
diff --git a/corba/.hgtags b/corba/.hgtags
index e7c206b..c3891ff 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -309,6 +309,9 @@
7d1e0f0b63f1d66c77924d8b2a1accdf8f7480db jdk8u20-b21
7677bf14d105ca23ab045f5041ceb19ee88b86c6 jdk8u20-b22
919405d7316dfcbddee5ad8dd08905916df88e04 jdk8u20-b23
+34c930eaa6b591621afde05ca2e24571c91cdc9b jdk8u20-b24
+34c930eaa6b591621afde05ca2e24571c91cdc9b jdk8u20-b25
+37bde23c96f66912c44b1b893c08d4ad4cff5f4e jdk8u20-b26
7d1e0f0b63f1d66c77924d8b2a1accdf8f7480db jdk8u40-b00
c5d9822a3c18cd9e274dfe99e91c33e02bd8f8f4 jdk8u40-b01
504b4455570e14b7fc0a837a09c6401c603516d9 jdk8u40-b02
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index 7c1fe11..9e915f0 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -496,3 +496,7 @@
e4a6e7f1b90b85270aee1c54edaca3ef737082f1 hs25.20-b21
f7429096a202cab5c36a0f20dea33c554026010f jdk8u20-b22
7c56530b11496459e66cb9ea933035002311672c hs25.20-b22
+f09d1f6a401e25a54dad44bb7bea482e47558af5 jdk8u20-b23
+42ddd0bbcb6630fe463ec9bc1893c838d5edff1b jdk8u20-b24
+00cf2b6f51b9560b01030e8f4c28c466f0b21fe3 hs25.20-b23
+19408d5fd31c25ce60c43dd33e92b96e8df4a4ea jdk8u20-b25
diff --git a/hotspot/THIRD_PARTY_README b/hotspot/THIRD_PARTY_README
index ce01810..6d1c60f 100644
--- a/hotspot/THIRD_PARTY_README
+++ b/hotspot/THIRD_PARTY_README
@@ -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
+ version 1.2.8, April 28th, 2013
- Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+ 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:
+included with JRE 8, JDK 8, and OpenJDK 8.
- Apache Commons Math 2.2
- Apache Derby 10.10.1.2 [included with JDK 8]
- Apache Jakarta BCEL 5.2
+ 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
diff --git a/hotspot/make/hotspot_version b/hotspot/make/hotspot_version
index 14df696..f84dc74 100644
--- a/hotspot/make/hotspot_version
+++ b/hotspot/make/hotspot_version
@@ -35,7 +35,7 @@
HS_MAJOR_VER=25
HS_MINOR_VER=20
-HS_BUILD_NUMBER=22
+HS_BUILD_NUMBER=23
JDK_MAJOR_VER=1
JDK_MINOR_VER=8
diff --git a/hotspot/src/os/aix/vm/os_aix.cpp b/hotspot/src/os/aix/vm/os_aix.cpp
index f74d17c..3f6675b 100644
--- a/hotspot/src/os/aix/vm/os_aix.cpp
+++ b/hotspot/src/os/aix/vm/os_aix.cpp
@@ -1215,10 +1215,6 @@
::abort();
}
-// Unused on Aix for now.
-void os::set_error_file(const char *logfile) {}
-
-
// This method is a copy of JDK's sysGetLastErrorString
// from src/solaris/hpi/src/system_md.c
diff --git a/hotspot/src/share/vm/ci/ciField.cpp b/hotspot/src/share/vm/ci/ciField.cpp
index b08ec36..58c1917 100644
--- a/hotspot/src/share/vm/ci/ciField.cpp
+++ b/hotspot/src/share/vm/ci/ciField.cpp
@@ -138,6 +138,17 @@
return;
}
+ // Access check based on declared_holder. canonical_holder should not be used
+ // to check access because it can erroneously succeed. If this check fails,
+ // propagate the declared holder to will_link() which in turn will bail out
+ // compilation for this field access.
+ if (!Reflection::verify_field_access(klass->get_Klass(), declared_holder->get_Klass(), canonical_holder, field_desc.access_flags(), true)) {
+ _holder = declared_holder;
+ _offset = -1;
+ _is_constant = false;
+ return;
+ }
+
assert(canonical_holder == field_desc.field_holder(), "just checking");
initialize_from(&field_desc);
}
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index 2ff63cd..65ce842 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -310,3 +310,6 @@
255d961955e4fdb83ce105ae990c26b87022363f jdk8u20-b20
3a1bba8076da4e54882123e98e219eab1c31ccef jdk8u20-b21
bf115689d89bb82dc1efbe0348657e993715e850 jdk8u20-b22
+d6ded60cfdc53861ae7d1a010f95b5036d610e80 jdk8u20-b23
+dd09d8b9edefb5684941941e5d9b35c84ee066f3 jdk8u20-b24
+dd09d8b9edefb5684941941e5d9b35c84ee066f3 jdk8u20-b25
diff --git a/jaxp/THIRD_PARTY_README b/jaxp/THIRD_PARTY_README
index ce01810..6d1c60f 100644
--- a/jaxp/THIRD_PARTY_README
+++ b/jaxp/THIRD_PARTY_README
@@ -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
+ version 1.2.8, April 28th, 2013
- Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+ 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:
+included with JRE 8, JDK 8, and OpenJDK 8.
- Apache Commons Math 2.2
- Apache Derby 10.10.1.2 [included with JDK 8]
- Apache Jakarta BCEL 5.2
+ 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
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index 52bf9f9..ca1be9d 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -308,3 +308,6 @@
4681b10c0c3197f591b88eadc481a283ae90d003 jdk8u20-b20
31d43d250c836c13fcc87025837783788c5cd0de jdk8u20-b21
2d360fb1b2b89c90133231f9ed5f823997b70c19 jdk8u20-b22
+f3bf1b270fea8b17aa2846f962f7514b6f772ab4 jdk8u20-b23
+1277c0d492fd9253f1ea2730eb160953397bd939 jdk8u20-b24
+1277c0d492fd9253f1ea2730eb160953397bd939 jdk8u20-b25
diff --git a/jaxws/THIRD_PARTY_README b/jaxws/THIRD_PARTY_README
index ce01810..6d1c60f 100644
--- a/jaxws/THIRD_PARTY_README
+++ b/jaxws/THIRD_PARTY_README
@@ -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
+ version 1.2.8, April 28th, 2013
- Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+ 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:
+included with JRE 8, JDK 8, and OpenJDK 8.
- Apache Commons Math 2.2
- Apache Derby 10.10.1.2 [included with JDK 8]
- Apache Jakarta BCEL 5.2
+ 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
diff --git a/jdk/.hgtags b/jdk/.hgtags
index e558f43..355a03d 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -308,3 +308,6 @@
5c0406ee9e820140b5322db006baed199c165b4f jdk8u20-b20
693025bbc45d683676fa78bb76201b665e0d8f2d jdk8u20-b21
0c2393744b29175de5204140d4dfbf12ca3d364f jdk8u20-b22
+be30cb2a3088f2b7b334b499f7eddbd5312312a7 jdk8u20-b23
+dfb9f24d56b51e5a2ca26e77fc69a2464d51a4d3 jdk8u20-b24
+dfb9f24d56b51e5a2ca26e77fc69a2464d51a4d3 jdk8u20-b25
diff --git a/jdk/THIRD_PARTY_README b/jdk/THIRD_PARTY_README
index e16cd2a..6d1c60f 100644
--- a/jdk/THIRD_PARTY_README
+++ b/jdk/THIRD_PARTY_README
@@ -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 ---
@@ -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
+ version 1.2.8, April 28th, 2013
- Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+ 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:
+included with JRE 8, JDK 8, and OpenJDK 8.
- Apache Commons Math 2.2
- Apache Derby 10.10.1.2 [included with JDK 8]
- Apache Jakarta BCEL 5.2
+ 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
diff --git a/jdk/src/share/classes/java/util/Collections.java b/jdk/src/share/classes/java/util/Collections.java
index f236077..3e1d72f 100644
--- a/jdk/src/share/classes/java/util/Collections.java
+++ b/jdk/src/share/classes/java/util/Collections.java
@@ -3497,6 +3497,7 @@
*/
@Override
public void replaceAll(UnaryOperator<E> operator) {
+ Objects.requireNonNull(operator);
list.replaceAll(e -> typeCheck(operator.apply(e)));
}
diff --git a/jdk/src/share/classes/sun/security/smartcardio/CardImpl.java b/jdk/src/share/classes/sun/security/smartcardio/CardImpl.java
index 7531d2e..1c14ea7 100644
--- a/jdk/src/share/classes/sun/security/smartcardio/CardImpl.java
+++ b/jdk/src/share/classes/sun/security/smartcardio/CardImpl.java
@@ -244,9 +244,6 @@
"sun.security.smartcardio.invertCardReset", "false")));
public void disconnect(boolean reset) throws CardException {
- if (invertReset) {
- reset = !reset;
- }
if (reset) {
checkSecurity("reset");
}
@@ -254,6 +251,10 @@
return;
}
checkExclusive();
+ // to preserve old behaviour, don't change flag until here
+ if (invertReset) {
+ reset = !reset;
+ }
try {
SCardDisconnect(cardId, (reset ? SCARD_RESET_CARD : SCARD_LEAVE_CARD));
} catch (PCSCException e) {
diff --git a/jdk/test/java/util/Collections/CheckedListReplaceAll.java b/jdk/test/java/util/Collections/CheckedListReplaceAll.java
index 8ac05d0..19042db 100644
--- a/jdk/test/java/util/Collections/CheckedListReplaceAll.java
+++ b/jdk/test/java/util/Collections/CheckedListReplaceAll.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8047795
+ * @bug 8047795 8053938
* @summary Ensure that replaceAll operator cannot add bad elements
* @author Mike Duigou
*/
@@ -46,5 +46,16 @@
thwarted.printStackTrace(System.out);
System.out.println("Curses! Foiled again!");
}
+
+ unwrapped = Arrays.asList(new Object[]{}); // Empty list
+ wrapped = Collections.checkedList(unwrapped, Integer.class);
+ try {
+ wrapped.replaceAll((UnaryOperator)null);
+ System.out.printf("Bwahaha! I have defeated you! %s\n", wrapped);
+ throw new RuntimeException("NPE not thrown when passed a null operator");
+ } catch (NullPointerException thwarted) {
+ thwarted.printStackTrace(System.out);
+ System.out.println("Curses! Foiled again!");
+ }
}
}
diff --git a/langtools/.hgtags b/langtools/.hgtags
index 7ac9173..59e50e2 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -308,3 +308,6 @@
e92effa22ecee1cb9965c278e45e2b1a6fbe0766 jdk8u20-b20
7de1481c6cd88b42d815ae65e2d5b1cd918e11d1 jdk8u20-b21
61fb0d8b169164ad5db15b6c497489cb30efb9c6 jdk8u20-b22
+5c1d6da1445aa3a2e5cf6101c70e79bfbe2745a5 jdk8u20-b23
+9239118487dfb47ee850d2cc9b10a0a2e510da3c jdk8u20-b24
+9239118487dfb47ee850d2cc9b10a0a2e510da3c jdk8u20-b25
diff --git a/langtools/THIRD_PARTY_README b/langtools/THIRD_PARTY_README
index ce01810..6d1c60f 100644
--- a/langtools/THIRD_PARTY_README
+++ b/langtools/THIRD_PARTY_README
@@ -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
+ version 1.2.8, April 28th, 2013
- Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+ 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:
+included with JRE 8, JDK 8, and OpenJDK 8.
- Apache Commons Math 2.2
- Apache Derby 10.10.1.2 [included with JDK 8]
- Apache Jakarta BCEL 5.2
+ 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
diff --git a/nashorn/.hgtags b/nashorn/.hgtags
index 0aefe95..8d2def7 100644
--- a/nashorn/.hgtags
+++ b/nashorn/.hgtags
@@ -296,3 +296,6 @@
ed3439dca4a73a2dd4a284f3457f0af216a3eb55 jdk8u20-b20
f2925491b61b22ac42f8c30ee9c6723ffa401a4c jdk8u20-b21
5332595fe7ba2a1fc5564cc2689f378b04a56eb4 jdk8u20-b22
+ad36f9454ce38d78be39fc819902e1223765ee5e jdk8u20-b23
+d3da140e179343011017669a6dbfcc52b0e56f52 jdk8u20-b24
+d3da140e179343011017669a6dbfcc52b0e56f52 jdk8u20-b25
diff --git a/nashorn/THIRD_PARTY_README b/nashorn/THIRD_PARTY_README
index ce01810..6d1c60f 100644
--- a/nashorn/THIRD_PARTY_README
+++ b/nashorn/THIRD_PARTY_README
@@ -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
+ version 1.2.8, April 28th, 2013
- Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+ 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:
+included with JRE 8, JDK 8, and OpenJDK 8.
- Apache Commons Math 2.2
- Apache Derby 10.10.1.2 [included with JDK 8]
- Apache Jakarta BCEL 5.2
+ 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