[maven] 04/09: Depend on guice instead 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 e9015c41c28d4cb668147cc3173b0a674b3582bf
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Nov 19 11:38:34 2015 +0100

    Depend on guice instead of sisu-guice
---
 debian/changelog   | 1 +
 debian/control     | 4 ++--
 debian/maven.links | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4e5da37..511ba05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ maven (3.3.9-1) UNRELEASED; urgency=medium
   *  New upstream release
     - Refreshed the patches
     - New dependency on libcommons-lang3-java
+    - Depend on guice instead of sisu-guice
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 19 Nov 2015 10:28:12 +0100
 
diff --git a/debian/control b/debian/control
index 4e1ca65..1237514 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends-Indep: ant-optional,
                      libcommons-lang3-java,
                      libcommons-logging-java,
                      libeasymock-java,
+                     libguice-java (>= 4.0),
                      liblogback-java,
                      libmaven-ant-tasks-java (>= 2.1.3-2),
                      libmaven-clean-plugin-java (>= 2.5),
@@ -23,7 +24,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-guice-java (>= 3.2.4),
                      libsisu-maven-plugin-java,
                      libsisu-plexus-java (>= 0.3.0),
                      libslf4j-java,
@@ -67,13 +67,13 @@ Depends: libeclipse-aether-java (>= 1.0),
          libcommons-cli-java,
          libcommons-lang3-java,
          libguava-java,
+         libguice-java (>= 4.0),
          libplexus-cipher-java,
          libplexus-classworlds2-java (>= 2.4),
          libplexus-containers1.5-java,
          libplexus-interpolation-java,
          libplexus-sec-dispatcher-java,
          libplexus-utils2-java,
-         libsisu-guice-java,
          libsisu-plexus-java (>= 0.3.0),
          libslf4j-java,
          libwagon2-java (>= 2.2-2),
diff --git a/debian/maven.links b/debian/maven.links
index 840ec58..1698aef 100644
--- a/debian/maven.links
+++ b/debian/maven.links
@@ -24,7 +24,7 @@
 /usr/share/java/plexus-sec-dispatcher.jar            /usr/share/maven/lib/plexus-sec-dispatcher.jar
 /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/guice.jar                            /usr/share/maven/lib/guice.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
 /usr/share/java/slf4j-api.jar                        /usr/share/maven/lib/slf4j-api.jar

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