[shiro] 04/07: Enabled the dependencies on libhsqldb-java and liblog4j1.2-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 shiro.

commit f4fa4c3be6bb1b5220b89c588b795cebbf2b5b44
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 9 11:12:49 2014 +0200

    Enabled the dependencies on libhsqldb-java and liblog4j1.2-java
---
 debian/control           | 2 ++
 debian/maven.ignoreRules | 6 ------
 debian/maven.rules       | 7 +------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index 94b8a3b..1195e2e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,8 @@ Build-Depends-Indep: libapache-pom-java (>= 10),
                      libjstl1.1-java,
                      libguava-java,
                      libguice-java,
+                     libhsqldb-java,
+                     liblog4j1.2-java,
                      libmaven-bundle-plugin-java,
                      libquartz-java,
                      libservlet2.5-java,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 08bb17b..7245592 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -5,8 +5,6 @@ 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 * * * *
-hsqldb hsqldb * * * *
-log4j log4j * * * *
 org.apache.maven.plugins maven-assembly-plugin * * * *
 org.apache.maven.plugins maven-gpg-plugin * * * *
 org.apache.maven.plugins maven-jxr-plugin * * * *
@@ -25,8 +23,4 @@ org.codehaus.mojo dashboard-maven-plugin * * * *
 org.codehaus.mojo jdepend-maven-plugin * * * *
 org.codehaus.mojo taglist-maven-plugin * * * *
 org.easymock easymock * * * *
-org.hsqldb hsqldb * * * *
-org.slf4j jcl-over-slf4j * * * *
-org.slf4j slf4j-log4j12 * * * *
-org.slf4j slf4j-simple * * * *
 org.springframework spring-test * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 98792f2..8c4c341 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -8,14 +8,9 @@ commons-beanutils commons-beanutils jar s/.*/debian/ * *
 javax.servlet jstl jar s/.*/1.1/ * *
 junit junit jar s/4\..*/4.x/ * *
 org.apache apache pom s/.*/debian/ * *
-org.quartz-scheduler quartz jar s/.*/debian/ * *
 s/hsqldb/org.hsqldb/ hsqldb * s/.*/debian/ * *
 junit junit * s/4\..*/4.x/ * *
 org.apache.felix maven-bundle-plugin * s/.*/2.3.5/ * *
 org.springframework * * s/3\..*/3.x/ * *
-s/com.google.code.google-collections/com.google.guava/ s/google-collect/guava/ s/jar/bundle/ s/.*/debian/ * *
-s/com.google.collections/com.google.guava/ s/google-collections/guava/ s/jar/bundle/ s/.*/debian/ * *
-s/org.apache.tomcat/javax.el/ el-api jar s/.*/2.1/ * *
-s/org.apache.tomcat/javax.servlet/ jsp-api jar s/.*/2.1/ * *
-s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/ * *
 s/org.opensymphony.quartz/org.quartz-scheduler/ quartz * s/.*/debian/ * *
+log4j log4j * s/.*/1.2.x/ * *

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