Mercurial > hg > icedtea7-forest > langtools

changeset 2159:403eeedf70f4 icedtea-2.6pre23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk7u80-b32
author andrew
date Fri, 12 Jun 2015 17:38:34 +0100
parents 2b5545fa60db (current diff) 4af9a5de2a39 (diff)
children bc95d2472055
files .hgtags
diffstat 3 files changed, 38 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jun 09 17:32:54 2015 +0100
+++ b/.hgtags	Fri Jun 12 17:38:34 2015 +0100
@@ -547,6 +547,10 @@
 6106b56a874e19e603660a09d506fe8afcde9e14 jdk7u72-b14
 7a09f7596c8bb17d3b25b4506dd76425f6efb15e jdk7u72-b30
 de0088aaf97fa861be8c17e97b57139287068c86 jdk7u72-b31
+2a4f0a3ead7dca917132e0bb55157fca5f85e109 jdk7u72-b32
+a01a26976001088d402da55635e00737b529a961 jdk7u72-b33
+1aef1c42bb783a25b54ea786e9bd112a4744e464 jdk7u72-b34
+8fa35635fddba4b0ea01c841c118a841bd6ff34a jdk7u72-b35
 0138c5f55af0c700882deeac4411fbd9118b4d6e jdk7u75-b00
 7ecfdbf693cfc14d648ebdf2cc87716068569e8d jdk7u75-b01
 688a304d3215af8104336ecce50b7f4edfb88d36 jdk7u75-b02
@@ -579,6 +583,22 @@
 d9e79541170f453dda964319f268fdad80dce9d7 jdk7u76-b13
 24f0420bb212b05d572689bae8ec2d232b9ac5a0 jdk7u76-b30
 f260514e9d6fa7d8c9ee96eb7b5496c61f27d830 jdk7u76-b31
+9c4eaa276d52892371ae4adc79234e8f44c084d2 jdk7u76-b32
+bdbe862f8846558c83f8bc15518446ab0495a173 jdk7u79-b00
+a5f66b87b6c4c14375e8a1aa0405ddb4c63e7014 jdk7u79-b01
+0747b795b08a7de0fbe724cc7042d0e8ebccc4f8 jdk7u79-b02
+421c914fbf030014497053ae58ed7c182043211a jdk7u79-b03
+f6453624f39f9f0922b2746b6f56dcf600a15a4a jdk7u79-b06
+7c626c9382b7705feefb7acfe508ec82d53d7957 jdk7u79-b07
+3a870689bd136b326476a6f21475adc941e33afa jdk7u79-b08
+04176e60f5f58de621a75e5a5c3b59e2d8d00ef7 jdk7u79-b09
+2ea5521a55a35b9700e95d98dc2cf560834b1df6 jdk7u79-b10
+e0d3d80136d7cd11fd26f22fead1f78068fdddaf jdk7u79-b11
+a5f2b51a4ea77cd5471d03501a460c80b375379a jdk7u79-b12
+525562d90c3c06ddc9ef6c266db2d2aa8177b7e0 jdk7u79-b13
+185113eafdbffa675b5db5859ccdd16cfd19ae6f jdk7u79-b14
+79923da8c058124a3a181b9d000753f9b573db35 jdk7u79-b30
+e5e807700ff84f7bd9159ebc828891ae3ddb859c jdk7u79-b15
 772aad4e9681828b8ee193b9ed971cbfe6c7f347 jdk7u80-b00
 6c307a0b7a94e002d8a2532ffd8146d6c53f42d3 jdk7u80-b01
 3eab691bd9ac5222c11dbabb7b5fbc8463c62df6 icedtea-2.6pre07
@@ -602,3 +622,15 @@
 1a60fa408f57762abe32f19e4f3d681fb9c4960b icedtea-2.6pre20
 5331b041c88950058f8bd8e9669b9763be6ee03f icedtea-2.6pre21
 a322987c412f5f8584b15fab0a4505b94c016c22 icedtea-2.6pre22
+335ee524dc68a42863f3fa3f081b781586e7ba2d jdk7u80-b06
+6f7b359c4e9f82cbd399edc93c3275c3e668d2ea jdk7u80-b07
+e6db2a97b3696fb5e7786b23f77af346a935a370 jdk7u80-b08
+88b7f1ad17d20eace30d0ab83d4e7413c0c863ff jdk7u80-b09
+55f4bb77c71c8e0b9be2ac6484c7a3838203d53a jdk7u80-b10
+ae5ecf167fb7d70f98aa117ea6a053307db98b14 jdk7u80-b11
+c084fb3e386393774886645aee8ef57b22854c08 jdk7u80-b12
+e6845c405f95b6336e000f054f87a964a33927d9 jdk7u80-b13
+242015274be21260757835134fcfb9bfa5ba6a81 jdk7u80-b14
+d0cc1c8ace99283d7b2354d2c0e5cd58787163c8 jdk7u80-b30
+f2b4d5e42318ed93d35006ff7d1b3b0313b5a71f jdk7u80-b15
+f1ffea3bd4a4df0f74ce0c127aeacf6bd11ee612 jdk7u80-b32
--- a/THIRD_PARTY_README	Tue Jun 09 17:32:54 2015 +0100
+++ b/THIRD_PARTY_README	Fri Jun 12 17:38:34 2015 +0100
@@ -1001,7 +1001,7 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to libpng 1.5.4, which is 
+%% This notice is provided with respect to libpng 1.6.16, which is 
 included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
@@ -1017,7 +1017,7 @@
 
 This code is released under the libpng license.
 
-libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
 Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
@@ -1115,7 +1115,7 @@
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-July 7, 2011
+December 22, 2014
 
 --- end of LICENSE ---
 
@@ -1912,35 +1912,6 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to Sparkle v.1.5,
-which is included with JRE 7 on Mac OS X.
-
---- begin of LICENSE ---
-
-Copyright (c) 2012 Sparkle.org and Andy Matuschak
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
 %% Portions licensed from Taligent, Inc.
 
 -------------------------------------------------------------------------------
@@ -3198,12 +3169,12 @@
 %% This notice is provided with respect to the following which is 
 included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
 
-  Apache Derby 10.8.3.0        [included with JDK 7 only]
+  Apache Derby 10.8.1.2        [included with JDK 7 only]
   Apache Jakarta BCEL 5.2 
   Apache Jakarta Regexp 1.4 
   Apache Santuario XMLSec-Java 1.4.2
   Apache Xalan-Java 2.7.1 
-  Apache Xerces2 Java 2.11.0 
+  Apache Xerces2 Java 2.10.0 
   Apache XML Resolver 1.1 
 
 
--- a/test/tools/javac/innerClassFile/Driver.sh	Tue Jun 09 17:32:54 2015 +0100
+++ b/test/tools/javac/innerClassFile/Driver.sh	Fri Jun 12 17:38:34 2015 +0100
@@ -71,4 +71,5 @@
 "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . -classpath . -sourcepath src src/x/B.java src/x/C.java src/y/Main.java
 rm y/R3.class
 "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . -classpath . -sourcepath src src/y/Main.java
+chmod -R u+w src
 rm -fr src