Mercurial > hg > release > icedtea7-forest-2.4

changeset 801:930763affcf3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk7u40-b40
author andrew
date Wed, 21 Aug 2013 14:21:18 +0100
parents b5f2715442df (current diff) c9157eb582a5 (diff)
children 6125b83238df
files .hgtags
diffstat 3 files changed, 43 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jul 24 21:31:39 2013 +0100
+++ b/.hgtags	Wed Aug 21 14:21:18 2013 +0100
@@ -296,7 +296,9 @@
 602ad1a5b09fb9136e8bf1b708e0524fbdb35324 jdk7u21-b10
 fa322ca378324750ea049f2e92357e51eca27ae4 jdk7u21-b11
 450e8dde919df278fe75ae95e0eb0a6464f5bc41 jdk7u21-b30
+170520883597f90771aca8251a8d089e7566e4bf jdk7u21-b50
 170520883597f90771aca8251a8d089e7566e4bf jdk7u21-b12
+da9a0cdf4afcfae3a7c47565e9acfd9170ba5a30 jdk7u21-b31
 50bfbd21bf42f6ae4167226ac45cd79e0ab7758c jdk7u25-b03
 a94c9aa356bbed13c1e2b4a9a380117ddff1668f jdk7u25-b04
 29a789ae14dc09a50eb45d3445075642e77490a2 jdk7u25-b05
@@ -310,6 +312,9 @@
 37c4268341d79b16165bdaf7e1fad489d692bc83 jdk7u25-b13
 9de1fc3635def64c19c51f272f09b51d8cf0ca98 jdk7u25-b14
 2197dde877124579204c5266fa9d89166760b44f jdk7u25-b15
+eeb29025d52ab4ea9bc4f5afa37c3a4fbcaf0011 jdk7u25-b31
+e571b5c75bd194c1aaad6e8e75b1d40f6208391c jdk7u25-b33
+161e4656fea4720ececade6892247a73a2e31a42 jdk7u25-b34
 9846c505054fb91762f3fd9b817d1a9760322029 jdk7u25-b30
 12c2f4ce55d074f0be94781d98cbbbcf8299b666 jdk7u25-b16
 40fde76d9b89f5acc63f4eeeccdc261d9999bf39 jdk7u25-b32
@@ -335,3 +340,9 @@
 58a2a470aa3bccd3eb3624e68bca9397c8cc26a2 jdk7u40-b31
 da376fd5e4d68f8a45003a6e175267dc840711cc jdk7u40-b32
 3fdfe7f1b06354e11e8af51b7c653c8a0adb3987 jdk7u40-b33
+a1ae13479e8767329fa20774b5cea5976aaeb37b jdk7u40-b34
+af755d12719e898e3af917e8a56b64ebf83019bc jdk7u40-b35
+59598f7b6a7be5e0470447694c1f5b7d951f6ff1 jdk7u40-b36
+5bfb3aa1655e5364a8c1c17343ff84dad7e13f25 jdk7u40-b37
+7d3e6ccad487d84e764932802cd42d2afebccd7a jdk7u40-b38
+a2ba8e069718677c267b3894df2a719148c15ac8 jdk7u40-b39
--- a/Makefile	Wed Jul 24 21:31:39 2013 +0100
+++ b/Makefile	Wed Aug 21 14:21:18 2013 +0100
@@ -263,7 +263,7 @@
 		ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/$(REL_JDK_OUTPUTDIR) \
 	        DEBUG_NAME=$(DEBUG_NAME) \
 		GENERATE_DOCS=false \
-		BUILD_INSTALL_BUNDLES=true \
+		$(if $(findstring true,$(BUILD_INSTALL)),BUILD_INSTALL_BUNDLES=true,) \
 		CREATE_DEBUGINFO_BUNDLES=false \
 	        $(BOOT_CYCLE_DEBUG_SETTINGS) \
 		generic_build_repo_series
--- a/THIRD_PARTY_README	Wed Jul 24 21:31:39 2013 +0100
+++ b/THIRD_PARTY_README	Wed Aug 21 14:21:18 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