[commons-jcs] 20/27: Depend on libservlet3.1-java instead of libservlet2.5-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 commons-jcs.

commit ae965068cddd63d1b5e103b0d50c803a06ba315f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 16 09:50:03 2015 +0100

    Depend on libservlet3.1-java instead of libservlet2.5-java
---
 debian/control     | 3 ++-
 debian/maven.rules | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 9b60361..8aca701 100644
--- a/debian/control
+++ b/debian/control
@@ -26,8 +26,9 @@ Build-Depends-Indep: ant,
                      libhsqldb-java,
                      liblog4j1.2-java,
                      libmaven-antrun-plugin-java,
+                     libmaven-install-plugin-java,
                      libmaven-javadoc-plugin-java,
-                     libservlet2.5-java,
+                     libservlet3.1-java,
                      libvelocity-tools-java,
                      velocity,
                      default-jdk-doc,
diff --git a/debian/maven.rules b/debian/maven.rules
index b897f62..c0632ba 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -15,9 +15,7 @@ commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
 s/hsqldb/org.hsqldb/ hsqldb * s/.*/debian/ * *
 log4j log4j * s/1\.2\..*/1.2.x/ * *
 s/ant/org.apache.ant/ * * 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/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
 org.apache.velocity  velocity * s/.*/debian/ * *
 s/org.apache.velocity/velocity-tools/ s/velocity-tools/velocity-tools-view/ * * * *
 s/org.apache.geronimo.specs/javax.enterprise/ s/geronimo-jcdi_1.0_spec/cdi-api/ * s/.*/debian/ * *

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