[jets3t] 04/06: Transition to the Servlet API 3.1 (Closes: #801015)

[Emmanuel Bourg]

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

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

commit 165be11e6070e7fc81bcab98b1f7665dd5239126
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jun 21 12:25:52 2016 +0200

    Transition to the Servlet API 3.1 (Closes: #801015)
---
 debian/changelog        | 1 +
 debian/classpath-debian | 2 +-
 debian/control          | 2 +-
 debian/maven.rules      | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b1852bb..0cab289 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jets3t (0.8.1+dfsg-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Transition to the Servlet API 3.1 (Closes: #801015)
   * Standards-Version updated to 3.9.8 (no changes)
   * Use secure Vcs-* URLs
 
diff --git a/debian/classpath-debian b/debian/classpath-debian
index 93ac0dc..b47df29 100644
--- a/debian/classpath-debian
+++ b/debian/classpath-debian
@@ -1,5 +1,5 @@
 usr/share/java/commons-logging.jar
-usr/share/java/servlet-api-2.5.jar
+usr/share/java/servlet-api-3.1.jar
 usr/share/java/axis.jar
 usr/share/java/jaxrpc.jar
 usr/share/java/axis-jaxrpc.jar
diff --git a/debian/control b/debian/control
index f9ace47..eb610e4 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: ant,
                libcommons-httpclient-java,
                libcommons-logging-java,
                libjava-xmlbuilder-java,
-               libservlet2.5-java,
+               libservlet3.1-java,
                maven-repo-helper,
                perl
 Standards-Version: 3.9.8
diff --git a/debian/maven.rules b/debian/maven.rules
index abb7852..500ed00 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,5 +1,5 @@
 # Make sure package uses versioned API for servlets
-javax.servlet servlet-api * s/2\..*/2.5/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
 # Version jets3t for 0.x
 net.java.dev.jets3t * * s/0\..*/0.x/ * *
 commons-httpclient commons-httpclient * s/3\..*/3.x/ * *

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