[stapler] 04/08: Switch from libservlet2.5-java to libservlet3.1-java.

[Markus Koschany]

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

apo pushed a commit to branch master
in repository stapler.

commit ea045c5835c6759a9a3912fafc43ff9118c18f1e
Author: Markus Koschany <apo at debian.org>
Date:   Sun Apr 3 17:20:58 2016 +0200

    Switch from libservlet2.5-java to libservlet3.1-java.
    
    Closes: #801025
---
 debian/control     | 2 +-
 debian/maven.rules | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 177b4ea..65849a3 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Build-Depends:
  libmetainf-services-java,
  libmetainf-services-java-doc,
  libmockito-java,
- libservlet2.5-java,
+ libservlet3.1-java,
  libtiger-types-java,
  maven-debian-helper
 Standards-Version: 3.9.7
diff --git a/debian/maven.rules b/debian/maven.rules
index 9b908bc..5100801 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -20,8 +20,8 @@ junit junit jar s/4\..*/4.x/ * *
 commons-collections commons-collections * s/3\..*/3.x/ * *
 s/org.kohsuke/org.ow2.asm/ s/asm5/asm-all/ * s/.*/4.x/ * *
 org.codehaus.groovy * * s/.*/2.x/ * *
-s/javax.servlet/javax.servlet.jsp/ jsp-api jar s/2\..*/2.1/ * *
-javax.servlet servlet-api jar s/2\..*/2.5/ * *
+s/javax.servlet/javax.servlet.jsp/ s/jsp-api/javax.servlet.jsp-api/ jar s/2\..*/2.3/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ jar s/2\..*/3.1/ * *
 org.jvnet.maven-jellydoc-plugin * * s/.*/1.x/ * *
 s/org.jvnet.hudson/org.jenkins-ci/ commons-jelly-tags-define * s/.*/debian/ * *
 s/org.jvnet.hudson/org.jenkins-ci/ htmlunit * s/.*/debian/ * *

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