[jenkins] 02/05: Depend on the Servlet API 3.1 instead of 2.5

[Emmanuel Bourg]

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

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

commit 0ef1fb95508281e30fb7fed23102dc6186290535
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 8 10:27:10 2014 +0200

    Depend on the Servlet API 3.1 instead of 2.5
---
 debian/changelog   | 1 +
 debian/control     | 3 +--
 debian/maven.rules | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 89266a1..60d72d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ jenkins (1.565.2-1) UNRELEASED; urgency=medium
   * Switch to debhelper level 9
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
+    - Depend on the Servlet API 3.1 instead of 2.5
   * debian/copyright: Updated the Format URI to 1.0
   * Use XZ compression for the upstream tarball
   * Added a lintian override for the source-contains-prebuilt-javascript-object
diff --git a/debian/control b/debian/control
index 6e4140c..3bc801e 100644
--- a/debian/control
+++ b/debian/control
@@ -86,7 +86,7 @@ Build-Depends-Indep:
  libowasp-java-html-sanitizer-java,
  libpam4j-java,
  librobust-http-client-java,
- libservlet2.5-java,
+ libservlet3.1-java,
  libsezpoz-java,
  libsisu-guice-java,
  libspring-aop-java,
@@ -139,7 +139,6 @@ Depends:
  libmaven-hpi-plugin-java (>= 1.93),
  libmaven-javadoc-plugin-java,
  libmaven-stapler-plugin-java,
- libservlet2.5-java,
  libsurefire-java,
  ${misc:Depends}
 Description: Jenkins Plugin Parent Maven POM
diff --git a/debian/maven.rules b/debian/maven.rules
index c642f7b..a22c58f 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -40,7 +40,7 @@ s/groovy/org.codehaus.groovy/ groovy* * s/.*/1.x/ * *
 org.codehaus.groovy groovy* * s/.*/1.x/ * *
 org.mortbay.jetty * * s/6\..*/6.x/ * *
 org.springframework * * s/2\..*/3.x/ * *
-s/javax.servlet/javax.servlet.jsp/ jsp-api jar s/2\..*/2.1/ * *
+s/javax.servlet/javax.servlet.jsp/ s/jsp-api/javax.servlet.jsp-api/ jar s/2\..*/2.3/ * *
 # Remap hudson forks back to standard versions
 s/org.jvnet.hudson/javax.activation/ activation * s/.*/debian/ * *
 s/org.jenkins-ci/javax.jmdns/ jmdns * s/.*/debian/ * *
@@ -58,8 +58,8 @@ javax.servlet jstl * s/1\.1\..*/1.1/ * *
 # Remap for rename jna->jnr in Debian
 org.jruby.ext.posix s/jna-posix/jnr-posix/ * s/.*/debian/ * *
 s/com.github.jnr/org.jruby.ext.posix/ jnr-posix * s/.*/debian/ * *
-# Update to servlet2.5
-javax.servlet servlet-api * s/.*/2.5/ * *
+# Update to servlet3.1
+javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
 # Updates for 1.424.6
 s/org.kohsuke/owasp-java-html-sanitizer/ s/owasp-html-sanitizer/owasp-java-html-sanitizer/ * s/.*/debian/ * *
 # Updates for 1.447.1

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