[maven] 05/16: Removed the no_aop classifier from the sisu-guice dependency

[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 672628b6a6c42dc3cc87ac3121c19f947ba8523a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 2 14:56:36 2014 +0200

    Removed the no_aop classifier from the sisu-guice dependency
---
 debian/changelog                 |  1 +
 debian/maven.rules               |  1 +
 debian/patches/dep_versions.diff | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ccd313a..5264525 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ maven (3.1.1-1) UNRELEASED; urgency=medium
   * New upstream release
     - Refreshed the patches
     - New dependency on libsisu-plexus-java
+    - Removed the no_aop classifier from the sisu-guice dependency
   * Moved the libraries to a separate libmaven3-core-java package
   * Removed the unused dependencies on commons-codec, commons-httpclient
     and commons-logging
diff --git a/debian/maven.rules b/debian/maven.rules
index 9ee5a9a..3918b5a 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -5,6 +5,7 @@ junit junit jar s/3\..*/3.x/ * *
 s/easymock/org.easymock/ easymock * s/.*/debian/ * *
 
 org.sonatype.sisu sisu-inject-plexus * s/.*/2.3.0/ * *
+org.sonatype.sisu sisu-guice * s/.*/debian/ s/no_aop// *
 
 org.apache.maven.wagon * jar s/.*/2.x/ * *
 
diff --git a/debian/patches/dep_versions.diff b/debian/patches/dep_versions.diff
index f33ef7b..abe8228 100644
--- a/debian/patches/dep_versions.diff
+++ b/debian/patches/dep_versions.diff
@@ -45,3 +45,21 @@ Forwarded: not-needed
      <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
      <!-- Control the name of the distribution and information output by mvn -->
      <distributionId>apache-maven</distributionId>
+@@ -193,7 +193,6 @@
+         <groupId>org.sonatype.sisu</groupId>
+         <artifactId>sisu-guice</artifactId>
+         <version>${guiceVersion}</version>
+-        <classifier>no_aop</classifier>
+       </dependency>
+       <dependency>
+         <groupId>org.eclipse.sisu</groupId>
+--- a/maven-aether-provider/pom.xml
++++ b/maven-aether-provider/pom.xml
+@@ -79,7 +79,6 @@
+     <dependency>
+       <groupId>org.sonatype.sisu</groupId>
+       <artifactId>sisu-guice</artifactId>
+-      <classifier>no_aop</classifier>
+       <optional>true</optional>
+       <exclusions>
+         <exclusion>

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