[SCM] osmosis branch, master, updated. debian/0.31.2-2-52-ga72bb6c

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit 5421775cc57a922112c27eee18105b890b53d825
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Mon Jan 31 01:08:05 2011 +0100

    Trying to use woodstox POMs.

diff --git a/debian/patches/00-fix_build_system.patch b/debian/patches/00-fix_build_system.patch
index c285bdb..e7d5efb 100644
--- a/debian/patches/00-fix_build_system.patch
+++ b/debian/patches/00-fix_build_system.patch
@@ -1,17 +1,18 @@
 ---
  apidb/build.xml                                  |    2 ++
- build-support/config/ant-build-common.properties |    2 +-
+ build-support/config/ant-build-common.properties |    4 ++--
  build-support/script/build-ivy-base.xml          |   11 +++++------
  build-support/script/build-java.xml              |   10 +++++-----
  build.xml                                        |    1 +
+ core/ivy.xml                                     |    2 +-
  extract/build.xml                                |    2 ++
  pgsnapshot/build.xml                             |    2 ++
- 7 files changed, 18 insertions(+), 12 deletions(-)
+ 8 files changed, 20 insertions(+), 14 deletions(-)
 
 Index: osmosis/apidb/build.xml
 ===================================================================
---- osmosis.orig/apidb/build.xml	2011-01-22 22:31:27.000000000 +0100
-+++ osmosis/apidb/build.xml	2011-01-22 22:40:01.000000000 +0100
+--- osmosis.orig/apidb/build.xml	2011-01-25 18:42:15.000000000 +0100
++++ osmosis/apidb/build.xml	2011-01-31 01:05:09.000000000 +0100
 @@ -1,6 +1,8 @@
  <?xml version="1.0" encoding="utf-8" ?>
  <project name="Osmosis.Apidb" default="all" basedir=".">
@@ -23,8 +24,8 @@ Index: osmosis/apidb/build.xml
  	<import file="${build-support.dir}/script/build-java.xml"/>
 Index: osmosis/build-support/script/build-ivy-base.xml
 ===================================================================
---- osmosis.orig/build-support/script/build-ivy-base.xml	2011-01-22 22:31:27.000000000 +0100
-+++ osmosis/build-support/script/build-ivy-base.xml	2011-01-22 22:40:01.000000000 +0100
+--- osmosis.orig/build-support/script/build-ivy-base.xml	2011-01-25 18:42:15.000000000 +0100
++++ osmosis/build-support/script/build-ivy-base.xml	2011-01-31 01:05:09.000000000 +0100
 @@ -9,6 +9,7 @@
  	<!-- Include common build components. -->
  	<property name="build-support.dir" location="../"/>
@@ -64,8 +65,8 @@ Index: osmosis/build-support/script/build-ivy-base.xml
  		<ivy:info />
 Index: osmosis/build-support/script/build-java.xml
 ===================================================================
---- osmosis.orig/build-support/script/build-java.xml	2011-01-22 22:31:27.000000000 +0100
-+++ osmosis/build-support/script/build-java.xml	2011-01-22 22:40:34.000000000 +0100
+--- osmosis.orig/build-support/script/build-java.xml	2011-01-25 18:42:15.000000000 +0100
++++ osmosis/build-support/script/build-java.xml	2011-01-31 01:05:09.000000000 +0100
 @@ -109,12 +109,12 @@
  	</target>
  	
@@ -95,8 +96,8 @@ Index: osmosis/build-support/script/build-java.xml
  					<include name="**/*Test*.class"/>
 Index: osmosis/extract/build.xml
 ===================================================================
---- osmosis.orig/extract/build.xml	2011-01-22 22:31:27.000000000 +0100
-+++ osmosis/extract/build.xml	2011-01-22 22:40:01.000000000 +0100
+--- osmosis.orig/extract/build.xml	2011-01-25 18:42:15.000000000 +0100
++++ osmosis/extract/build.xml	2011-01-31 01:05:09.000000000 +0100
 @@ -1,6 +1,8 @@
  <?xml version="1.0" encoding="utf-8" ?>
  <project name="Osmosis.Extract" default="all" basedir=".">
@@ -108,8 +109,8 @@ Index: osmosis/extract/build.xml
  	<import file="${build-support.dir}/script/build-java.xml"/>
 Index: osmosis/pgsnapshot/build.xml
 ===================================================================
---- osmosis.orig/pgsnapshot/build.xml	2011-01-22 22:31:27.000000000 +0100
-+++ osmosis/pgsnapshot/build.xml	2011-01-22 22:40:01.000000000 +0100
+--- osmosis.orig/pgsnapshot/build.xml	2011-01-25 18:42:15.000000000 +0100
++++ osmosis/pgsnapshot/build.xml	2011-01-31 01:05:09.000000000 +0100
 @@ -1,5 +1,7 @@
  <?xml version="1.0" encoding="utf-8" ?>
  <project name="Osmosis.PgSnapshot" default="all" basedir=".">
@@ -120,8 +121,8 @@ Index: osmosis/pgsnapshot/build.xml
  	<property name="build-support.dir" location="../build-support"/>
 Index: osmosis/build.xml
 ===================================================================
---- osmosis.orig/build.xml	2011-01-22 22:31:27.000000000 +0100
-+++ osmosis/build.xml	2011-01-22 22:40:01.000000000 +0100
+--- osmosis.orig/build.xml	2011-01-25 18:42:15.000000000 +0100
++++ osmosis/build.xml	2011-01-31 01:05:09.000000000 +0100
 @@ -10,6 +10,7 @@
  			<fileset dir=".">
  				<include name="**/build.xml"/>
@@ -132,9 +133,9 @@ Index: osmosis/build.xml
  	</target>
 Index: osmosis/build-support/config/ant-build-common.properties
 ===================================================================
---- osmosis.orig/build-support/config/ant-build-common.properties	2011-01-22 22:31:27.000000000 +0100
-+++ osmosis/build-support/config/ant-build-common.properties	2011-01-22 22:40:01.000000000 +0100
-@@ -10,7 +10,7 @@
+--- osmosis.orig/build-support/config/ant-build-common.properties	2011-01-25 18:42:15.000000000 +0100
++++ osmosis/build-support/config/ant-build-common.properties	2011-01-31 01:06:15.000000000 +0100
+@@ -10,12 +10,12 @@
  dependency.version.osmosis-hstore=0.2
  dependency.version.ivy=2.1.0
  dependency.version.jpf=1.5
@@ -143,3 +144,22 @@ Index: osmosis/build-support/config/ant-build-common.properties
  dependency.version.mysql=5.1.10
  dependency.version.postgis=1.3.3
  dependency.version.postgresql=8.4-701.jdbc4
+ dependency.version.protobuf=2.3.0
+ dependency.version.spring=3.0.3.RELEASE
+-dependency.version.woodstox-core=4.0.3
++dependency.version.woodstox-core=latest.integration
+ dependency.version.woodstox-stax2=3.0.2
+ dependency.version.xerces=2.9.1
+Index: osmosis/core/ivy.xml
+===================================================================
+--- osmosis.orig/core/ivy.xml	2011-01-31 01:06:32.000000000 +0100
++++ osmosis/core/ivy.xml	2011-01-31 01:06:48.000000000 +0100
+@@ -25,7 +25,7 @@
+     
+     <dependencies>
+         <dependency org="net.sf.jpf" name="jpf" rev="${dependency.version.jpf}" conf="compile->default"/>
+-        <dependency org="org.codehaus.woodstox" name="woodstox-core-lgpl" rev="${dependency.version.woodstox-core}" conf="compile->default">
++        <dependency org="org.codehaus.woodstox" name="wstx-lgpl" rev="${dependency.version.woodstox-core}" conf="compile->default">
+ 			<!-- Stax is included in the JDK from java 1.6 onwards. -->
+         	<exclude module="stax-api"/>
+         </dependency>

-- 
Osmosis, an OSM data processor