changeset 671:34cc85216b4f

Merge jdk7u40-b40
author andrew
date Wed, 21 Aug 2013 14:18:15 +0100
parents 92dab5233b50 (current diff) cd6971747e7a (diff)
children a2ff16e5361f
files .hgtags
diffstat 2 files changed, 42 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jul 24 21:31:48 2013 +0100
+++ b/.hgtags	Wed Aug 21 14:18:15 2013 +0100
@@ -296,7 +296,9 @@
 29c03ced9215a0bb63a4527dc5858b486cc4099d jdk7u21-b10
 fe6f5b57b9e67a7c6f52a5f926ac17e5c337d4a4 jdk7u21-b11
 12183763c6205c5cfe27924ccc4ca5480106c3b4 jdk7u21-b30
+d4eba65d0f776b77ef137022cd7bf49dc3b88a3e jdk7u21-b50
 d4eba65d0f776b77ef137022cd7bf49dc3b88a3e jdk7u21-b12
+4e2481dc6ee6cadb0e7e883a2d8a6f692a2a32cc jdk7u21-b31
 238b59ffddce3b1d7d19114006ae3be0e72b5eed jdk7u25-b01
 8797b25cbeb3005336483063cef2377849bc2088 jdk7u25-b02
 4635a58db6b028f78a30c972ac47f9c5577bedfd jdk7u25-b03
@@ -312,6 +314,9 @@
 6b4a165221304d809f678a18f51c7a8cb042d60b jdk7u25-b13
 03073e4e6d3f600102d31e862154f56730838b11 jdk7u25-b14
 4a925430bf712d36abb78decda16e04da1b1f6bc jdk7u25-b15
+854a93cd1f89fad2abcbdb6d7935438da0f4afbf jdk7u25-b31
+5d090a0d278f2384cdaaa2d6e8cea4fe30aa6886 jdk7u25-b33
+168023db844d735fa516ec21bb58c30789079c99 jdk7u25-b34
 3ecf7ddefa035bc2c99b03b7a58a0dd0e97089c1 jdk7u25-b30
 1826480d02a3b08eccea90ae56bb4f48e3c6cb29 jdk7u25-b16
 23392fb9b31a6f6892864975601df8f14bdb5e05 jdk7u25-b32
@@ -337,3 +342,9 @@
 f500fd46c18b783f7b4ab22314f64f131f50c5d5 jdk7u40-b31
 83a688927f16b69690f707a6b579edbe55b01e25 jdk7u40-b32
 3ceef25a8cdd9a27a7a2dea0efd8721100cfa30f jdk7u40-b33
+1ef33d25dd8c776a0b76a8c5c7095f4083ad6993 jdk7u40-b34
+9f74e1f33e6cc89256eb2c61964558460d9d7efe jdk7u40-b35
+b75c19a170c7a1a7b846e4e793e62546b2c54646 jdk7u40-b36
+918e6c87b006e32c80a937c7b0f2f9c65edbecdb jdk7u40-b37
+7ae2e9ed2c448a683f2df8673df145d20f13d585 jdk7u40-b38
+4af46770372d3c433811934e6759f5118e5c7648 jdk7u40-b39
--- a/THIRD_PARTY_README	Wed Jul 24 21:31:48 2013 +0100
+++ b/THIRD_PARTY_README	Wed Aug 21 14:18:15 2013 +0100
@@ -1912,6 +1912,35 @@
 
 -------------------------------------------------------------------------------
 
+%% 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.
 
 -------------------------------------------------------------------------------
@@ -3169,12 +3198,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.1.2        [included with JDK 7 only]
+  Apache Derby 10.8.3.0        [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.10.0 
+  Apache Xerces2 Java 2.11.0 
   Apache XML Resolver 1.1