[maven] 08/16: 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 master
in repository maven.

commit 2d6add38e9058ed7acfa8691f27c37b65c7ba00a
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          | 3 +--
 debian/maven.buildRules | 3 +--
 debian/maven.links      | 2 --
 debian/maven.rules      | 1 -
 5 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b008a7..2bc5617 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ maven (3.1.1-1) UNRELEASED; urgency=medium
   * New upstream release
     - Refreshed the patches
     - 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
   * Moved the libraries to a separate libmaven3-core-java package
   * Removed the unused dependencies on commons-codec, commons-httpclient
diff --git a/debian/control b/debian/control
index b36f627..d4a6dd4 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,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-ioc-java,
+                     libsisu-guice-java,
                      libsisu-plexus-java (>= 0.3.0),
                      libsurefire-java (>= 2.17),
                      libwagon2-java (>= 2.2-2),
@@ -68,7 +68,6 @@ Depends: libaether-java,
          libplexus-sec-dispatcher-java,
          libplexus-utils2-java,
          libsisu-guice-java,
-         libsisu-ioc-java,
          libsisu-plexus-java (>= 0.3.0),
          libwagon2-java (>= 2.2-2),
          ${misc:Depends}
diff --git a/debian/maven.buildRules b/debian/maven.buildRules
index 77231bd..b2b5f35 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/ * *
 
diff --git a/debian/maven.links b/debian/maven.links
index 4542bd4..d45bcf6 100644
--- a/debian/maven.links
+++ b/debian/maven.links
@@ -18,8 +18,6 @@
 /usr/share/java/plexus-utils2.jar                    /usr/share/maven/lib/plexus-utils.jar
 /usr/share/java/guava.jar                            /usr/share/maven/lib/guava.jar
 /usr/share/java/sisu-guice.jar                       /usr/share/maven/lib/sisu-guice.jar
-/usr/share/java/sisu-inject-bean.jar                 /usr/share/maven/lib/sisu-inject-bean.jar
-/usr/share/java/sisu-inject-plexus.jar               /usr/share/maven/lib/sisu-inject-plexus.jar
 /usr/share/java/sisu-inject.jar                      /usr/share/maven/lib/sisu-inject.jar
 /usr/share/java/sisu-plexus.jar                      /usr/share/maven/lib/sisu-plexus.jar
 
diff --git a/debian/maven.rules b/debian/maven.rules
index 3918b5a..fccefd4 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -4,7 +4,6 @@
 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/ * *

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