debian/changelog

-osmosis (0.47-4) UNRELEASED; urgency=medium
+osmosis (0.47-4) unstable; urgency=medium
 
   * Bump Standards-Version to 4.3.0, no changes.
+  * Apply patch by Emmanuel Bourg to fix FTBFS with updates plexus-classworlds.
+    (closes: #923564)
 
- -- Bas Couwenberg <sebastic@debian.org>  Tue, 25 Dec 2018 22:50:27 +0100
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 02 Mar 2019 08:12:06 +0100
 
 osmosis (0.47-3) unstable; urgency=medium
 

debian/control

@@ -27,7 +27,7 @@ Build-Depends: debhelper (>= 9),
                libspring-transaction-java,
                libstax2-api-java,
                libosmpbf-java,
-               libplexus-classworlds2-java,
+               libplexus-classworlds-java,
                libprotobuf-java (>= 3.6.1),
                libwoodstox-java,
                libxerces2-java,
@@ -57,7 +57,7 @@ Depends: default-jre-headless | java8-runtime-headless,
          libspring-jdbc-java,
          libspring-transaction-java,
          libosmpbf-java,
-         libplexus-classworlds2-java,
+         libplexus-classworlds-java,
          libprotobuf-java,
          libxerces2-java,
          libxz-java,

debian/maven.rules

 
 junit junit * s/.*/4.x/ * *
-org.codehaus.plexus plexus-classworlds * s/.*/2.x/ * *
 org.springframework spring-jdbc * s/.*/debian/ * *
 #s/org.jboss.netty/io.netty/ netty * s/.*/debian/ * *
 s/org.postgis/net.postgis/ postgis-jdbc * s/.*/debian/ * *

debian/patches/01-fix_launcher.patch

@@ -28,7 +28,7 @@ Forwarded: not-needed
  
  # Build up the classpath of required jar files via classworlds launcher.
 -MYAPP_CLASSPATH=$MYAPP_HOME/lib/default/plexus-classworlds-*.jar
-+MYAPP_CLASSPATH=$LIBRARIES_HOME/plexus-classworlds2.jar
++MYAPP_CLASSPATH=$LIBRARIES_HOME/plexus-classworlds.jar
  
  MAINCLASS=org.codehaus.classworlds.Launcher
 -EXEC="$JAVACMD $JAVACMD_OPTIONS -cp $MYAPP_CLASSPATH -Dapp.home=$MYAPP_HOME -Dclassworlds.conf=$MYAPP_HOME/config/plexus.conf  $MAINCLASS $OSMOSIS_OPTIONS"