[maven] 01/02: Use the 'debian' version of plexus-component-annotations

[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.

commit 1a3f64a0d2300bf5f2ff3688eec8f87b9eee8c9b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 13 13:42:27 2017 +0100

    Use the 'debian' version of plexus-component-annotations
---
 debian/changelog   | 5 +++++
 debian/control     | 1 +
 debian/maven.links | 2 +-
 debian/maven.rules | 1 -
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 12b8dfa..8f2a085 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 maven (3.5.0-9) UNRELEASED; urgency=medium
 
   * Team upload.
+
+  [ Miguel Landaeta ]
   * Remove B-D on libplexus-classworlds2-java, it's not necessary anymore.
 
+  [ Emmanuel Bourg ]
+  * Use the 'debian' version of plexus-component-annotations
+
  -- Miguel Landaeta <nomadium at debian.org>  Sat, 11 Nov 2017 20:33:17 +0000
 
 maven (3.5.0-8) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index bf46c6a..346a6f9 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Build-Depends-Indep: junit4,
                      libmockito-java,
                      libmodello-maven-plugin-java (>= 1.9.1),
                      libplexus-classworlds-java (>= 2.5.2),
+                     libplexus-component-annotations-java (>= 1.7.1-6~),
                      libplexus-component-metadata-java (>= 1.7),
                      libplexus-interpolation-java (>= 1.24),
                      libplexus-utils2-java (>= 3.0.24),
diff --git a/debian/maven.links b/debian/maven.links
index 5a7cec0..3c52552 100644
--- a/debian/maven.links
+++ b/debian/maven.links
@@ -20,7 +20,7 @@
 /usr/share/java/maven-resolver-util.jar              /usr/share/maven/lib/maven-resolver-util.jar
 /usr/share/java/maven-shared-utils.jar               /usr/share/maven/lib/maven-shared-utils.jar
 /usr/share/java/plexus-cipher.jar                    /usr/share/maven/lib/plexus-cipher.jar
-/usr/share/java/plexus-component-annotations-1.5.jar /usr/share/maven/lib/plexus-component-annotations.jar
+/usr/share/java/plexus-component-annotations.jar     /usr/share/maven/lib/plexus-component-annotations.jar
 /usr/share/java/plexus-interpolation.jar             /usr/share/maven/lib/plexus-interpolation.jar
 /usr/share/java/plexus-sec-dispatcher.jar            /usr/share/maven/lib/plexus-sec-dispatcher.jar
 /usr/share/java/plexus-utils2.jar                    /usr/share/maven/lib/plexus-utils.jar
diff --git a/debian/maven.rules b/debian/maven.rules
index fc82d74..a0f1a43 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -7,7 +7,6 @@ s/org.eclipse.sisu/org.sonatype.plugins/ sisu-maven-plugin * s/.*/1.4/ * *
 org.codehaus.plexus plexus-utils * s/.*/2.x/ * *
 org.codehaus.plexus plexus-container-default * s/.*/1.5.5/ * *
 org.codehaus.plexus plexus-component-metadata maven-plugin s/1.7.1/1.5.5/ * *
-org.codehaus.plexus plexus-component-annotations * s/.*/1.5.5/ * *
 
 org.apache.maven apache-maven pom s/.*/3.x/ * *
 org.apache.maven maven-parent * s/.*/debian/ * *

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