[libfreemarker-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 libfreemarker-java.

commit 773c68150375a46f00ecdf15e7f5f064df082100
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jun 20 10:53:56 2016 +0200

    Transition to the Servlet API 3.1
---
 debian/changelog                         | 1 +
 debian/control                           | 1 -
 debian/maven.rules                       | 1 +
 debian/patches/fix-tests-classpath.patch | 4 ++--
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 05f0531..c12524b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libfreemarker-java (2.3.23-4) UNRELEASED; urgency=medium
 
   * Team upload.
   * Build with ivy-debian-helper
+  * Transition to the Servlet API 3.1
   * Standards-Version updated to 3.9.8 (no changes)
   * Use secure Vcs-* fields
 
diff --git a/debian/control b/debian/control
index af9f153..f436a2e 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,6 @@ Build-Depends: ant,
                liblogback-java,
                librhino-java,
                librhino-java-doc,
-               libservlet2.5-java,
                libservlet3.1-java,
                libslf4j-java,
                libtomcat8-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index d4c4716..38a2561 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -5,6 +5,7 @@ javax.el javax.el-api * s/.*/3.0/ * *
 javax.servlet.jsp s/jsp-api/javax.servlet.jsp-api/ * s/.*/2.3/ * *
 javax.servlet jstl * * * *
 javax.servlet javax.servlet-api * s/.*/3.1/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
 junit junit * s/.*/4.x/ * *
 org.antlr * * s/.*/3.x/ * *
 org.eclipse.jetty * * s/.*/9.x/ * *
diff --git a/debian/patches/fix-tests-classpath.patch b/debian/patches/fix-tests-classpath.patch
index 04f4a2a..d219f12 100644
--- a/debian/patches/fix-tests-classpath.patch
+++ b/debian/patches/fix-tests-classpath.patch
@@ -13,8 +13,8 @@ Forwarded: no
 +    <dependency org="org.antlr" name="antlr" rev="3.2" conf="build.test->default; test->default" />
 +    <dependency org="org.antlr" name="antlr-runtime" rev="3.2" conf="build.test->default; test->default" />
 +    <dependency org="asm" name="asm-all" rev="3.3" conf="build.test->default; test->default" />
-+    <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.1" conf="build.test->default; test->default" />
-+    <dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="build.test->default; test->default" />
++    <dependency org="javax.servlet.jsp" name="javax.servlet.jsp-api" rev="2.3" conf="build.test->default; test->default" />
++    <dependency org="javax.servlet" name="javax.servlet-api" rev="3.1" conf="build.test->default; test->default" />
      
      <dependency org="javax.servlet.jsp" name="jsp-api" rev="1.2" conf="build.jsp1.2->default" />
      <dependency org="javax.servlet" name="servlet-api" rev="2.3" conf="build.jsp1.2->default" />

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