[maven-plugin-tools] 01/04: Removed 06-plexus-component-metadata-version.patch

[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 96fb77bb5941d29d3ec6e186a5812b85a6818d63
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Feb 19 14:29:14 2016 +0100

    Removed 06-plexus-component-metadata-version.patch
---
 debian/changelog                                          |  7 +++++++
 debian/control                                            |  3 ++-
 debian/maven.rules                                        |  1 -
 debian/patches/06-plexus-component-metadata-version.patch | 13 -------------
 debian/patches/series                                     |  1 -
 5 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e03483b..3882b10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven-plugin-tools (3.3-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Removed 06-plexus-component-metadata-version.patch
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 12 Feb 2016 18:31:52 +0100
+
 maven-plugin-tools (3.3-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 654766a..7942cfc 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,8 @@ Build-Depends-Indep: ant,
                      libplexus-ant-factory-java,
                      libplexus-archiver-java (>= 2.0),
                      libplexus-bsh-factory-java,
-                     libplexus-containers1.5-java,
+                     libplexus-component-annotations-java,
+                     libplexus-component-metadata-java (>= 1.6),
                      libplexus-container-default-java,
                      libplexus-velocity-java,
                      libqdox-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 8a7df3f..8a26431 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -5,5 +5,4 @@ org.ow2.asm * * s/.*/4.x/
 org.apache.maven maven-artifact * s/3\..*/3.x/
 s/bsh/org.beanshell/ bsh * s/.*/debian/
 org.codehaus.plexus plexus-compiler-manager * s/.*/2.x/ * *
-org.codehaus.plexus plexus-component-metadata maven-plugin s/.*/1.5.5/ * *
 org.codehaus.plexus plexus-utils * s/.*/2.x/ * *
diff --git a/debian/patches/06-plexus-component-metadata-version.patch b/debian/patches/06-plexus-component-metadata-version.patch
deleted file mode 100644
index bd2b54b..0000000
--- a/debian/patches/06-plexus-component-metadata-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Set the version of the plexus-component-metadata plugin
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -287,6 +287,7 @@
-         <plugin>
-           <groupId>org.codehaus.plexus</groupId>
-           <artifactId>plexus-component-metadata</artifactId>
-+          <version>1.5.5</version>
-           <executions>
-             <execution>
-               <goals>
diff --git a/debian/patches/series b/debian/patches/series
index 2a15c13..1224eb8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 04-reproducible-plugin-descriptor.patch
 05-fix-plugin-annotation.patch
-06-plexus-component-metadata-version.patch
 07-MPLUGIN-238.patch

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