[maven-plugin-tools] 02/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 maven-plugin-tools.

commit 532811d4a04d9366dbddacbfa92ade85efcdd5fc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 2 17:03:01 2017 +0200

    Depend on libmaven3-core-java instead of libmaven2-core-java
---
 debian/changelog                            |  1 +
 debian/control                              |  4 ++--
 debian/maven.ignoreRules                    |  1 +
 debian/maven.rules                          |  4 ++++
 debian/patches/07-maven-compatibility.patch | 17 +++++++++++++++++
 debian/patches/series                       |  1 +
 6 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a5d965..fc18f3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 maven-plugin-tools (3.5-4) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Depend on libmaven3-core-java instead of libmaven2-core-java
   * Removed the unused dependency on libplexus-container-default-java
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 25 Jul 2017 01:35:42 +0200
diff --git a/debian/control b/debian/control
index 08bebec..3cc2c3a 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends-Indep: ant,
                      libeasymock-java,
                      libjtidy-java,
                      libmaven-reporting-impl-java,
-                     libmaven2-core-java (>= 2.2.1-12),
+                     libmaven3-core-java,
                      libmodello-maven-plugin-java,
                      libplexus-ant-factory-java,
                      libplexus-archiver-java (>= 2.0),
@@ -37,7 +37,7 @@ Depends: libbsh-java,
          libdoxia-sitetools-java,
          libjtidy-java,
          libmaven-reporting-impl-java,
-         libmaven2-core-java,
+         libmaven3-core-java,
          libqdox2-java,
          libsurefire-java,
          libxbean-java,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 5375d78..1efb239 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -6,3 +6,4 @@ org.easytesting fest-assert * * * *
 xmlunit xmlunit * * * *
 org.apache.maven.plugin-testing maven-plugin-testing-harness * * * *
 org.apache.rat apache-rat-plugin * * * *
+org.apache.maven maven-project * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index b9af096..3bab7c5 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -8,3 +8,7 @@ org.codehaus.plexus plexus-utils * s/.*/2.x/ * *
 com.thoughtworks.qdox qdox * s/.*/2.x/ * *
 s/easymock/org.easymock/ easymock * s/.*/debian/ * *
 org.codehaus.plexus plexus-component-metadata maven-plugin s/1.7/1.5.5/ * *
+org.apache.maven maven-* * s/.*/3.x/ * *
+org.apache.maven s/maven-plugin-descriptor/maven-compat/ * s/.*/3.x/ * *
+org.apache.maven s/maven-plugin-registry/maven-compat/ * s/.*/3.x/ * *
+org.apache.maven s/maven-artifact-manager/maven-compat/ * s/.*/3.x/ * *
diff --git a/debian/patches/07-maven-compatibility.patch b/debian/patches/07-maven-compatibility.patch
new file mode 100644
index 0000000..5e955c0
--- /dev/null
+++ b/debian/patches/07-maven-compatibility.patch
@@ -0,0 +1,17 @@
+Description: Fixes the compatibility with the version of Maven in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
++++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
+@@ -733,9 +733,9 @@
+             return "Unknown";
+         }
+ 
+-        private static Plugin getCompilerPlugin( Map<String, Object> pluginsAsMap )
++        private static Plugin getCompilerPlugin( Map<String, Plugin> pluginsAsMap )
+         {
+-            return (Plugin) pluginsAsMap.get( "org.apache.maven.plugins:maven-compiler-plugin" );
++            return pluginsAsMap.get( "org.apache.maven.plugins:maven-compiler-plugin" );
+         }
+ 
+         private static String getPluginParameter( Plugin plugin, String parameter )
diff --git a/debian/patches/series b/debian/patches/series
index 93b80e2..b4a1505 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 04-reproducible-plugin-descriptor.patch
+07-maven-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-plugin-tools.git