[animal-sniffer] 03/04: Depend on libmaven3-core-java instead of libmaven2-core-java

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository animal-sniffer.

commit 25b2b1cca23a8f9abfb73ef71af02eef44c45511
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 31 21:33:48 2017 +0200

    Depend on libmaven3-core-java instead of libmaven2-core-java
---
 debian/changelog                               |  1 +
 debian/control                                 |  3 ++-
 debian/maven.rules                             |  5 ++++-
 debian/patches/0002-plexus-compatibility.patch | 14 ++++++++++++++
 debian/patches/series                          |  1 +
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d20033c..5d23a59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 animal-sniffer (1.15-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Depend on libmaven3-core-java instead of libmaven2-core-java
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
 
diff --git a/debian/control b/debian/control
index baddfc8..2c56518 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,8 @@ Build-Depends-Indep:
  libmaven-invoker-plugin-java,
  libmaven-javadoc-plugin-java,
  libmaven-plugin-tools-java,
- libmaven-shade-plugin-java
+ libmaven-shade-plugin-java,
+ libmaven3-core-java
 Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/animal-sniffer.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/animal-sniffer.git
diff --git a/debian/maven.rules b/debian/maven.rules
index bc2589b..54da531 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -17,5 +17,8 @@
 #   junit junit jar s/3\\..*/3.x/
 
 junit junit jar s/.*/3.x/ * *
-org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
+org.codehaus.plexus plexus-container-default jar s/.*/1.5.5/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
+org.apache.maven s/maven-project/maven-compat/ * s/.*/3.x/ * *
+org.apache.maven s/maven-toolchain/maven-compat/ * s/.*/3.x/ * *
+org.apache.maven maven-* * s/.*/3.x/ * *
diff --git a/debian/patches/0002-plexus-compatibility.patch b/debian/patches/0002-plexus-compatibility.patch
new file mode 100644
index 0000000..44d9938
--- /dev/null
+++ b/debian/patches/0002-plexus-compatibility.patch
@@ -0,0 +1,14 @@
+Description: Fixes the compatibility with the version of Plexus Containers used in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/animal-sniffer-maven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/JdkToolchainConverter.java
++++ b/animal-sniffer-maven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/JdkToolchainConverter.java
+@@ -80,7 +80,7 @@
+                 String val = params[j].getValue();
+                 parameters.put( name, val );
+             }
+-            catch ( PlexusConfigurationException ex )
++            catch ( Exception ex )
+             {
+                 throw new ComponentConfigurationException( ex );
+             }
diff --git a/debian/patches/series b/debian/patches/series
index b3533fb..41ffa0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Add-a-version-to-maven-invoker-plugin-or-the-plugin-.patch
+0002-plexus-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/animal-sniffer.git