changeset 303:f2dcb5ade608 jdk7u2-b09

Merge
author asaha
date Fri, 23 Sep 2011 12:01:45 -0700
parents 1ee71a1349c4 (diff) 38711a9aabde (current diff)
children 0e4b561f7696
files .hgtags
diffstat 3 files changed, 11 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Sep 23 11:29:51 2011 -0700
+++ b/.hgtags	Fri Sep 23 12:01:45 2011 -0700
@@ -127,3 +127,9 @@
 64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03
 2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04
 79ec2a8c8aaf015e888e8997abd4767d216b4037 jdk7u1-b05
+6c9ac74190a073bcee616a39f8fc5c6b2a501ce1 jdk7u2-b01
+4b0c44f2f7f13e4a44497d8d8cd8dcef5bb29d0b jdk7u2-b04
+06ec99824fc7473d1b73e3d0a37f7e046d9be5ca jdk7u2-b05
+5946b073c57a340cc566414cd50c954c044576e1 jdk7u2-b06
+323d917b683e94c1bdca51c31b257ec492a106a6 jdk7u2-b07
+db8ccf2cbb339005a5b90ec0ca825db43c130e20 jdk7u2-b08
--- a/.jcheck/conf	Fri Sep 23 11:29:51 2011 -0700
+++ b/.jcheck/conf	Fri Sep 23 12:01:45 2011 -0700
@@ -1,1 +1,2 @@
 project=jdk7
+bugids=dup
--- a/jaxp.properties	Fri Sep 23 11:29:51 2011 -0700
+++ b/jaxp.properties	Fri Sep 23 12:01:45 2011 -0700
@@ -25,13 +25,13 @@
 
 drops.master.copy.base=${drops.dir}
 
-jaxp_src.bundle.name=jaxp145_01.zip
-jaxp_src.bundle.md5.checksum=32394c780c8fb5e29775f623525993c0
+jaxp_src.bundle.name=jaxp145update1.zip
+jaxp_src.bundle.md5.checksum=f984f2c62894ce7f38d9d6f635140a56
 jaxp_src.master.bundle.dir=${drops.master.copy.base}
 jaxp_src.master.bundle.url.base=http://download.java.net/jaxp/1.4.5
 
-jaxp_tests.bundle.name=jaxp-1_4_5-unittests.zip
-jaxp_tests.bundle.md5.checksum=fda9b9ad17c459880c077df6ecc7df80
+jaxp_tests.bundle.name=jaxp145update1_unittests.zip
+jaxp_tests.bundle.md5.checksum=5e9ceab4130e84ceeec85d1de778313a
 jaxp_tests.master.bundle.dir=${drops.master.copy.base}
 jaxp_tests.master.bundle.url.base=http://download.java.net/jaxp/1.4.5