/hg/release/icedtea7-forest-2.4: 23 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Aug 21 06:25:45 PDT 2013
changeset cda093be8c6d in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=cda093be8c6d
author: katleman
date: Wed Jul 17 11:09:12 2013 -0700
Added tag jdk7u40-b34 for changeset a1ae13479e87
changeset f6f6f414cdfe in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=f6f6f414cdfe
author: tbell
date: Wed Jul 17 06:06:42 2013 -0700
8012366: Fix for 8007815 breaks down when only building OpenJDK (without deploy and install forests)
Reviewed-by: dholmes, robilad
changeset af755d12719e in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=af755d12719e
author: lana
date: Thu Jul 18 11:17:46 2013 -0700
Merge
changeset 99b7811ca8ce in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=99b7811ca8ce
author: katleman
date: Wed Jul 24 14:44:49 2013 -0700
Added tag jdk7u40-b35 for changeset af755d12719e
changeset da9a0cdf4afc in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=da9a0cdf4afc
author: asaha
date: Thu Apr 11 10:29:22 2013 -0700
Merge
changeset 00d6834cb258 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=00d6834cb258
author: katleman
date: Wed May 01 14:51:37 2013 -0700
Added tag jdk7u21-b31 for changeset da9a0cdf4afc
changeset 183ae0f6af51 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=183ae0f6af51
author: asaha
date: Thu Jun 06 13:13:37 2013 -0700
Merge
changeset 5c8e90834e17 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=5c8e90834e17
author: katleman
date: Tue May 28 10:36:17 2013 -0700
Added tag jdk7u21-b50 for changeset 170520883597
changeset eeb29025d52a in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=eeb29025d52a
author: asaha
date: Thu Jun 06 17:05:24 2013 -0700
Merge
changeset e571b5c75bd1 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=e571b5c75bd1
author: katleman
date: Tue Jun 11 17:48:54 2013 -0700
Added tag jdk7u25-b31 for changeset eeb29025d52a
changeset 161e4656fea4 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=161e4656fea4
author: katleman
date: Tue Jun 18 11:14:44 2013 -0700
Added tag jdk7u25-b33 for changeset e571b5c75bd1
changeset 0a668ed4711f in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=0a668ed4711f
author: asaha
date: Tue Jul 16 15:03:05 2013 -0700
Merge
changeset b23a7a45d957 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=b23a7a45d957
author: katleman
date: Thu Jul 18 20:46:09 2013 -0700
Added tag jdk7u25-b34 for changeset 161e4656fea4
changeset d2f28b069dc8 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=d2f28b069dc8
author: asaha
date: Fri Jul 19 22:17:36 2013 -0700
Merge
changeset a18ee06070df in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a18ee06070df
author: asaha
date: Tue Jul 23 20:38:20 2013 -0700
Merge
changeset e4bc26c4119a in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=e4bc26c4119a
author: asaha
date: Wed Jul 24 18:50:58 2013 -0700
Merge
changeset 53fe3334f0b3 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=53fe3334f0b3
author: jeff
date: Thu Jul 25 12:20:52 2013 -0700
8014850: Third Party License Readme updates for 7u40
Reviewed-by: lana, tbell
changeset 59598f7b6a7b in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=59598f7b6a7b
author: lana
date: Thu Jul 25 14:09:48 2013 -0700
Merge
changeset 5bfb3aa1655e in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=5bfb3aa1655e
author: cl
date: Wed Jul 31 21:26:52 2013 -0700
Added tag jdk7u40-b36 for changeset 59598f7b6a7b
changeset 7d3e6ccad487 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=7d3e6ccad487
author: asaha
date: Fri Aug 02 13:10:09 2013 -0700
Added tag jdk7u40-b37 for changeset 5bfb3aa1655e
changeset a2ba8e069718 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a2ba8e069718
author: asaha
date: Wed Aug 07 12:08:58 2013 -0700
Added tag jdk7u40-b38 for changeset 7d3e6ccad487
changeset c9157eb582a5 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=c9157eb582a5
author: katleman
date: Mon Aug 12 12:07:28 2013 -0700
Added tag jdk7u40-b39 for changeset a2ba8e069718
changeset 930763affcf3 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=930763affcf3
author: andrew
date: Wed Aug 21 14:21:18 2013 +0100
Merge jdk7u40-b40
diffstat:
.hgtags | 21 +++++++++++++++++++++
.jcheck/conf | 2 --
Makefile | 2 +-
THIRD_PARTY_README | 33 +++++++++++++++++++++++++++++++--
make/Defs-internal.gmk | 3 ++-
5 files changed, 55 insertions(+), 6 deletions(-)
diffs (194 lines):
diff -r a1ae13479e87 -r 930763affcf3 .hgtags
--- a/.hgtags Wed Jul 10 13:48:44 2013 -0700
+++ b/.hgtags Wed Aug 21 14:21:18 2013 +0100
@@ -50,6 +50,7 @@
3ac6dcf7823205546fbbc3d4ea59f37358d0b0d4 jdk7-b73
2c88089b6e1c053597418099a14232182c387edc jdk7-b74
d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75
+f0bfd9bd1a0e674288a8a4d17dcbb9e632b42e6d icedtea7-1.12
c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76
1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77
ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78
@@ -63,6 +64,7 @@
433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86
6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87
82135c848d5fcddb065e98ae77b81077c858f593 jdk7-b88
+195fcceefddce1963bb26ba32920de67806ed2db icedtea7-1.13
7f1ba4459972bf84b8201dc1cc4f62b1fe1c74f4 jdk7-b89
425ba3efabbfe0b188105c10aaf7c3c8fa8d1a38 jdk7-b90
97d8b6c659c29c8493a8b2b72c2796a021a8cf79 jdk7-b91
@@ -111,6 +113,7 @@
ddc2fcb3682ffd27f44354db666128827be7e3c3 jdk7-b134
783bd02b4ab4596059c74b10a1793d7bd2f1c157 jdk7-b135
2fe76e73adaa5133ac559f0b3c2c0707eca04580 jdk7-b136
+d4aea1a51d625f5601c840714c7c94f1de5bc1af icedtea-1.14
7654afc6a29e43cb0a1343ce7f1287bf690d5e5f jdk7-b137
fc47c97bbbd91b1f774d855c48a7e285eb1a351a jdk7-b138
7ed6d0b9aaa12320832a7ddadb88d6d8d0dda4c1 jdk7-b139
@@ -123,6 +126,7 @@
2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01
d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
+3defd24c2671eb2e7796b5dc45b98954341d73a7 icedtea-2.0-branchpoint
34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02
bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03
f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04
@@ -141,6 +145,7 @@
b2deaf5bde5ec455a06786e8e2aea2e673be13aa jdk7u2-b12
c95558e566ac3605c480a3d070b1102088dab07f jdk7u2-b13
e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u2-b21
+a66b58021165f5a43e3974fe5fb9fead29824098 icedtea-2.1-branchpoint
e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u3-b02
becd013ae6072a6633ba015fc4f5862fca589cee jdk7u3-b03
d64361a28584728aa25dca3781cffbaf4199e088 jdk7u3-b04
@@ -157,6 +162,7 @@
2b07c262a8a9ff78dc908efb9d7b3bb099df9ac4 jdk7u4-b10
1abfee16e8cc7e3950052befa78dbf14a5ca9cfc jdk7u4-b11
e6f915094dccbba16df6ebeb002e6867392eda40 jdk7u4-b12
+e7886f5ad6cc837092386fa513e670d4a770456c icedtea-2.2-branchpoint
9108e3c2f07ffa218641d93893ac9928e95d213a jdk7u4-b13
d9580838fd08872fc0da648ecfc6782704b4aac1 jdk7u4-b14
008753000680a2008175d14b25373356f531aa07 jdk7u4-b15
@@ -191,6 +197,7 @@
528f1589f5f2adf18d5d21384ba668b9aa79841e jdk7u6-b15
7b77364eb09faac4c37ce9dd2c2308ca5525f18f jdk7u6-b16
b7c1b441d131c70278de299b5d1e59dce0755dc5 jdk7u6-b17
+0e7b94bd450d4270d4e9bd6c040c94fa4be714a6 icedtea-2.3-branchpoint
9c41f7b1460b106d18676899d24b6ea07de5a369 jdk7u6-b18
56291720b5e578046bc02761dcad2a575f99fd8e jdk7u6-b19
e79fa743fe5a801db4acc7a7daa68f581423e5d3 jdk7u6-b20
@@ -258,6 +265,7 @@
c3e42860af1cfd997fe1895594f652f0d1e9984e jdk7u12-b07
1a03ef4794dc8face4de605ae480d4c763e6b494 jdk7u12-b08
87cf81226f2012e5c21131adac7880f7e4da1133 jdk7u12-b09
+8a10a3c51f1cd88009008cf1b82071797b5f516d icedtea-2.4-branchpoint
745a15bb6d94765bb5c68048ff146590df9b8441 jdk7u14-b10
2d8fdaa5bb55b937028e385633ce58de4dcdb69c jdk7u14-b11
594dbbbb84add4aa310d51af7e298470d8cda458 jdk7u14-b12
@@ -288,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
@@ -302,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
@@ -312,6 +325,7 @@
d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
b4b7795ef8047e3d2b2ba48a70c08d9184073100 jdk7u14-b19
f413e7a22c198559af5aca28309356e6d4edd78f jdk7u14-b20
+30065a72715f046e4a4bdec1c0cc7d65153c9d99 icedtea-2.4.0
41686e19d8189a546434a52dd9679e9b6a0a68be jdk7u14-b21
3e3177719b43f732239d6d51e96d26ee18440960 jdk7u14-b22
8c6e2197930c79f6beafd83181714cc817b83229 jdk7u40-b23
@@ -322,6 +336,13 @@
ac751f3867ecffca814b25daf5e19d82d83fc755 jdk7u40-b28
dbe42a627813892d1bb59a4240c24f60ef22930a jdk7u40-b29
1c141e6fde911c4974c87e340eb698754607f422 jdk7u40-b30
+ae86c6974e8ee35ef66121810ea9e748b7e677d9 icedtea-2.4.1
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
diff -r a1ae13479e87 -r 930763affcf3 .jcheck/conf
--- a/.jcheck/conf Wed Jul 10 13:48:44 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r a1ae13479e87 -r 930763affcf3 Makefile
--- a/Makefile Wed Jul 10 13:48:44 2013 -0700
+++ 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
diff -r a1ae13479e87 -r 930763affcf3 THIRD_PARTY_README
--- a/THIRD_PARTY_README Wed Jul 10 13:48:44 2013 -0700
+++ 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
diff -r a1ae13479e87 -r 930763affcf3 make/Defs-internal.gmk
--- a/make/Defs-internal.gmk Wed Jul 10 13:48:44 2013 -0700
+++ b/make/Defs-internal.gmk Wed Aug 21 14:21:18 2013 +0100
@@ -322,7 +322,8 @@
JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) \
PREVIOUS_MAJOR_VERSION=$(PREVIOUS_MAJOR_VERSION) \
PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \
- PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION)
+ PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) \
+ STATIC_CXX=$(STATIC_CXX)
ifdef ARCH_DATA_MODEL
COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)
More information about the distro-pkg-dev
mailing list