[maven-bundle-plugin] 01/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-bundle-plugin.

commit f9702654087c7d27950a82a3ea7e7b6738b443e9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 30 16:45:28 2017 +0200

    Depend on libmaven3-core-java instead of libmaven2-core-java
---
 debian/changelog                          |  7 +++++++
 debian/control                            |  3 ++-
 debian/maven.rules                        |  2 ++
 debian/patches/maven3-compatibility.patch | 17 +++++++++++++++++
 debian/patches/series                     |  1 +
 5 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 945b310..158131e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven-bundle-plugin (2.5.4-6) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Depend on libmaven3-core-java instead of libmaven2-core-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 02 Aug 2017 12:37:21 +0200
+
 maven-bundle-plugin (2.5.4-5) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index f9b7941..a54d670 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,8 @@ Build-Depends-Indep: bnd (>= 2.1.0~),
                      libmaven-dependency-tree-java,
                      libmaven-javadoc-plugin-java,
                      libmaven-plugin-tools-java,
-                     libmaven2-core-java,
+                     libmaven-reporting-api-java,
+                     libmaven3-core-java,
                      libosgi-compendium-java,
                      libosgi-core-java,
                      libplexus-archiver-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index d1841d8..6499c58 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -5,3 +5,5 @@ org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
 org.codehaus.plexus plexus-utils jar s/.*/2.x/ * *
 biz.aQute.bnd s/biz.aQute.bndlib/bndlib/ * s/.*/debian/ * *
 s/org.apache.felix/org.osgi/ org.osgi.core * s/.*/debian/ * *
+org.apache.maven s/maven-core/maven-compat/ * s/.*/3.x/ * *
+org.apache.maven.reporting maven-reporting-api * s/.*/3.x/ * *
diff --git a/debian/patches/maven3-compatibility.patch b/debian/patches/maven3-compatibility.patch
new file mode 100644
index 0000000..eebd3ee
--- /dev/null
+++ b/debian/patches/maven3-compatibility.patch
@@ -0,0 +1,17 @@
+Description: Fixes the compatibility with Maven 3
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/pom.xml
++++ b/pom.xml
+@@ -113,6 +113,11 @@
+    <version>2.0.7</version>
+   </dependency>
+   <dependency>
++   <groupId>org.apache.maven.reporting</groupId>
++   <artifactId>maven-reporting-api</artifactId>
++   <version>3.x</version>
++  </dependency>
++  <dependency>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-archiver</artifactId>
+    <version>2.5</version>
diff --git a/debian/patches/series b/debian/patches/series
index a40539f..12d84a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ backward-compatibility.patch
 use-changelog-date-as-pom.properties-timestamp.patch
 FELIX-4882.patch
 maven-archiver3-869361.patch
+maven3-compatibility.patch

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