[maven] 05/10: Use the no_aop variant of sisu-guice

[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 fe8d7ce4be2986ad43395ce1972fedbc7bcfc45e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 8 14:16:20 2015 +0200

    Use the no_aop variant of sisu-guice
---
 debian/changelog                     |  1 -
 debian/control                       |  2 +-
 debian/maven.rules                   |  2 --
 debian/patches/add_dependencies.diff |  2 +-
 debian/patches/dep_versions.diff     | 18 ------------------
 5 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d61edfd..d3fe4f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,6 @@ maven (3.2.5-1) UNRELEASED; urgency=medium
     - New dependency on libsisu-plexus-java (replaces libsisu-ioc-java)
     - New dependency on libeclipse-aether-java (replaces libaether-java)
     - New dependency on libslf4j-java
-    - Removed the no_aop classifier from the sisu-guice dependency
     - Updated the Maven version in the rules of debian/maven.buildRules
     - New build dependencies on liblogback-java and libmockito-java
     - No longer add the plexus-container-default dependency
diff --git a/debian/control b/debian/control
index b4cb390..24288f1 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends-Indep: ant-optional,
                      libplexus-classworlds2-java (>= 2.4),
                      libplexus-containers1.5-java (>= 1.5.5-2),
                      libplexus-utils2-java (>= 3.0.15),
-                     libsisu-guice-java,
+                     libsisu-guice-java (>= 3.2.4),
                      libsisu-plexus-java (>= 0.3.0),
                      libslf4j-java,
                      libsurefire-java (>= 2.17),
diff --git a/debian/maven.rules b/debian/maven.rules
index fccefd4..44634dc 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -4,8 +4,6 @@
 junit junit jar s/3\..*/3.x/ * *
 s/easymock/org.easymock/ easymock * s/.*/debian/ * *
 
-org.sonatype.sisu sisu-guice * s/.*/debian/ s/no_aop// *
-
 org.apache.maven.wagon * jar s/.*/2.x/ * *
 
 org.codehaus.plexus plexus-classworlds * s/.*/2.x/ * *
diff --git a/debian/patches/add_dependencies.diff b/debian/patches/add_dependencies.diff
index 74cea7d..ad8b749 100644
--- a/debian/patches/add_dependencies.diff
+++ b/debian/patches/add_dependencies.diff
@@ -5,7 +5,7 @@ Last-Update: 2012-01-21
 Forwarded: no
 --- a/pom.xml
 +++ b/pom.xml
-@@ -237,6 +237,11 @@
+@@ -238,6 +238,11 @@
        </dependency>
        <dependency>
          <groupId>org.codehaus.plexus</groupId>
diff --git a/debian/patches/dep_versions.diff b/debian/patches/dep_versions.diff
index c050206..f148b02 100644
--- a/debian/patches/dep_versions.diff
+++ b/debian/patches/dep_versions.diff
@@ -43,21 +43,3 @@ 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>
-@@ -218,7 +218,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