[plexus-containers] 03/04: Relocate the version 1.5.5 of the plexus-component-metadata plugin to the current version instead of patching the pom

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository plexus-containers.

commit 24b7d8364e1e49f484d899d0ff008b1e78e04b79
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Nov 7 13:23:14 2017 +0100

    Relocate the version 1.5.5 of the plexus-component-metadata plugin to the current version instead of patching the pom
---
 debian/changelog                                          |  2 ++
 debian/libplexus-container-default-java.poms              |  2 +-
 debian/maven.rules                                        |  2 --
 debian/patches/04-plexus-component-metadata-version.patch | 10 ----------
 debian/patches/series                                     |  1 -
 5 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aef6a64..548649a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ plexus-containers (1.7.1-7) UNRELEASED; urgency=medium
   * Renamed the libplexus-container-default1.5-java package to
     libplexus-container-default-java (but keep a transitional package)
   * Removed libplexus-containers1.5-java (no longer used)
+  * Relocate the version 1.5.5 of the plexus-component-metadata plugin
+    to the current version instead of patching the pom
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 07 Nov 2017 13:06:41 +0100
 
diff --git a/debian/libplexus-container-default-java.poms b/debian/libplexus-container-default-java.poms
index 1c7ec20..4083a5b 100644
--- a/debian/libplexus-container-default-java.poms
+++ b/debian/libplexus-container-default-java.poms
@@ -27,6 +27,6 @@
 #
 pom.xml --no-parent --has-package-version --package=libplexus-container-default-java
 plexus-component-annotations/pom.xml --no-parent --has-package-version --package=libplexus-component-annotations-java --relocate=org.codehaus.plexus:plexus-component-annotations:1.5.5
-plexus-component-metadata/pom.xml --has-package-version --package=libplexus-component-metadata-java
+plexus-component-metadata/pom.xml --has-package-version --package=libplexus-component-metadata-java --relocate=org.codehaus.plexus:plexus-component-metadata:1.5.5
 plexus-component-javadoc/pom.xml --ignore
 plexus-container-default/pom.xml --has-package-version --package=libplexus-container-default-java --relocate=org.codehaus.plexus:plexus-container-default:1.5.5
diff --git a/debian/maven.rules b/debian/maven.rules
index 0077520..3776134 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -23,7 +23,5 @@ s/com.google.collections/com.google.guava/ s/google-collections/guava/ * s/.*/de
 
 org.codehaus.plexus plexus-utils jar s/.*/2.x/ * *
 
-org.codehaus.plexus plexus-component-metadata maven-plugin * * *
-
 org.apache.maven s/maven-project/maven-core/ * s/.*/3.x/ * *
 org.apache.maven maven-* * s/.*/3.x/ * *
diff --git a/debian/patches/04-plexus-component-metadata-version.patch b/debian/patches/04-plexus-component-metadata-version.patch
deleted file mode 100644
index f559bec..0000000
--- a/debian/patches/04-plexus-component-metadata-version.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/plexus-component-metadata/pom.xml
-+++ b/plexus-component-metadata/pom.xml
-@@ -11,6 +11,7 @@
- 
-   <artifactId>plexus-component-metadata</artifactId>
-   <packaging>maven-plugin</packaging>
-+  <version>1.5.5</version>
- 
-   <name>Plexus :: Component Metadata</name>
-   <description>A Maven plugin to generate Plexus descriptors from source tags and class annotations.</description>
diff --git a/debian/patches/series b/debian/patches/series
index 4fa38eb..bd15124 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 03-reproducible-metadata.patch
-04-plexus-component-metadata-version.patch
 05-qdox-compatibility.patch

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