[libspring-security-2.0-java] 04/05: Transition to the Servlet API 3.1

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libspring-security-2.0-java.

commit d872da44d52510841096bf4ee7b747323f58426f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 22 00:35:34 2014 +0200

    Transition to the Servlet API 3.1
---
 debian/changelog        |  3 ++-
 debian/classpath-debian |  6 +++---
 debian/control          | 10 +++++-----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef60a6c..bfee468 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 libspring-security-2.0-java (2.0.7.RELEASE-3) UNRELEASED; urgency=medium
 
   * Team upload.
-  * Build depend on libtomcat7-java instead of libjboss-ejb3x-java
+  * Build depend on libtomcat8-java instead of libjboss-ejb3x-java
     to provide the javax.annotation.security annotations.
+  * Transition to the Servlet API 3.1
   * Switch to debhelper level 9
   * Standards-Version updated to 3.9.6 (no changes)
 
diff --git a/debian/classpath-debian b/debian/classpath-debian
index 7661563..6cdb175 100644
--- a/debian/classpath-debian
+++ b/debian/classpath-debian
@@ -6,7 +6,7 @@ usr/share/java/commons-collections3.jar
 usr/share/java/commons-logging.jar
 usr/share/java/ehcache.jar
 usr/share/java/jaxen.jar
-usr/share/java/servlet-api-2.5.jar
+usr/share/java/servlet-api-3.1.jar
 usr/share/java/spring3-aop.jar
 usr/share/java/spring3-beans.jar
 usr/share/java/spring3-context.jar
@@ -18,7 +18,7 @@ usr/share/java/spring3-transaction.jar
 usr/share/java/spring3-web.jar
 
 # spring-security-core-tiger
-usr/share/java/tomcat-annotations-api.jar
+usr/share/java/tomcat8-annotations-api.jar
 
 # spring-security-ntlm
 usr/share/java/jcifs.jar
@@ -28,4 +28,4 @@ usr/share/java/spring3-web.portlet.jar
 usr/share/java/portlet-api.jar
 
 # spring-security-taglibs
-usr/share/java/jsp-api-2.1.jar
+usr/share/java/jsp-api-2.3.jar
diff --git a/debian/control b/debian/control
index 0256912..b2170db 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends: ant,
                libjaxen-java,
                libjcifs-java,
                libportlet-api-2.0-spec-java,
-               libservlet2.5-java,
+               libservlet3.1-java,
                libspring-aop-java,
                libspring-beans-java,
                libspring-context-java,
@@ -28,7 +28,7 @@ Build-Depends: ant,
                libspring-transaction-java,
                libspring-web-java,
                libspring-web-portlet-java,
-               libtomcat7-java,
+               libtomcat8-java,
                xmlto
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/libspring-security-2.0-java.git
@@ -44,7 +44,7 @@ Depends: aspectj,
          libcommons-logging-java,
          libehcache-java,
          libjaxen-java,
-         libservlet2.5-java,
+         libservlet3.1-java,
          libspring-aop-java,
          libspring-beans-java,
          libspring-context-java,
@@ -123,7 +123,7 @@ Package: libspring-security-ntlm-2.0-java
 Architecture: all
 Depends: libcommons-logging-java,
          libjcifs-java,
-         libservlet2.5-java,
+         libservlet3.1-java,
          libspring-beans-java,
          libspring-core-java,
          libspring-ldap-java,
@@ -199,7 +199,7 @@ Description: modular Java/J2EE application security framework - Portlet
 Package: libspring-security-taglibs-2.0-java
 Architecture: all
 Depends: libcommons-logging-java,
-         libservlet2.5-java,
+         libservlet3.1-java,
          libspring-beans-java,
          libspring-context-java,
          libspring-core-java,

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