changeset 1266:87290096a2fa icedtea-2.6pre23

Merge jdk7u80-b32
author andrew
date Fri, 12 Jun 2015 17:38:33 +0100
parents 3e1448d91793 (current diff) 2e4590eadc2c (diff)
children 299588405837
files .hgtags
diffstat 2 files changed, 37 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jun 09 17:32:52 2015 +0100
+++ b/.hgtags	Fri Jun 12 17:38:33 2015 +0100
@@ -547,6 +547,10 @@
 e33bca6f8dab3e82b2dec2c52074f19a88e1267e jdk7u72-b14
 587c4a3bfb76c03fa589f61e28ed739c537409bc jdk7u72-b30
 4257d52e30b4054c9ce43cfe830dff2b8f740037 jdk7u72-b31
+21fa73d6d8229f9b47e0e005d749f1a8f2e6773b jdk7u72-b32
+76bad2bdb262a711286dd3e564ff74a35a5e4057 jdk7u72-b33
+d696a336ab88e75a4754e33cc55d2077233274cf jdk7u72-b34
+f53c2202f0f3e71e5fce28a255c84f82c72e66af jdk7u72-b35
 664724762a245f1cd9d89ccd3d3833fcb16bed80 jdk7u75-b00
 ce5b9e0d988cb52d9e6c36edeafe60bd16280534 jdk7u75-b01
 1b6ba791cbf7d995a81dfd1478906ebae3769ea2 jdk7u75-b02
@@ -579,6 +583,22 @@
 a986e4b755f388532378d595831bebece7bf72c4 jdk7u76-b13
 260565d7fba1a2d176bd43d81b0714bd19cf4459 jdk7u76-b30
 c3d2e34987eae0eabef0f4297c6f45698251f27d jdk7u76-b31
+1861eefc3db3696d0b1871dd3bd9ab66bf9b70e7 jdk7u76-b32
+f1266833b5a07aa84d5da263f4a18503838286f4 jdk7u79-b00
+4f7ab6ef2080323109da52df2931eb661453cc74 jdk7u79-b01
+8a6d9421cc85ef5dd9549e748d2447a86ea91b46 jdk7u79-b02
+b73eefa2d0e12841f097547d1b3b15b03e8ca0df jdk7u79-b03
+931954df4985d83a044545f2606eeeacedc6d286 jdk7u79-b06
+c9c194a74632eb094b618a7d8622d6728ef48d01 jdk7u79-b07
+77da17c07509a090dfe19f742622b1bc3eaa3ed0 jdk7u79-b08
+1ddc3c2923f0c31c762a3261053969abbff0d116 jdk7u79-b09
+eed22a7e2498022e68fb19b5ac29ce72ad8032c1 jdk7u79-b10
+ed0b993ecbf0a353beae3fbfbe958da333ddc570 jdk7u79-b11
+c9c2272d9823e1ae10a2955811555a3bdb0bccb9 jdk7u79-b12
+b20bcfe401e916df6c850d7a944f18906b43f79b jdk7u79-b13
+d0bce57e5f05eead65366e2e4dbe635f1407b76d jdk7u79-b14
+5c8cec1a09708a2627930ff923e64f468c7d9000 jdk7u79-b30
+4ed47474a15acb48cd7f7fd3a4d9d3f8f457d914 jdk7u79-b15
 bef313c7ff7a7a829f8f6a305bf0c3738ad99795 jdk7u80-b00
 0eb2482c3d0663c39794ec4c268acc41c4cd387b jdk7u80-b01
 f21a65d1832ce426c02a7d87b9d83b1a4a64018c icedtea-2.6pre07
@@ -602,3 +622,15 @@
 c901dec7bc96f09e9468207c130361f3cf0a727f icedtea-2.6pre20
 231ef27a86e2f79302aff0405298081d19f1344e icedtea-2.6pre21
 d4de5503ba9917a7b86e9f649343a80118ae5eca icedtea-2.6pre22
+4f6bcbad3545ab33c0aa587c80abf22b23e08162 jdk7u80-b06
+8cadb55300888be69636353d355bbcc85315f405 jdk7u80-b07
+2fb372549f5be49aba26992ea1d44121b7671fd5 jdk7u80-b08
+0fefcb506b46944f8ee42d36b2d9c22727c41ec9 jdk7u80-b09
+88edfb09289488ee4924977402f6d8949ecb8571 jdk7u80-b10
+dbb1d1057fe5005777e8796b616423ea99c0936c jdk7u80-b11
+4b6ad47f7eed058b894931e6e82117e9b1c00251 jdk7u80-b12
+f816779f033526a72e2d17ccbb1d8642639c4e50 jdk7u80-b13
+54dbf50da693ef8091e824b5d5bb1f271f753793 jdk7u80-b14
+c1bf2f665c46d0e0b514bdeb227003f98a54a561 jdk7u80-b30
+f6417ecaede6ee277f999f68e45959326dcd8f07 jdk7u80-b15
+b0dd986766bc3e8b65dd6b3047574ddd3766e1ac jdk7u80-b32
--- a/THIRD_PARTY_README	Tue Jun 09 17:32:52 2015 +0100
+++ b/THIRD_PARTY_README	Fri Jun 12 17:38:33 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