Mercurial > hg > release > icedtea7-forest-2.4 > corba
changeset 739:edc7119d7a2a
Merge jdk7u40-b40
author | andrew |
---|---|
date | Wed, 21 Aug 2013 14:21:19 +0100 |
parents | 74ca39d558e8 (current diff) a91b57bf60bd (diff) |
children | 92504ffbb132 |
files | .hgtags |
diffstat | 2 files changed, 42 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Jul 24 21:31:42 2013 +0100 +++ b/.hgtags Wed Aug 21 14:21:19 2013 +0100 @@ -296,7 +296,9 @@ b2adfd931a2504948d4fee780e4175122be10484 jdk7u21-b10 61e2e2d9cfcea20132b50d8fb7ead66a8a373db7 jdk7u21-b11 3c774492beaaff241c654add2c4e683b9ff002f2 jdk7u21-b30 +fa2a377ce52dfa88fca858d735d78b53f2b5b754 jdk7u21-b50 fa2a377ce52dfa88fca858d735d78b53f2b5b754 jdk7u21-b12 +c0231d18f496dd0bc133e128f6b667a4d8f569a5 jdk7u21-b31 3d0f2d5b1866860f7089b51cca8ca0ca41c04d9c jdk7u25-b01 cdbafc5080eeb8ea3fec9fe7d071e0bf96635581 jdk7u25-b02 2057de7ee6b17ab3335ec6cd5730f88f4cfe9502 jdk7u25-b03 @@ -312,6 +314,9 @@ eca480919c71072a31f62a61cb3aad30677007e3 jdk7u25-b13 577c4dd1a6e9bc1bb2c2e5d5ecbab8eacb4121af jdk7u25-b14 4fde7ac2ecf4b170022ebbf8a961e6dbb229ccab jdk7u25-b15 +ddff7b2f69faaa8883e3986447daeab289f25e03 jdk7u25-b31 +9e2247c5d4b82798d393daf4e50cbadcaf0dc844 jdk7u25-b33 +1e888b6e1fb63cff9ea120bc7b0667578d82823b jdk7u25-b34 f4bec833a24b20f5ae770d0650350fc8950c9dc0 jdk7u25-b30 65d0e39500d56c6ea1fd52abbd1bef7966c3e87f jdk7u25-b16 d77153cbe030f91f432fae7c356cf6b5aab12a12 jdk7u25-b32 @@ -337,3 +342,9 @@ 3d2b811b8a798ff3b619f8330b08f551f7fdfd80 jdk7u40-b31 c5f85903c49aa716ee3cb93361dd60a3e88d866d jdk7u40-b32 1b7fbfdc31b859097d6a365ad0ba0e8ef92b4063 jdk7u40-b33 +ddd543ddf33017a15623cdf6908ae4ef2958e24e jdk7u40-b34 +fab3339a833da9631ead479621edcf6df2df457d jdk7u40-b35 +cd3871b1516988ea4a3099d6e1886abe2e74e771 jdk7u40-b36 +dc9a63376b39223bfb612d9e8efd275023de6399 jdk7u40-b37 +8391dff270bbf75dc434e53ed68993ab833475e8 jdk7u40-b38 +d7c73fd53c84cbb4333559cf788e554a2ef9326c jdk7u40-b39
--- a/THIRD_PARTY_README Wed Jul 24 21:31:42 2013 +0100 +++ b/THIRD_PARTY_README Wed Aug 21 14:21:19 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