Mercurial > hg > openjdk > bsd-port > corba
changeset 1321:acb37c871198
Merge from main OpenJDK repository
author | Greg Lewis <glewis@eyesbeyond.com> |
---|---|
date | Sun, 19 Apr 2015 13:24:08 -0700 |
parents | a97bddc81932 (diff) 7ca0573ec06a (current diff) |
children | be3a966e2c3e |
files | .hgtags |
diffstat | 2 files changed, 45 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Sat Jan 24 11:28:39 2015 -0800 +++ b/.hgtags Sun Apr 19 13:24:08 2015 -0700 @@ -528,6 +528,10 @@ bd80d0c18ccd97669dd8392dbde5cd91f647ee1d jdk7u72-b14 66da7f46eff05df2aa3bb9b5c1f7ee47a75828a5 jdk7u72-b30 4fefe5c11ddb650e681e2dd5e8ac8dfeb15e6afd jdk7u72-b31 +c8d42c36b2ab3db65bcd7497ca87e3b2c191f3f7 jdk7u72-b32 +a3070ed2ab6aa1542e5e545e9e19684dcd056945 jdk7u72-b33 +5d1445139b101e045fd389578df8825d5b2d0dad jdk7u72-b34 +acc110e88fc38ed6118ed1fe44a3211f5b4a6337 jdk7u72-b35 88772da384953fed254492c3ea9da498381081f2 jdk7u75-b00 0466441d71122c9af252ec17f597f228dbf64578 jdk7u75-b01 9aa7fe309fa584ff782ab9d557632321747ba11e jdk7u75-b02 @@ -543,6 +547,7 @@ 45136140d2bcf28009271a047eea9a89c95378d7 jdk7u75-b12 fb49daa5d7f89cbe60ff4b598c6b3e976ad04e4d jdk7u75-b13 f3d39b94209598ba90e221d60ff3325dbe37fe2e jdk7u75-b30 +94386a790f9469f9da1328a7d0c2a2d63f03404b jdk7u75-b31 2d6f594ce6c5dafc1ad9a9368186817212120d84 jdk7u76-b00 b4d4ec688a281a362524291f2cff15c59b85dbb5 jdk7u76-b01 c24e65a16f334611f95a8ae46769375b20818b74 jdk7u76-b02 @@ -557,3 +562,38 @@ c947bf709139b13476a1df4ca8a92583fb1de5a4 jdk7u76-b11 14f0846f4d1b8373e3e3cce10901f37341bf6980 jdk7u76-b12 0db41b697138ce89f15c49eef1dc670f94a27d89 jdk7u76-b13 +71a8665159f2f014b1869f3d723d3b6fbe878a16 jdk7u76-b30 +7a566e2b22722a59174c7cced744bdda3709ce2e jdk7u76-b31 +dbbdf5e8b66e6fccd36977016d38683346c5d107 jdk7u76-b32 +f55967c261230a4fcc8d71ecfe58f2f47ea50393 jdk7u79-b00 +d2a032b5389366fdff24b8a5ba52931da14d2a8d jdk7u79-b01 +0a8522745129e647c3b1fe9ef7b5f7d84e063938 jdk7u79-b02 +df1f9eb105ed2b05c0d15b08abded72e8e4a76c5 jdk7u79-b03 +f2c5c65d2d7f2153370429ebc8dfded9f9ada43e jdk7u79-b06 +3f5ddba1c4f1f5268d2419360c9b83f303166f4f jdk7u79-b07 +65366f746473f25f9ccda87e5c77f04247050a86 jdk7u79-b08 +58c0e28636cd1b3e947e71a40693f57f65a48ba4 jdk7u79-b09 +b36cf254eef39119d817eef3344b98c5a79c30b8 jdk7u79-b10 +0ebb0413e7d9f8352bdb92552f5fc1056049c9dd jdk7u79-b11 +2ae2ecbcdd17641b8eb4d97fa2324ef41a2fddb7 jdk7u79-b12 +ec5c1e656d0383c697c7a3a7f3c6839d225ea649 jdk7u79-b13 +4262b390c9460e6dbeb6968a60ac6356452d47a9 jdk7u79-b14 +89b8b9610d476843e696cdad5d8d238f83e00c94 jdk7u79-b30 +59faa52493939dccdf6ff9efe86371101769b8f9 jdk7u79-b15 +1a3aa4637b80fabbd069ae88c241efcb3520fc49 jdk7u80-b00 +df1decc820934ad8bf91c853e81c88d4f7590e25 jdk7u80-b01 +2444fa7df7e3e07f2533f6c875c3a8e408048f6c jdk7u80-b02 +fc6a39d6be24e0c1f7d9193e4f3ea4e474bb4dc3 jdk7u80-b03 +d9ddd2aec6bee31e3bd8bb4eb258c27a624162c3 jdk7u80-b04 +6696348644df30f1807acd3a38a603ebdf09480c jdk7u80-b05 +4362d8c11c43fb414a75b03616252cf8007eea61 jdk7u80-b06 +1191862bb140612cc458492a0ffac5969f48c4df jdk7u80-b07 +6a12979724faeb9abe3e6af347c64f173713e8a4 jdk7u80-b08 +f09d8e79d1e970a583677987f2baa2a030903441 jdk7u80-b09 +d4abe9013712af965bc7284efaa7f8d3cc90dde8 jdk7u80-b10 +7c5957c3d8d6d5c2e9562267bf2db68dec775fb1 jdk7u80-b11 +fa884531a1a32d78fb6b4e5253dae275eaaddd2c jdk7u80-b12 +8e4a2983e0d085331c7281d90f23c43bfdab5ed4 jdk7u80-b13 +90e140a093262c0ca0b408a5997074fbd87639c0 jdk7u80-b14 +52b7bbe24e490090f98bee27dbd5ec5715b31243 jdk7u80-b30 +353be4a0a6ec19350d18e0e9ded5544ed5d7433f jdk7u80-b15
--- a/THIRD_PARTY_README Sat Jan 24 11:28:39 2015 -0800 +++ b/THIRD_PARTY_README Sun Apr 19 13:24:08 2015 -0700 @@ -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