Bug#923564: FTBFS: Could not resolve org.codehaus.plexus:plexus-classworlds:2.5.2

[Emmanuel Bourg]

Package: osmosis
Version: 0.47-3
Severity: serious

Hi,

osmosis currently fails to build in unstable, that was probably caused by
the upgrade of plexus-classworlds in January. Here is a patch fixing the
issue.

Emmanuel Bourg
-------------- next part --------------
diff --git a/debian/control b/debian/control
index 4ff5eb5..90019ea 100644
--- a/debian/control
+++ b/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,
diff --git a/debian/maven.rules b/debian/maven.rules
index 3898b15..8fd7b9f 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,6 +1,5 @@
 
 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/ * *
diff --git a/debian/patches/01-fix_launcher.patch b/debian/patches/01-fix_launcher.patch
index cda6abe..fc58210 100644
--- a/debian/patches/01-fix_launcher.patch
+++ b/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"