The following commit has been merged in the master branch:
commit 1773fa6028a91a3ffe62badf753b7b4e7ae4ec52
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date:   Wed Jan 11 16:52:43 2012 +0100

    Removing references to woodstox, which is not necessary for building 
osmosis.

diff --git a/debian/control b/debian/control
index 88b8fb1..599105b 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,6 @@ Build-Depends:
  , libspring-context-java
  , libspring-jdbc-java
  , libspring-transaction-java
- , libwoodstox-java
  , libstax2-api-java
  , libbatik-java
  , libprotobuf-java
@@ -53,7 +52,6 @@ Depends:
  , libspring-core-java
  , libspring-jdbc-java
  , libspring-transaction-java
- , libwoodstox-java
  , libplexus-classworlds-java
  , libprotobuf-java
  , libosmpbf-java
diff --git a/debian/patches/00-fix_build_system.patch 
b/debian/patches/00-fix_build_system.patch
index a08ed37..8c8f678 100644
--- a/debian/patches/00-fix_build_system.patch
+++ b/debian/patches/00-fix_build_system.patch
@@ -16,8 +16,10 @@ Forwarded: not-needed
  xml/ivy.xml                             |    1 +
  10 files changed, 27 insertions(+), 16 deletions(-)
 
---- osmosis.orig/apidb/build.xml
-+++ osmosis/apidb/build.xml
+Index: osmosis/apidb/build.xml
+===================================================================
+--- osmosis.orig/apidb/build.xml       2012-01-11 16:33:26.000000000 +0100
++++ osmosis/apidb/build.xml    2012-01-11 16:46:53.000000000 +0100
 @@ -1,6 +1,8 @@
  <?xml version="1.0" encoding="utf-8" ?>
  <project name="Osmosis.Apidb" default="all" basedir=".">
@@ -27,8 +29,10 @@ Forwarded: not-needed
        <!-- Include common java build. -->
        <property name="build-support.dir" location="../build-support"/>
        <import file="${build-support.dir}/script/build-java.xml"/>
---- osmosis.orig/build-support/script/build-ivy-base.xml
-+++ osmosis/build-support/script/build-ivy-base.xml
+Index: osmosis/build-support/script/build-ivy-base.xml
+===================================================================
+--- osmosis.orig/build-support/script/build-ivy-base.xml       2012-01-11 
16:33:29.000000000 +0100
++++ osmosis/build-support/script/build-ivy-base.xml    2012-01-11 
16:46:53.000000000 +0100
 @@ -9,6 +9,7 @@
        <!-- Include common build components. -->
        <property name="build-support.dir" location="../"/>
@@ -63,8 +67,10 @@ Forwarded: not-needed
                
                <!-- Retrieve ivy details from the config file. -->
                <ivy:info />
---- osmosis.orig/build-support/script/build-java.xml
-+++ osmosis/build-support/script/build-java.xml
+Index: osmosis/build-support/script/build-java.xml
+===================================================================
+--- osmosis.orig/build-support/script/build-java.xml   2012-01-11 
16:33:29.000000000 +0100
++++ osmosis/build-support/script/build-java.xml        2012-01-11 
16:47:58.000000000 +0100
 @@ -23,6 +23,11 @@
        </path>
        
@@ -136,8 +142,10 @@ Forwarded: not-needed
        <target name="clean" depends="_clean" description="Clean up the project 
tree."/>
        <target name="build" depends="_build" description="Builds the main 
project target."/>
  </project>
---- osmosis.orig/extract/build.xml
-+++ osmosis/extract/build.xml
+Index: osmosis/extract/build.xml
+===================================================================
+--- osmosis.orig/extract/build.xml     2012-01-11 16:33:26.000000000 +0100
++++ osmosis/extract/build.xml  2012-01-11 16:46:53.000000000 +0100
 @@ -1,6 +1,8 @@
  <?xml version="1.0" encoding="utf-8" ?>
  <project name="Osmosis.Extract" default="all" basedir=".">
@@ -147,8 +155,10 @@ Forwarded: not-needed
        <!-- Include common java build. -->
        <property name="build-support.dir" location="../build-support"/>
        <import file="${build-support.dir}/script/build-java.xml"/>
---- osmosis.orig/pgsnapshot/build.xml
-+++ osmosis/pgsnapshot/build.xml
+Index: osmosis/pgsnapshot/build.xml
+===================================================================
+--- osmosis.orig/pgsnapshot/build.xml  2012-01-11 16:33:26.000000000 +0100
++++ osmosis/pgsnapshot/build.xml       2012-01-11 16:46:53.000000000 +0100
 @@ -1,5 +1,7 @@
  <?xml version="1.0" encoding="utf-8" ?>
  <project name="Osmosis.PgSnapshot" default="all" basedir=".">
@@ -157,8 +167,10 @@ Forwarded: not-needed
        
        <!-- Include common java build. -->
        <property name="build-support.dir" location="../build-support"/>
---- osmosis.orig/build.xml
-+++ osmosis/build.xml
+Index: osmosis/build.xml
+===================================================================
+--- osmosis.orig/build.xml     2012-01-11 16:33:26.000000000 +0100
++++ osmosis/build.xml  2012-01-11 16:46:53.000000000 +0100
 @@ -10,6 +10,7 @@
                        <fileset dir=".">
                                <include name="**/build.xml"/>
@@ -167,19 +179,10 @@ Forwarded: not-needed
                        </fileset>
                </ivy:buildlist>
        </target>
---- osmosis.orig/core/ivy.xml
-+++ osmosis/core/ivy.xml
-@@ -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.orig/pgsimple/ivy.xml
-+++ osmosis/pgsimple/ivy.xml
+Index: osmosis/pgsimple/ivy.xml
+===================================================================
+--- osmosis.orig/pgsimple/ivy.xml      2012-01-11 16:33:29.000000000 +0100
++++ osmosis/pgsimple/ivy.xml   2012-01-11 16:46:53.000000000 +0100
 @@ -32,7 +32,7 @@
        <!--<dependency org="org.springframework" name="spring-jdbc" 
rev="${dependency.version.spring}" conf="compile->default"/>-->
          <!--<dependency org="commons-dbcp" name="commons-dbcp" 
rev="${dependency.version.commons-dbcp}" conf="compile->default"/>-->
@@ -189,8 +192,10 @@ Forwarded: not-needed
                <exclude module="postgis-stubs"/>
          </dependency>
          
---- osmosis.orig/pgsnapshot/ivy.xml
-+++ osmosis/pgsnapshot/ivy.xml
+Index: osmosis/pgsnapshot/ivy.xml
+===================================================================
+--- osmosis.orig/pgsnapshot/ivy.xml    2012-01-11 16:33:29.000000000 +0100
++++ osmosis/pgsnapshot/ivy.xml 2012-01-11 16:46:53.000000000 +0100
 @@ -33,7 +33,7 @@
        <dependency org="org.springframework" name="spring-jdbc" 
rev="${dependency.version.spring}" conf="compile->default"/>
          <dependency org="commons-dbcp" name="commons-dbcp" 
rev="${dependency.version.commons-dbcp}" conf="compile->default"/>
@@ -200,8 +205,10 @@ Forwarded: not-needed
                <exclude module="postgis-stubs"/>
          </dependency>
          
---- osmosis.orig/xml/ivy.xml
-+++ osmosis/xml/ivy.xml
+Index: osmosis/xml/ivy.xml
+===================================================================
+--- osmosis.orig/xml/ivy.xml   2012-01-11 16:33:29.000000000 +0100
++++ osmosis/xml/ivy.xml        2012-01-11 16:46:53.000000000 +0100
 @@ -31,5 +31,6 @@
          <dependency org="org.openstreetmap.osmosis" name="osmosis-testutil" 
rev="${project.version}" conf="test->default" changing="true"/>
          <dependency org="junit" name="junit" 
rev="${dependency.version.junit}" conf="test->default"/>
diff --git a/debian/patches/01-fix_launcher.patch 
b/debian/patches/01-fix_launcher.patch
index 85cdd77..8e6b3d6 100644
--- a/debian/patches/01-fix_launcher.patch
+++ b/debian/patches/01-fix_launcher.patch
@@ -6,8 +6,10 @@ Forwarded: not-needed
  package/bin/osmosis |   18 ++++++++++--------
  1 file changed, 10 insertions(+), 8 deletions(-)
 
---- osmosis.orig/package/bin/osmosis
-+++ osmosis/package/bin/osmosis
+Index: osmosis/package/bin/osmosis
+===================================================================
+--- osmosis.orig/package/bin/osmosis   2012-01-11 16:33:29.000000000 +0100
++++ osmosis/package/bin/osmosis        2012-01-11 16:46:53.000000000 +0100
 @@ -5,8 +5,8 @@
  # JAVACMD_OPTIONS - The options to append to the java command, typically used 
to modify jvm settings such as max memory.
  # OSMOSIS_OPTIONS - The options to apply to all osmosis invocations, 
typically used to add plugins or make quiet operation the default.
@@ -19,7 +21,7 @@ Forwarded: not-needed
  fi
  
  if [ -f "$HOME/.osmosis" ] ; then
-@@ -80,15 +80,17 @@ exit 1
+@@ -80,15 +80,17 @@
  fi
  
  # make it fully qualified
diff --git a/debian/patches/02-fix_plexus.patch 
b/debian/patches/02-fix_plexus.patch
index 240c48c..f750d95 100644
--- a/debian/patches/02-fix_plexus.patch
+++ b/debian/patches/02-fix_plexus.patch
@@ -3,12 +3,14 @@ Subject: fix Plexus configuration with the right paths
 Forwarded: not-needed
 
 ---
- package/config/plexus.conf |   19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
+ package/config/plexus.conf |   18 +++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
 
---- osmosis.orig/package/config/plexus.conf
-+++ osmosis/package/config/plexus.conf
-@@ -1,5 +1,20 @@
+Index: osmosis/package/config/plexus.conf
+===================================================================
+--- osmosis.orig/package/config/plexus.conf    2012-01-11 16:33:26.000000000 
+0100
++++ osmosis/package/config/plexus.conf 2012-01-11 16:46:53.000000000 +0100
+@@ -1,5 +1,18 @@
  main is org.openstreetmap.osmosis.core.Osmosis from osmosis.core
  
  [osmosis.core]
@@ -25,9 +27,7 @@ Forwarded: not-needed
 +load /usr/share/java/spring3-core.jar
 +load /usr/share/java/spring3-jdbc.jar
 +load /usr/share/java/spring3-transaction.jar
-+load /usr/share/java/wstx-lgpl.jar
 +load /usr/share/java/batik-ext.jar
 +load /usr/share/java/protobuf-java.jar
 +load /usr/share/java/osmpbf.jar
 +load /usr/share/java/commons-pool.jar
-+load ${app.home}/*.jar
diff --git a/debian/patches/03-create_manifest.patch 
b/debian/patches/03-create_manifest.patch
index 5418709..9b6f88e 100644
--- a/debian/patches/03-create_manifest.patch
+++ b/debian/patches/03-create_manifest.patch
@@ -20,8 +20,10 @@ Forwarded: not-needed
  xml/jar.properties                  |    1 +
  14 files changed, 17 insertions(+), 1 deletion(-)
 
---- osmosis.orig/build-support/script/build-java.xml
-+++ osmosis/build-support/script/build-java.xml
+Index: osmosis/build-support/script/build-java.xml
+===================================================================
+--- osmosis.orig/build-support/script/build-java.xml   2012-01-11 
16:46:53.000000000 +0100
++++ osmosis/build-support/script/build-java.xml        2012-01-11 
16:46:53.000000000 +0100
 @@ -62,11 +62,14 @@
        <target name="_build" depends="build_src" description="Generates the 
binaries for the distribution.">
                <!-- Create the binary directory -->
@@ -38,55 +40,81 @@ Forwarded: not-needed
                        <attribute name="Implementation-Title" value="Osmosis 
Library"/>
                        <attribute name="Implementation-Version" 
value="${project.version} (${TODAY})"/> 
                        <attribute name="Implementation-Vendor" value="Brett 
Henderson"/>
---- /dev/null
-+++ osmosis/apidb/jar.properties
+Index: osmosis/apidb/jar.properties
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ osmosis/apidb/jar.properties       2012-01-11 16:46:53.000000000 +0100
 @@ -0,0 +1 @@
 +jar.classpath=/usr/share/osmosis/osmosis-core.jar 
/usr/share/osmosis/osmosis-replication.jar /usr/share/osmosis/osmosis-xml.jar 
/usr/share/java/spring3-jdbc.jar /usr/share/java/commons-dbcp.jar 
/usr/share/java/postgresql.jar /usr/share/java/mysql-connector-java.jar
---- /dev/null
-+++ osmosis/areafilter/jar.properties
+Index: osmosis/areafilter/jar.properties
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ osmosis/areafilter/jar.properties  2012-01-11 16:46:53.000000000 +0100
 @@ -0,0 +1 @@
 +jar.classpath=/usr/share/osmosis/osmosis-core.jar 
/usr/share/osmosis/osmosis-xml.jar /usr/share/java/postgresql.jar 
/usr/share/java/mysql-connector-java.jar
---- /dev/null
-+++ osmosis/core/jar.properties
+Index: osmosis/core/jar.properties
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ osmosis/core/jar.properties        2012-01-11 16:46:53.000000000 +0100
 @@ -0,0 +1 @@
-+jar.classpath=/usr/share/java/jpf.jar /usr/share/java/wstx-lgpl.jar 
/usr/share/java/stax2-api.jar /usr/share/java/commons-compress.jar 
/usr/share/java/xercesImpl.jar
---- /dev/null
-+++ osmosis/dataset/jar.properties
++jar.classpath=/usr/share/java/jpf.jar /usr/share/java/stax2-api.jar 
/usr/share/java/commons-compress.jar /usr/share/java/xercesImpl.jar
+Index: osmosis/dataset/jar.properties
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ osmosis/dataset/jar.properties     2012-01-11 16:46:53.000000000 +0100
 @@ -0,0 +1 @@
 +jar.classpath=/usr/share/osmosis/osmosis-core.jar 
/usr/share/osmosis/osmosis-xml.jar
---- /dev/null
-+++ osmosis/extract/jar.properties
+Index: osmosis/extract/jar.properties
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ osmosis/extract/jar.properties     2012-01-11 16:46:53.000000000 +0100
 @@ -0,0 +1 @@
 +jar.classpath=/usr/share/osmosis/osmosis-core.jar 
/usr/share/osmosis/osmosis-apidb.jar /usr/share/osmosis/osmosis-replication.jar 
/usr/share/osmosis/osmosis-xml.jar
---- /dev/null
-+++ osmosis/hstore-jdbc/jar.properties
+Index: osmosis/hstore-jdbc/jar.properties
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ osmosis/hstore-jdbc/jar.properties 2012-01-11 16:46:53.000000000 +0100
 @@ -0,0 +1 @@
 +jar.classpath=/usr/share/java/postgresql.jar
---- /dev/null
-+++ osmosis/pbf/jar.properties
+Index: osmosis/pbf/jar.properties
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ osmosis/pbf/jar.properties 2012-01-11 16:46:53.000000000 +0100
 @@ -0,0 +1 @@
 +jar.classpath=/usr/share/osmosis/osmosis-core.jar 
/usr/share/java/protobuf-java.jar /usr/share/java/osmpbf.jar
---- /dev/null
-+++ osmosis/pgsimple/jar.properties
+Index: osmosis/pgsimple/jar.properties
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ osmosis/pgsimple/jar.properties    2012-01-11 16:46:53.000000000 +0100
 @@ -0,0 +1 @@
 +jar.classpath=/usr/share/osmosis-core.jar /usr/share/osmosis-dataset.jar 
/usr/share/osmosis-xml.jar /usr/share/java/spring3-jdbc.jar 
/usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar 
/usr/share/java/postgis.jar
---- /dev/null
-+++ osmosis/pgsnapshot/jar.properties
+Index: osmosis/pgsnapshot/jar.properties
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ osmosis/pgsnapshot/jar.properties  2012-01-11 16:46:53.000000000 +0100
 @@ -0,0 +1 @@
 +jar.classpath=/usr/share/osmosis/osmosis-core.jar 
/usr/share/osmosis/osmosis-hstore.jar /usr/share/osmosis/osmosis-dataset.jar 
/usr/share/osmosis/osmosis-xml.jar /usr/share/java/spring3-jdbc.jar 
/usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar 
/usr/share/java/postgis.jar
---- /dev/null
-+++ osmosis/replication/jar.properties
+Index: osmosis/replication/jar.properties
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ osmosis/replication/jar.properties 2012-01-11 16:46:53.000000000 +0100
 @@ -0,0 +1 @@
 +jar.classpath=/usr/share/osmosis/osmosis-core.jar 
/usr/share/osmosis/osmosis-set.jar /usr/share/osmosis/osmosis-xml.jar
---- /dev/null
-+++ osmosis/set/jar.properties
+Index: osmosis/set/jar.properties
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ osmosis/set/jar.properties 2012-01-11 16:46:53.000000000 +0100
 @@ -0,0 +1 @@
 +jar.classpath=/usr/share/osmosis/osmosis-core.jar 
/usr/share/osmosis/osmosis-xml.jar
---- /dev/null
-+++ osmosis/tagfilter/jar.properties
+Index: osmosis/tagfilter/jar.properties
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ osmosis/tagfilter/jar.properties   2012-01-11 16:46:53.000000000 +0100
 @@ -0,0 +1 @@
 +jar.classpath=/usr/share/osmosis/osmosis-core.jar 
/usr/share/osmosis/osmosis-xml.jar
---- /dev/null
-+++ osmosis/xml/jar.properties
+Index: osmosis/xml/jar.properties
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ osmosis/xml/jar.properties 2012-01-11 16:46:53.000000000 +0100
 @@ -0,0 +1 @@
 +jar.classpath=/usr/share/osmosis/osmosis-core.jar 
/usr/share/java/commons-codec.jar /usr/share/java/commons-compress.jar
diff --git a/debian/patches/04-fix_dependencies_versions.patch 
b/debian/patches/04-fix_dependencies_versions.patch
index 39a669f..99707e9 100644
--- a/debian/patches/04-fix_dependencies_versions.patch
+++ b/debian/patches/04-fix_dependencies_versions.patch
@@ -8,9 +8,11 @@ Forwarded: not-needed
  build-support/config/ant-build-common.properties |   16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
---- osmosis.orig/build-support/config/ant-build-common.properties
-+++ osmosis/build-support/config/ant-build-common.properties
-@@ -2,19 +2,19 @@
+Index: osmosis/build-support/config/ant-build-common.properties
+===================================================================
+--- osmosis.orig/build-support/config/ant-build-common.properties      
2012-01-11 16:33:29.000000000 +0100
++++ osmosis/build-support/config/ant-build-common.properties   2012-01-11 
16:46:53.000000000 +0100
+@@ -2,19 +2,17 @@
  
  # 3rd Party Library Versions
  dependency.version.checkstyle=5.4
@@ -34,7 +36,5 @@ Forwarded: not-needed
  dependency.version.protobuf=2.4.1
  dependency.version.spring=3.0.6.RELEASE
 -dependency.version.woodstox-core=4.1.2
-+dependency.version.woodstox-core=debian
  dependency.version.woodstox-stax2=3.1.1
 -dependency.version.xerces=2.9.1
-+dependency.version.xerces=debian
diff --git a/debian/patches/05-workaround_missing_junit4.10.patch 
b/debian/patches/05-workaround_missing_junit4.10.patch
index 691a7e1..9d5f16c 100644
--- a/debian/patches/05-workaround_missing_junit4.10.patch
+++ b/debian/patches/05-workaround_missing_junit4.10.patch
@@ -17,9 +17,11 @@ Forwarded: not-needed
  xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlReaderWriterTest.java 
         |    6 +++--
  11 files changed, 28 insertions(+), 22 deletions(-)
 
---- 
osmosis.orig/testutil/src/main/java/org/openstreetmap/osmosis/testutil/TestDataUtilities.java
-+++ 
osmosis/testutil/src/main/java/org/openstreetmap/osmosis/testutil/TestDataUtilities.java
-@@ -51,7 +51,7 @@ public class TestDataUtilities extends T
+Index: 
osmosis/testutil/src/main/java/org/openstreetmap/osmosis/testutil/TestDataUtilities.java
+===================================================================
+--- 
osmosis.orig/testutil/src/main/java/org/openstreetmap/osmosis/testutil/TestDataUtilities.java
      2012-01-11 16:33:29.000000000 +0100
++++ 
osmosis/testutil/src/main/java/org/openstreetmap/osmosis/testutil/TestDataUtilities.java
   2012-01-11 16:46:53.000000000 +0100
+@@ -51,7 +51,7 @@
                                        "/data/template/" + dataFileName), 
UTF8));
  
                        // Create a temporary file and open it.
@@ -28,9 +30,11 @@ Forwarded: not-needed
                        dataWriter = new BufferedWriter(new 
OutputStreamWriter(new FileOutputStream(tmpFile), UTF8));
  
                        // Copy all data into the temp file replacing the 
version string.
---- 
osmosis.orig/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlChangeReaderWriterTest.java
-+++ 
osmosis/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlChangeReaderWriterTest.java
-@@ -32,7 +32,7 @@ public class XmlChangeReaderWriterTest e
+Index: 
osmosis/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlChangeReaderWriterTest.java
+===================================================================
+--- 
osmosis.orig/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlChangeReaderWriterTest.java
   2012-01-11 16:33:29.000000000 +0100
++++ 
osmosis/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlChangeReaderWriterTest.java
        2012-01-11 16:46:53.000000000 +0100
+@@ -32,7 +32,7 @@
                File outputFile;
                
                inputFile = 
dataUtils.createDataFile("v0_6/xml-task-tests-v0_6.osc");
@@ -39,9 +43,11 @@ Forwarded: not-needed
                
                // Create and connect the xml tasks.
                xmlReader = new XmlChangeReader(inputFile, true, 
CompressionMethod.None);
---- 
osmosis.orig/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlReaderWriterTest.java
-+++ 
osmosis/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlReaderWriterTest.java
-@@ -30,7 +30,7 @@ public class XmlReaderWriterTest extends
+Index: 
osmosis/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlReaderWriterTest.java
+===================================================================
+--- 
osmosis.orig/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlReaderWriterTest.java
 2012-01-11 16:33:29.000000000 +0100
++++ 
osmosis/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlReaderWriterTest.java
      2012-01-11 16:46:53.000000000 +0100
+@@ -30,7 +30,7 @@
                
                // Generate input files.
                inputFile = 
dataUtils.createDataFile("v0_6/xml-task-tests-v0_6.osm");
@@ -50,7 +56,7 @@ Forwarded: not-needed
                
                // Run the pipeline.
                Osmosis.run(
-@@ -64,7 +64,9 @@ public class XmlReaderWriterTest extends
+@@ -64,7 +64,9 @@
                
                // Generate input files.
                uncompressedFile = 
dataUtils.createDataFile("v0_6/xml-task-tests-v0_6.osm");
@@ -61,9 +67,11 @@ Forwarded: not-needed
                inputFile = new File(workingFolder, "testin.osm.gz");
                outputFile = new File(workingFolder, "testout.osm.gz");
                dataUtils.compressFile(uncompressedFile, inputFile);
---- 
osmosis.orig/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeAppenderTest.java
-+++ 
osmosis/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeAppenderTest.java
-@@ -33,7 +33,7 @@ public class ChangeAppenderTest extends
+Index: 
osmosis/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeAppenderTest.java
+===================================================================
+--- 
osmosis.orig/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeAppenderTest.java
  2012-01-11 16:33:29.000000000 +0100
++++ 
osmosis/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeAppenderTest.java
       2012-01-11 16:46:53.000000000 +0100
+@@ -33,7 +33,7 @@
                sourceFile1 = 
dataUtils.createDataFile("v0_6/append-change-in1.osc");
                sourceFile2 = 
dataUtils.createDataFile("v0_6/append-change-in2.osc");
                expectedOutputFile = 
dataUtils.createDataFile("v0_6/append-change-out.osc");
@@ -72,9 +80,11 @@ Forwarded: not-needed
                
                // Append the two source files into the destination file.
                Osmosis.run(
---- 
osmosis.orig/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeSimplifierTest.java
-+++ 
osmosis/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeSimplifierTest.java
-@@ -29,7 +29,7 @@ public class ChangeSimplifierTest extend
+Index: 
osmosis/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeSimplifierTest.java
+===================================================================
+--- 
osmosis.orig/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeSimplifierTest.java
        2012-01-11 16:33:29.000000000 +0100
++++ 
osmosis/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeSimplifierTest.java
     2012-01-11 16:46:53.000000000 +0100
+@@ -29,7 +29,7 @@
                // Generate files.
                sourceFile = 
dataUtils.createDataFile("v0_6/simplify-change-in.osc");
                expectedOutputFile = 
dataUtils.createDataFile("v0_6/simplify-change-out.osc");
@@ -83,9 +93,11 @@ Forwarded: not-needed
                
                // Append the two source files into the destination file.
                Osmosis.run(
---- 
osmosis.orig/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApiDbTest.java
-+++ 
osmosis/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApiDbTest.java
-@@ -57,7 +57,7 @@ public class ApiDbTest extends AbstractD
+Index: 
osmosis/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApiDbTest.java
+===================================================================
+--- 
osmosis.orig/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApiDbTest.java
       2012-01-11 16:33:29.000000000 +0100
++++ 
osmosis/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApiDbTest.java 
   2012-01-11 16:46:53.000000000 +0100
+@@ -57,7 +57,7 @@
          // Generate input files.
          authFile = dbUtils.getAuthorizationFile();
          inputFile = dataUtils.createDataFile("v0_6/db-snapshot.osm");
@@ -94,9 +106,11 @@ Forwarded: not-needed
  
          // Remove all existing data from the database.
          dbUtils.truncateDatabase();
---- 
osmosis.orig/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbFileReplicatorTest.java
-+++ 
osmosis/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbFileReplicatorTest.java
-@@ -35,8 +35,10 @@ public class ApidbFileReplicatorTest ext
+Index: 
osmosis/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbFileReplicatorTest.java
+===================================================================
+--- 
osmosis.orig/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbFileReplicatorTest.java
 2012-01-11 16:33:29.000000000 +0100
++++ 
osmosis/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbFileReplicatorTest.java
      2012-01-11 16:46:53.000000000 +0100
+@@ -35,8 +35,10 @@
          authFile = dbUtils.getAuthorizationFile();
          snapshotFile = dataUtils.createDataFile("v0_6/db-snapshot.osm");
          changesetFile = 
dataUtils.createDataFile("v0_6/db-replicate-changeset.osc");
@@ -109,9 +123,11 @@ Forwarded: not-needed
  
          // Remove all existing data from the database.
          dbUtils.truncateDatabase();
---- 
osmosis.orig/areafilter/src/test/java/org/openstreetmap/osmosis/areafilter/v0_6/AreaFilterTest.java
-+++ 
osmosis/areafilter/src/test/java/org/openstreetmap/osmosis/areafilter/v0_6/AreaFilterTest.java
-@@ -29,7 +29,7 @@ public class AreaFilterTest extends Abst
+Index: 
osmosis/areafilter/src/test/java/org/openstreetmap/osmosis/areafilter/v0_6/AreaFilterTest.java
+===================================================================
+--- 
osmosis.orig/areafilter/src/test/java/org/openstreetmap/osmosis/areafilter/v0_6/AreaFilterTest.java
        2012-01-11 16:33:29.000000000 +0100
++++ 
osmosis/areafilter/src/test/java/org/openstreetmap/osmosis/areafilter/v0_6/AreaFilterTest.java
     2012-01-11 16:46:53.000000000 +0100
+@@ -29,7 +29,7 @@
                // Generate input files.
                inputFile = dataUtils.createDataFile("v0_6/areafilter-in.osm");
                expectedOutputFile = 
dataUtils.createDataFile("v0_6/areafilter-out-whole.osm");
@@ -120,7 +136,7 @@ Forwarded: not-needed
                
                // Load the database with a dataset.
                Osmosis.run(
-@@ -64,7 +64,7 @@ public class AreaFilterTest extends Abst
+@@ -64,7 +64,7 @@
                // Generate input files.
                inputFile = dataUtils.createDataFile("v0_6/areafilter-in.osm");
                expectedOutputFile = 
dataUtils.createDataFile("v0_6/areafilter-out-standard.osm");
@@ -129,7 +145,7 @@ Forwarded: not-needed
                
                // Load the database with a dataset.
                Osmosis.run(
-@@ -98,7 +98,7 @@ public class AreaFilterTest extends Abst
+@@ -98,7 +98,7 @@
                // Generate input files.
                inputFile = dataUtils.createDataFile("v0_6/areafilter-in.osm");
                expectedOutputFile = 
dataUtils.createDataFile("v0_6/areafilter-out-cascadingrelations.osm");
@@ -138,7 +154,7 @@ Forwarded: not-needed
                
                // Load the database with a dataset.
                Osmosis.run(
-@@ -133,7 +133,7 @@ public class AreaFilterTest extends Abst
+@@ -133,7 +133,7 @@
                // Generate input files.
                inputFile = dataUtils.createDataFile("v0_6/areafilter-in.osm");
                expectedOutputFile = 
dataUtils.createDataFile("v0_6/areafilter-out-completeways.osm");
@@ -147,7 +163,7 @@ Forwarded: not-needed
                
                // Load the database with a dataset.
                Osmosis.run(
-@@ -168,7 +168,7 @@ public class AreaFilterTest extends Abst
+@@ -168,7 +168,7 @@
                // Generate input files.
                inputFile = dataUtils.createDataFile("v0_6/areafilter-in.osm");
                expectedOutputFile = 
dataUtils.createDataFile("v0_6/areafilter-out-completerelations.osm");
@@ -156,7 +172,7 @@ Forwarded: not-needed
                
                // Load the database with a dataset.
                Osmosis.run(
-@@ -203,7 +203,7 @@ public class AreaFilterTest extends Abst
+@@ -203,7 +203,7 @@
                // Generate input files.
                inputFile = dataUtils.createDataFile("v0_6/areafilter-in.osm");
                expectedOutputFile = 
dataUtils.createDataFile("v0_6/areafilter-out-clipincompleteentities.osm");
@@ -165,9 +181,11 @@ Forwarded: not-needed
                
                // Load the database with a dataset.
                Osmosis.run(
---- 
osmosis.orig/dataset/src/test/java/org/openstreetmap/osmosis/dataset/v0_6/CustomDbTest.java
-+++ 
osmosis/dataset/src/test/java/org/openstreetmap/osmosis/dataset/v0_6/CustomDbTest.java
-@@ -32,7 +32,9 @@ public class CustomDbTest extends Abstra
+Index: 
osmosis/dataset/src/test/java/org/openstreetmap/osmosis/dataset/v0_6/CustomDbTest.java
+===================================================================
+--- 
osmosis.orig/dataset/src/test/java/org/openstreetmap/osmosis/dataset/v0_6/CustomDbTest.java
        2012-01-11 16:33:29.000000000 +0100
++++ 
osmosis/dataset/src/test/java/org/openstreetmap/osmosis/dataset/v0_6/CustomDbTest.java
     2012-01-11 16:46:53.000000000 +0100
+@@ -32,7 +32,9 @@
                // Generate input files.
                inputFile = 
dataUtils.createDataFile("v0_6/customdb-snapshot.osm");
                outputFile = File.createTempFile("test", ".osm");
@@ -178,9 +196,11 @@ Forwarded: not-needed
                
                // Load the database with a dataset.
                Osmosis.run(
---- 
osmosis.orig/pgsnapshot/src/test/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/PostgreSqlTest.java
-+++ 
osmosis/pgsnapshot/src/test/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/PostgreSqlTest.java
-@@ -37,7 +37,7 @@ public class PostgreSqlTest extends Abst
+Index: 
osmosis/pgsnapshot/src/test/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/PostgreSqlTest.java
+===================================================================
+--- 
osmosis.orig/pgsnapshot/src/test/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/PostgreSqlTest.java
        2012-01-11 16:33:29.000000000 +0100
++++ 
osmosis/pgsnapshot/src/test/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/PostgreSqlTest.java
     2012-01-11 16:46:53.000000000 +0100
+@@ -37,7 +37,7 @@
                // Generate input files.
                authFile = getAuthFile();
                inputFile = dataUtils.createDataFile("v0_6/db-snapshot.osm");
@@ -189,7 +209,7 @@ Forwarded: not-needed
                
                // Remove all existing data from the database.
                Osmosis.run(
-@@ -97,7 +97,7 @@ public class PostgreSqlTest extends Abst
+@@ -97,7 +97,7 @@
                snapshotFile = dataUtils.createDataFile("v0_6/db-snapshot.osm");
                changesetFile = 
dataUtils.createDataFile("v0_6/db-changeset.osc");
                expectedResultFile = 
dataUtils.createDataFile("v0_6/db-changeset-expected.osm");
@@ -198,7 +218,7 @@ Forwarded: not-needed
                
                // Remove all existing data from the database.
                Osmosis.run(
-@@ -166,7 +166,7 @@ public class PostgreSqlTest extends Abst
+@@ -166,7 +166,7 @@
                authFile = getAuthFile();
                snapshotFile = dataUtils.createDataFile("v0_6/db-snapshot.osm");
                expectedResultFile = 
dataUtils.createDataFile("v0_6/db-dataset-expected.osm");
@@ -207,7 +227,7 @@ Forwarded: not-needed
                
                // Remove all existing data from the database.
                Osmosis.run(
-@@ -235,7 +235,7 @@ public class PostgreSqlTest extends Abst
+@@ -235,7 +235,7 @@
                // Generate input files.
                authFile = getAuthFile();
                inputFile = dataUtils.createDataFile("v0_6/db-snapshot.osm");
@@ -216,9 +236,11 @@ Forwarded: not-needed
                
                // Remove all existing data from the database.
                Osmosis.run(
---- 
osmosis.orig/tagfilter/src/test/java/org/openstreetmap/osmosis/tagfilter/v0_6/TagRemoverTest.java
-+++ 
osmosis/tagfilter/src/test/java/org/openstreetmap/osmosis/tagfilter/v0_6/TagRemoverTest.java
-@@ -30,7 +30,7 @@ public class TagRemoverTest extends Abst
+Index: 
osmosis/tagfilter/src/test/java/org/openstreetmap/osmosis/tagfilter/v0_6/TagRemoverTest.java
+===================================================================
+--- 
osmosis.orig/tagfilter/src/test/java/org/openstreetmap/osmosis/tagfilter/v0_6/TagRemoverTest.java
  2012-01-11 16:33:29.000000000 +0100
++++ 
osmosis/tagfilter/src/test/java/org/openstreetmap/osmosis/tagfilter/v0_6/TagRemoverTest.java
       2012-01-11 16:46:53.000000000 +0100
+@@ -30,7 +30,7 @@
                
                inputFile = 
dataUtils.createDataFile("v0_6/tag-remove-snapshot.osm");
                expectedResultFile = 
dataUtils.createDataFile("v0_6/tag-remove-expected.osm");
@@ -227,7 +249,7 @@ Forwarded: not-needed
                
                // Remove all created_by tags.
                Osmosis.run(
-@@ -64,7 +64,7 @@ public class TagRemoverTest extends Abst
+@@ -64,7 +64,7 @@
                
                inputFile = 
dataUtils.createDataFile("v0_6/tag-remove-snapshot.osm");
                expectedResultFile = 
dataUtils.createDataFile("v0_6/tag-remove-expected.osm");
diff --git a/debian/patches/06-no-woodstox.patch 
b/debian/patches/06-no-woodstox.patch
new file mode 100644
index 0000000..72a7168
--- /dev/null
+++ b/debian/patches/06-no-woodstox.patch
@@ -0,0 +1,15 @@
+Index: osmosis/core/ivy.xml
+===================================================================
+--- osmosis.orig/core/ivy.xml  2012-01-11 16:33:29.000000000 +0100
++++ osmosis/core/ivy.xml       2012-01-11 16:51:16.000000000 +0100
+@@ -25,10 +25,6 @@
+     
+     <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">
+-                      <!-- Stax is included in the JDK from java 1.6 onwards. 
-->
+-              <exclude module="stax-api"/>
+-        </dependency>
+         <!-- Include this explicitly to increase the version number.  The 
default transitively included one has incorrect sha-1 checksums. -->
+         <dependency org="org.codehaus.woodstox" name="stax2-api" 
rev="${dependency.version.woodstox-stax2}" conf="compile->default">
+                       <!-- Stax is included in the JDK from java 1.6 onwards. 
-->
diff --git a/debian/patches/series b/debian/patches/series
index 5353d38..f2c44ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 03-create_manifest.patch
 04-fix_dependencies_versions.patch
 05-workaround_missing_junit4.10.patch
+06-no-woodstox.patch
diff --git a/debian/rules b/debian/rules
index 6f5d7d4..33220aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,6 @@ export JAVA_HOME := /usr/lib/jvm/default-java/
 DEB_JARS := /usr/share/java/mysql-connector-java.jar
 DEB_JARS += /usr/share/java/postgis.jar
 DEB_JARS += /usr/share/java/postgresql.jar
-DEB_JARS += /usr/share/java/wstx-lgpl.jar
 DEB_JARS += /usr/share/java/junit4.jar
 DEB_JARS += /usr/share/java/ant-junit.jar
 DEB_JARS += /usr/share/java/spring3-core.jar

-- 
Osmosis, an OSM data processor

_______________________________________________
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits

Reply via email to