[maven-artifact-transfer] 04/05: 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-artifact-transfer.

commit 41da161750a8c4ee31d8921c603d72e7ecfbfa83
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 13 12:18:12 2017 +0100

    Use the 'debian' version of plexus-component-annotations
---
 debian/changelog   | 1 +
 debian/control     | 1 +
 debian/maven.rules | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1b00002..a74cdd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ maven-artifact-transfer (0.9.1-4) UNRELEASED; urgency=medium
 
   * Depend on libmaven-resolver-java instead of libeclipse-aether-java
   * Depend on libplexus-utils2-java instead of libplexus-utils-java
+  * Use the 'debian' version of plexus-component-annotations
   * Standards-Version updated to 4.1.1
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 13 Nov 2017 12:13:32 +0100
diff --git a/debian/control b/debian/control
index 8799135..dab3e37 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends:
  libmaven-plugin-testing-java,
  libmaven-resolver-java,
  libmaven-shade-plugin-java,
+ libplexus-component-annotations-java (>= 1.7.1-6~),
  libplexus-component-metadata-java,
  maven-debian-helper (>= 2.2)
 Standards-Version: 4.1.1
diff --git a/debian/maven.rules b/debian/maven.rules
index cdb7f1b..40de290 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -2,7 +2,6 @@ junit junit * s/4\..*/4.x/ * *
 org.apache.maven maven-core     * s/.*/3.x/ * *
 org.apache.maven maven-artifact * s/.*/3.x/ * *
 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.codehaus.plexus plexus-utils * s/.*/2.x/
 
 s/org.eclipse.aether/org.apache.maven.resolver/ s/aether-(.*)/maven-resolver-$1/ * s/.*/debian/ * *

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