[osmosis] 01/04: Apply patch by Emmanuel Bourg to migrate to libplexus-classworlds2-java. (closes: #873886)

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository osmosis.

commit 62f61814c75138a2fd379e9cf5ab00c79d4b262c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 1 02:00:23 2017 +0200

    Apply patch by Emmanuel Bourg to migrate to libplexus-classworlds2-java. (closes: #873886)
---
 debian/changelog                     | 7 +++++++
 debian/control                       | 4 ++--
 debian/maven.rules                   | 1 +
 debian/patches/01-fix_launcher.patch | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 895bad4..f062be0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+osmosis (0.45-5) UNRELEASED; urgency=medium
+
+  * Apply patch by Emmanuel Bourg to migrate to libplexus-classworlds2-java.
+    (closes: #873886)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 01 Sep 2017 01:57:39 +0200
+
 osmosis (0.45-4) unstable; urgency=medium
 
   * Update maven.rules for new postgresql-jdbc.
diff --git a/debian/control b/debian/control
index 9126bcf..e2514cf 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 9),
                libspring-transaction-java,
                libstax2-api-java,
                libosmpbf-java,
-               libplexus-classworlds-java,
+               libplexus-classworlds2-java,
                libprotobuf-java,
                libwoodstox-java,
                libxerces2-java,
@@ -56,7 +56,7 @@ Depends: default-jre-headless | java7-runtime-headless,
          libspring-jdbc-java,
          libspring-transaction-java,
          libosmpbf-java,
-         libplexus-classworlds-java,
+         libplexus-classworlds2-java,
          libprotobuf-java,
          libxerces2-java,
          libxz-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index c6a6042..6fdb0bd 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,5 +1,6 @@
 
 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 596ede8..48258cf 100644
--- a/debian/patches/01-fix_launcher.patch
+++ b/debian/patches/01-fix_launcher.patch
@@ -32,7 +32,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-classworlds.jar
++MYAPP_CLASSPATH=$LIBRARIES_HOME/plexus-classworlds2.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"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmosis.git