[openjpa] 03/07: Build-Depend on libservlet3.1-java and update maven.rules.

[Markus Koschany]

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

apo pushed a commit to branch master
in repository openjpa.

commit 8dc42ae9224f93fe47941155a8f1f32a881fd4bf
Author: Markus Koschany <apo at debian.org>
Date:   Fri Jul 15 09:27:01 2016 +0200

    Build-Depend on libservlet3.1-java and update maven.rules.
---
 debian/control     | 1 +
 debian/maven.rules | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 9ec5418..f2251c4 100644
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,7 @@ Build-Depends: ant,
                libpostgresql-jdbc-java,
                libregexp-java,
                libserp-java,
+               libservlet3.1-java,
                maven-debian-helper,
                xmlto
 Standards-Version: 3.9.8
diff --git a/debian/maven.rules b/debian/maven.rules
index 98c4c5e..b7f5695 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -19,9 +19,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/ jar s/.*/3.1/ * *
 s/org.apache.felix/org.osgi/ org.osgi.core * * * *
 s/org.jmock/jmock/ jmock* jar s/2\..*/2.x/ * *
 asm asm jar s/.*/3.x/ * *

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