[maven] 08/09: Removed the dependency on libsisu-ioc-java

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch maven-3.1.1
in repository maven.

commit 61855e57591fbdf9a6d7bace44ea63ad6ed54439
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Oct 8 12:55:00 2014 +0200

    Removed the dependency on libsisu-ioc-java
---
 debian/changelog        | 2 +-
 debian/control          | 1 -
 debian/maven.buildRules | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fdcd2e7..181ccd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ maven (3.1.1-1) UNRELEASED; urgency=medium
     - Refreshed the patches
     - Depend on libaether-java >= 1:0.9.0.M2
     - Depend on libplexus-utils2-java >= 3.0.15
-    - New dependency on libsisu-plexus-java
+    - New dependency on libsisu-plexus-java (replaces libsisu-ioc-java)
     - Removed the no_aop classifier from the sisu-guice dependency
   * Standards-Version updated to 3.9.6 (no changes)
 
diff --git a/debian/control b/debian/control
index 8e791e4..e3143f7 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,6 @@ 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-ioc-java,
                      libsisu-plexus-java,
                      libsurefire-java,
                      libwagon2-java (>= 2.2-2),
diff --git a/debian/maven.buildRules b/debian/maven.buildRules
index 0f42dae..0209b32 100644
--- a/debian/maven.buildRules
+++ b/debian/maven.buildRules
@@ -4,13 +4,12 @@
 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.eclipse.sisu org.eclipse.sisu.plexus * s/.*/debian/ * *
 
 org.apache.maven.wagon * jar s/.*/2.x/ * *
 
 org.codehaus.plexus plexus-classworlds * s/.*/2.x/ * *
 org.codehaus.plexus plexus-utils * s/.*/2.x/ * *
-org.codehaus.plexus plexus-container-default * s/.*/1.5.5/ * *
 org.codehaus.plexus plexus-component-metadata * s/.*/1.5.5/ * *
 org.codehaus.plexus plexus-component-annotations * s/.*/1.5.5/ * *
 

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