Mercurial > hg > openjdk > aarch64-port > nashorn
changeset 1160:7186050bef4a
Merge
author | coffeys |
---|---|
date | Fri, 01 Aug 2014 11:06:11 +0100 |
parents | 62bf127ed4d2 (current diff) 8cd6af10dd4d (diff) |
children | 923003a8c889 |
files | .hgtags |
diffstat | 2 files changed, 16 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Jul 22 10:48:36 2014 -0700 +++ b/.hgtags Fri Aug 01 11:06:11 2014 +0100 @@ -297,6 +297,9 @@ f2925491b61b22ac42f8c30ee9c6723ffa401a4c jdk8u20-b21 5332595fe7ba2a1fc5564cc2689f378b04a56eb4 jdk8u20-b22 ad36f9454ce38d78be39fc819902e1223765ee5e jdk8u20-b23 +d3da140e179343011017669a6dbfcc52b0e56f52 jdk8u20-b24 +d3da140e179343011017669a6dbfcc52b0e56f52 jdk8u20-b25 +a23ac9db4227d78b3389e01fa94a8cb695a8fb0a jdk8u20-b26 7001e9f95b443a75e432205a29974c05b88e0fdc jdk8u25-b00 a9f77bd14874d5f8fdf935704dd54a0451f2bc69 jdk8u25-b01 895e47783e2ee6823496a5ae84039a4f50311c7d jdk8u25-b02 @@ -306,4 +309,6 @@ 0a50d568a901700213fe40c38089748ca1d1af88 jdk8u25-b06 25b719b33ac8f8ffb7e4353fddcda93ca6027b0d jdk8u25-b07 0f74f65763a300cfe5f897b6b21f36d64f9d2115 jdk8u25-b08 +158837f537e45fc4664a56ad4759f8a1b30cab73 jdk8u25-b09 +7e00c05fc54b0404bf2eedda35dd38ae1ad23e50 jdk8u25-b10 9b692a6e5f22228f822973d35610d37cb9dd9693 jdk8u31-b00
--- a/THIRD_PARTY_README Tue Jul 22 10:48:36 2014 -0700 +++ b/THIRD_PARTY_README Fri Aug 01 11:06:11 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