[shiro] 07/07: Build the guice module

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository shiro.

commit d0d739655f0884b081e00f65c44774dd3e497e8c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 9 16:18:14 2014 +0200

    Build the guice module
---
 debian/control                          |  2 +-
 debian/libshiro-java.poms               |  2 +-
 debian/maven.ignoreRules                |  2 --
 debian/patches/01-bundles-to-jars.patch | 11 +++++++++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index bce17c0..5cea6c2 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends-Indep: libaspectj-java,
                      libehcache-java,
                      libjstl1.1-java,
                      libguava-java,
-                     libguice-java,
+                     libguice-java (>= 3.0-6~),
                      libhsqldb-java,
                      liblog4j1.2-java,
                      libmaven-bundle-plugin-java,
diff --git a/debian/libshiro-java.poms b/debian/libshiro-java.poms
index 86628ab..efca94f 100644
--- a/debian/libshiro-java.poms
+++ b/debian/libshiro-java.poms
@@ -33,7 +33,7 @@ support/aspectj/pom.xml --has-package-version --java-lib
 support/ehcache/pom.xml --has-package-version --java-lib
 support/quartz/pom.xml --has-package-version --java-lib
 support/spring/pom.xml --has-package-version --java-lib
-support/guice/pom.xml --ignore
+support/guice/pom.xml --has-package-version --java-lib
 support/features/pom.xml --has-package-version --java-lib
 support/cas/pom.xml --ignore
 samples/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 7245592..4a6a1f5 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -3,8 +3,6 @@ org.apache.shiro shiro-all jar * * *
 org.apache.shiro shiro-cas bundle * * *
 org.apache.shiro shiro-core test-jar * * *
 org.apache.shiro.samples shiro-samples pom * * *
-com.google.inject.extensions guice-multibindings * * * *
-com.google.inject.extensions guice-servlet * * * *
 org.apache.maven.plugins maven-assembly-plugin * * * *
 org.apache.maven.plugins maven-gpg-plugin * * * *
 org.apache.maven.plugins maven-jxr-plugin * * * *
diff --git a/debian/patches/01-bundles-to-jars.patch b/debian/patches/01-bundles-to-jars.patch
index fd71b9a..5c253f1 100644
--- a/debian/patches/01-bundles-to-jars.patch
+++ b/debian/patches/01-bundles-to-jars.patch
@@ -35,3 +35,14 @@ Forwarded: not-needed
  
      <dependencies>
          <dependency>
+--- a/support/guice/pom.xml
++++ b/support/guice/pom.xml
+@@ -29,7 +29,7 @@
+     <modelVersion>4.0.0</modelVersion>
+     <artifactId>shiro-guice</artifactId>
+     <name>Apache Shiro :: Support :: Guice</name>
+-    <packaging>bundle</packaging>
++    <packaging>jar</packaging>
+ 
+     <properties>
+         <guice.version>3.0</guice.version>

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