[libcommons-fileupload-java] 01/01: 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 libcommons-fileupload-java.

commit 99454e7893886d73b4546c92656603bc4b558632
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jun 23 13:59:23 2016 +0200

    Transition to the Servlet API 3.1
---
 debian/changelog                                   |  7 ++++
 debian/control                                     |  2 +-
 debian/maven.rules                                 |  2 +-
 .../001_update-tests-for-servlet3-api.patch        | 46 +++++++++++++++++++++-
 4 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6cc1726..866eea3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcommons-fileupload-java (1.3.2-2) unstable; urgency=medium
+
+  * Team upload.
+  * Transition to the Servlet API 3.1
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 23 Jun 2016 13:59:04 +0200
+
 libcommons-fileupload-java (1.3.2-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 24079d7..ecfa94f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends-Indep: junit4,
                      libcommons-io-java,
                      libmaven-javadoc-plugin-java,
                      libportlet-api-2.0-spec-java,
-                     libservlet3.0-java
+                     libservlet3.1-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libcommons-fileupload-java.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libcommons-fileupload-java.git
diff --git a/debian/maven.rules b/debian/maven.rules
index bc80a7c..888ca3b 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,5 +1,5 @@
 
-javax.servlet servlet-api jar s/.*/3.0/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ jar s/.*/3.1/ * *
 junit junit jar s/4\..*/4.x/ * *
 s/portlet-api/javax.portlet/ portlet-api jar s/.*/2.0/ * *
 s/org.apache.portals/javax.portlet/ s/portlet-api_2.0_spec/portlet-api/ jar s/.*/2.0/ * *
diff --git a/debian/patches/001_update-tests-for-servlet3-api.patch b/debian/patches/001_update-tests-for-servlet3-api.patch
index 7ca5a79..03a832c 100644
--- a/debian/patches/001_update-tests-for-servlet3-api.patch
+++ b/debian/patches/001_update-tests-for-servlet3-api.patch
@@ -28,7 +28,29 @@ Forwarded: not-needed
  
  /**
   * @version $Id: MockHttpServletRequest.java 1565255 2014-02-06 13:49:17Z ggregory $
-@@ -485,6 +494,52 @@
+@@ -221,6 +230,10 @@
+         return null;
+     }
+ 
++    public String changeSessionId() {
++        return null;
++    }
++
+     /**
+      * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdValid()
+      */
+@@ -296,6 +309,10 @@
+         return iLength;
+     }
+ 
++    public long getContentLengthLong() {
++        return getContentLength();
++    }
++
+     /**
+      * For testing attack scenarios in SizesTest.
+      */
+@@ -485,6 +502,56 @@
          return null;
      }
  
@@ -78,6 +100,28 @@ Forwarded: not-needed
 +        return null;
 +    }
 +
++    public javax.servlet.http.HttpUpgradeHandler upgrade(Class handlerClass) throws IOException, ServletException {
++        return null;
++    }
++
      private static class MyServletInputStream
          extends javax.servlet.ServletInputStream {
  
+@@ -513,6 +580,17 @@
+             return in.read(b, off, len);
+         }
+ 
++        public boolean isFinished() {
++            return false;
++        }
++
++        public boolean isReady() {
++            return true;
++        }
++
++        public void setReadListener(javax.servlet.ReadListener listener) {
++        }
++
+     }
+ 
+ }

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