# HG changeset patch
# User andrew
# Date 1307037494 -3600
# Node ID 738b9b068cefea815d2f940caf9ea9ba214d7c6e
# Parent  0afb765926bca9272790e3f09e8593d9784f3c44# Parent  39bf6dcaab2336326b21743cef7042d0a2de9ba0
Merge

diff -r 0afb765926bc -r 738b9b068cef .hgignore
--- a/.hgignore	Wed Jun 01 17:11:01 2011 +0100
+++ b/.hgignore	Thu Jun 02 18:58:14 2011 +0100
@@ -4,3 +4,4 @@
 ^drop_included/
 ^webrev/
 /nbproject/private/
+^.hgtip
diff -r 0afb765926bc -r 738b9b068cef .hgtags
--- a/.hgtags	Wed Jun 01 17:11:01 2011 +0100
+++ b/.hgtags	Thu Jun 02 18:58:14 2011 +0100
@@ -114,3 +114,10 @@
 4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135
 1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136
 1c2f25bf36b1d43920e94fb82a0afdafd29b1735 icedtea-1.14
+1d87f7460cde7f8f30af668490f82b52b879bfd8 jdk7-b137
+be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138
+28c7c0ed2444607829ba11ad827f8d52197a2830 jdk7-b139
+c8136fd161c83917f87e93b14fa2ba3483f9be83 jdk7-b140
+e1b5ef243445bf836d095fd44866e1771ef99374 jdk7-b141
+7d067af4b25e4b7e6b28bef48527d67f8650e6c5 jdk7-b142
+16b847e9bbd747f9d27785b2fc20d4d720cca893 jdk7-b143
diff -r 0afb765926bc -r 738b9b068cef build-defs.xml
--- a/build-defs.xml	Wed Jun 01 17:11:01 2011 +0100
+++ b/build-defs.xml	Thu Jun 02 18:58:14 2011 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
diff -r 0afb765926bc -r 738b9b068cef build-drop-template.xml
--- a/build-drop-template.xml	Wed Jun 01 17:11:01 2011 +0100
+++ b/build-drop-template.xml	Thu Jun 02 18:58:14 2011 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
diff -r 0afb765926bc -r 738b9b068cef build.xml
--- a/build.xml	Wed Jun 01 17:11:01 2011 +0100
+++ b/build.xml	Thu Jun 02 18:58:14 2011 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
diff -r 0afb765926bc -r 738b9b068cef jaxp.properties
--- a/jaxp.properties	Wed Jun 01 17:11:01 2011 +0100
+++ b/jaxp.properties	Thu Jun 02 18:58:14 2011 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
 
 drops.master.copy.base=${drops.dir}
 
-jaxp_src.bundle.name=jaxp-1_4_5-dev1.zip
-jaxp_src.bundle.md5.checksum=53c95613c29852a12b93e7249f1aa227
+jaxp_src.bundle.name=jaxp-1_4_5.zip
+jaxp_src.bundle.md5.checksum=485e731f26f35d4efe05a63c57104374
 jaxp_src.master.bundle.dir=${drops.master.copy.base}
-jaxp_src.master.bundle.url.base=http://download.java.net/jaxp/1.4.5/dev
+jaxp_src.master.bundle.url.base=http://download.java.net/jaxp/1.4.5
 
-jaxp_tests.bundle.name=jaxp-1_4_5-dev1-unittests.zip
-jaxp_tests.bundle.md5.checksum=754aaba2f4944f69bfea91dec11daf4c
+jaxp_tests.bundle.name=jaxp-1_4_5-unittests.zip
+jaxp_tests.bundle.md5.checksum=fda9b9ad17c459880c077df6ecc7df80
 jaxp_tests.master.bundle.dir=${drops.master.copy.base}
-jaxp_tests.master.bundle.url.base=http://download.java.net/jaxp/1.4.5/dev
+jaxp_tests.master.bundle.url.base=http://download.java.net/jaxp/1.4.5
 
diff -r 0afb765926bc -r 738b9b068cef make/Makefile
--- a/make/Makefile	Wed Jun 01 17:11:01 2011 +0100
+++ b/make/Makefile	Thu Jun 02 18:58:14 2011 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it