[velocity-tools] 01/03: 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 velocity-tools.

commit 184a55809c74c92827eb1bae86d54ae3dcd799ea
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jun 23 14:59:17 2016 +0200

    Transition to the Servlet API 3.1
---
 debian/changelog                                 |  7 +++++++
 debian/control                                   |  2 +-
 debian/maven.rules                               |  2 +-
 debian/patches/03_servlet_api_compatibility.diff | 17 ++++++++++++++++-
 debian/rules                                     |  2 +-
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 64d49cb..34ea8d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+velocity-tools (2.0-6) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Transition to the Servlet API 3.1
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 23 Jun 2016 14:03:50 +0200
+
 velocity-tools (2.0-5) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index a45f762..a070bae 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends-Indep: ant-optional,
                      libcommons-validator-java,
                      libdom4j-java,
                      liboro-java,
-                     libservlet3.0-java,
+                     libservlet3.1-java,
                      maven-repo-helper,
                      velocity
 Standards-Version: 3.9.7
diff --git a/debian/maven.rules b/debian/maven.rules
index 1887d2d..0756233 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,3 +1,3 @@
-javax.servlet servlet-api jar *
+javax.servlet s/servlet-api/javax.servlet-api/ jar s/.*/3.1/
 commons-collections commons-collections jar s/3\..*/3.x/
 
diff --git a/debian/patches/03_servlet_api_compatibility.diff b/debian/patches/03_servlet_api_compatibility.diff
index 5cda71a..2127fe7 100644
--- a/debian/patches/03_servlet_api_compatibility.diff
+++ b/debian/patches/03_servlet_api_compatibility.diff
@@ -1,4 +1,4 @@
-Description: Fix the compatibility with the Servlet API 3.0
+Description: Fix the compatibility with the Servlet API 3.1
 Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 --- a/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
@@ -20,3 +20,18 @@ Forwarded: no
              {
                  entry.setValue(Array.get(value, 0));
              }
+--- a/src/main/java/org/apache/velocity/tools/view/ImportSupport.java
++++ b/src/main/java/org/apache/velocity/tools/view/ImportSupport.java
+@@ -510,6 +510,12 @@
+                     {
+                         bos.write(b);
+                     }
++
++                    public boolean isReady() {
++                        return true;
++                    }
++
++                    public void setWriteListener(javax.servlet.WriteListener listener) { }
+                 };
+             return sos;
+         }
diff --git a/debian/rules b/debian/rules
index ecde94f..b25c229 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/class/ant.mk
 JAVA_HOME            := /usr/lib/jvm/default-java
 ANT_HOME             := /usr/share/ant
 
-DEB_JARS             := antlr commons-beanutils commons-collections3 commons-digester commons-lang commons-logging commons-validator oro servlet-api-3.0 jsp-api-2.2 velocity junit4 ant-junit dom4j
+DEB_JARS             := antlr commons-beanutils commons-collections3 commons-digester commons-lang commons-logging commons-validator oro servlet-api-3.1 jsp-api-2.3 velocity junit4 ant-junit dom4j
 
 DEB_ANT_BUILD_TARGET := jar.view jar.generic javadoc
 #DEB_ANT_CHECK_TARGET := test.generic

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