Mercurial > hg > openjdk > bsd-port

changeset 1315:1727e624ac22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from main OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Sun, 19 Apr 2015 13:24:06 -0700
parents 458545155c93 (diff) 44aeaccdcbf1 (current diff)
children 014244c4a547
files .hgtags
diffstat 4 files changed, 47 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat Jan 24 11:28:38 2015 -0800
+++ b/.hgtags	Sun Apr 19 13:24:06 2015 -0700
@@ -526,6 +526,10 @@
 fa606411d8fd650334b6f90d626399e13e77740f jdk7u72-b14
 f42462b4dfd81539eacf90955d2d26e1dc1686c0 jdk7u72-b30
 891bb800d7b2abff392669276f9e55ff30ba9962 jdk7u72-b31
+cc4b22b0bc1810d6bb1367f08c47707923a89b0e jdk7u72-b32
+9179bba54a0d43be8a5325152acd29ac2852c4d5 jdk7u72-b33
+8c92ab4f302fea71b378a0eb8912d2321acdae68 jdk7u72-b34
+8d5af53bb3926fac6aa21e2f02a8df7c6718c5c2 jdk7u72-b35
 569e053e97b4fecaf1371f7cf2645394edb8a11a jdk7u75-b00
 618b221a71a962f1d62a5b02db1b4256bad9441a jdk7u75-b01
 eb36016211cb5d412c779836bd8efbf133cbf6f5 jdk7u75-b02
@@ -541,6 +545,7 @@
 cca6b8a583cef75117297d9522adc33f7ab516c2 jdk7u75-b12
 669bd350d550600a3f0c4556da9bc4bb6006dc5c jdk7u75-b13
 7d45f621855a37b70a239edc6f8ac3b75ca7862b jdk7u75-b30
+37b5893cb60f897f28b1999be7f88335409beda5 jdk7u75-b31
 b39439fb5dcdef664c7a6cd638642b22c79f2393 jdk7u76-b00
 dc25c29542f743722854fe37336630b23ebccfff jdk7u76-b01
 7402e2fd4c2865f4605fe4d84fa43883029e221d jdk7u76-b02
@@ -555,3 +560,38 @@
 4f5b251f1daa41a9143636a9b8aaf0cf4ce00f26 jdk7u76-b11
 01d1d34f82f30de97a61f8b0048c61aa17d0dd12 jdk7u76-b12
 a9728fbea214dbf6f58567e729fdc5276f3c704f jdk7u76-b13
+a788e9c5671436bb711f0e185cd74b17220d6e35 jdk7u76-b30
+ed58c355d118cb3d9713de41ecb105cca3175472 jdk7u76-b31
+79a5a54289ef52fc67d5447bacc60610282b1e3c jdk7u76-b32
+dcc07fe8d380a63c22086abeb62a5a9780b3639c jdk7u79-b00
+9d7b2508882acda9da48a0f52490e1b31111fcd6 jdk7u79-b01
+fc70c5c1a1c0cfd7fd11237a5a7fcce6a1cd2cd8 jdk7u79-b02
+6842b297466cf696cca4ac6f776183bd74e8f52f jdk7u79-b03
+7d851d1726c67146e491575e905aaa3f1eb90083 jdk7u79-b06
+9e76c64141e8b65d64d0defbe12094d6c9eb8f03 jdk7u79-b07
+52a09e691b39ab0f23ca0830fbb2a372e157990c jdk7u79-b08
+5127e5f6909283ade8de12d0a912b82383cd0084 jdk7u79-b09
+83f6693e12e6265e914ad07b5fe137ab01c2dbbf jdk7u79-b10
+be4cf73f2c91c252c84fb1799e68585027eab3b0 jdk7u79-b11
+fae704111ce1257c66c80e1221cf89522fd2d52e jdk7u79-b12
+434885f8214fd2671ea6b4708663fc9a14505872 jdk7u79-b13
+4dc3a33c7c9d3a88ee566554ffd8253b777aa6a4 jdk7u79-b14
+ee3b3ebecd737ff98883e4f15471887dfdfa8dce jdk7u79-b30
+127bfeeddc9cf2f8cbf58052f32f6c8676fb8840 jdk7u79-b15
+d4397128f8b65eb96287128575dd1a3da6a7825b jdk7u80-b00
+90564f0970e92b844122be27f051655aef6dc423 jdk7u80-b01
+36e8397bf04d972519b80ca9e24e68a2ed1e4dbd jdk7u80-b02
+4093bbbc90009bfd9311ccd6373c7a2f2755c9d9 jdk7u80-b03
+928d01695cd2b65119bbfcd51032ae427a66f83d jdk7u80-b04
+46d516760a680deaeffdb03e3221648bc14c0818 jdk7u80-b05
+8fffdc2d1faaf2c61abff00ee41f50d28da2174a jdk7u80-b06
+6d0aaea852b04d7270fde5c289827b00f2391374 jdk7u80-b07
+e8daab5fb25eb513c53d6d766d50caf662131d79 jdk7u80-b08
+8c0f70ebdfbd5b06c759ab762b093e8c3ee6558e jdk7u80-b09
+67dafced5999152f5f88ace0a84122909049182c jdk7u80-b10
+7a31b13266333dbc62825b827fb5730417d7212c jdk7u80-b11
+96d3f807999b5c2d8b07ebf0b79fdbc1952d1109 jdk7u80-b12
+5bd350f497873137786dc6ff5abcae1207bcc30b jdk7u80-b13
+4da82068f37e17858d318d24a5a6284d48627e68 jdk7u80-b14
+611f7d38d9346243b558dc78409b813241eb426f jdk7u80-b30
+f19659de2034611095d307ccc68f777abc8b008e jdk7u80-b15
--- a/THIRD_PARTY_README	Sat Jan 24 11:28:38 2015 -0800
+++ b/THIRD_PARTY_README	Sun Apr 19 13:24:06 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 
 
 
--- a/make/jprt.properties	Sat Jan 24 11:28:38 2015 -0800
+++ b/make/jprt.properties	Sun Apr 19 13:24:06 2015 -0700
@@ -83,6 +83,7 @@
     ${jprt.my.test.target.set:TESTNAME=jdk_security1},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_security2},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_security3},		\
+    ${jprt.my.test.target.set:TESTNAME=jdk_security4},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_rmi},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_management},	\
     ${jprt.my.test.target.set:TESTNAME=jdk_jmx},	\
--- a/test/Makefile	Sat Jan 24 11:28:38 2015 -0800
+++ b/test/Makefile	Sun Apr 19 13:24:06 2015 -0700
@@ -63,7 +63,7 @@
 	jdk_other  \
 	jdk_net  \
 	jdk_nio \
-	jdk_security1 jdk_security2 jdk_security3  \
+	jdk_security1 jdk_security2 jdk_security3 jdk_security4  \
 	jdk_sound  \
 	jdk_text  \
 	jdk_tools \