[maven-shared-jar] 13/15: Replaced the build dependency on libplexus-maven-plugin-java with libplexus-component-metadata-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-shared-jar.

commit 481d7f54956da0be4672ff027a3575dca4ffce4c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Feb 27 01:09:24 2016 +0100

    Replaced the build dependency on libplexus-maven-plugin-java with libplexus-component-metadata-java
---
 debian/changelog                                |  2 ++
 debian/control                                  |  4 ++--
 debian/patches/0002-ignore-plugin-version.patch | 13 +++++++++++++
 debian/patches/series                           |  1 +
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 13d27cd..c702458 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ maven-shared-jar (1.2-1) UNRELEASED; urgency=medium
     - New dependency on libmaven-shared-utils-java
     - Removed 0001-add-missing-dependency.patch
     - Updated the Maven rule for bcel
+    - Replaced the build dependency on libplexus-maven-plugin-java
+      with libplexus-component-metadata-java
   * Build with the DH sequencer instead of CDBS
   * debian/control:
     - Standards-Version updated to 3.9.7 (no changes)
diff --git a/debian/control b/debian/control
index 14fa3fa..654a416 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Build-Depends-Indep: default-jdk-doc,
                      libmaven-shared-utils-java,
                      libmaven2-core-java,
                      libmaven2-core-java-doc,
-                     libplexus-digest-java,
-                     libplexus-maven-plugin-java
+                     libplexus-component-metadata-java,
+                     libplexus-digest-java
 Standards-Version: 3.9.7
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-shared-jar.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-shared-jar.git
diff --git a/debian/patches/0002-ignore-plugin-version.patch b/debian/patches/0002-ignore-plugin-version.patch
new file mode 100644
index 0000000..8ab0125
--- /dev/null
+++ b/debian/patches/0002-ignore-plugin-version.patch
@@ -0,0 +1,13 @@
+Description: Ignore the version of plexus-component-metadata to pick the version available in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -118,7 +118,6 @@
+       <plugin>
+         <groupId>org.codehaus.plexus</groupId>
+         <artifactId>plexus-component-metadata</artifactId>
+-        <version>1.6</version>
+         <executions>
+           <execution>
+             <goals>
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..dacb941 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0002-ignore-plugin-version.patch

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