[h2database] 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 h2database.

commit 0fd20374d8fd80deaccba99ee043015884a4498d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jul 19 09:37:36 2016 +0200

    Transition to the Servlet API 3.1
---
 debian/changelog                                  |  6 ++
 debian/control                                    |  2 +-
 debian/patches/01-use-jar-files-from-debian.patch |  2 +-
 debian/patches/05-servlet-api-compatibility.patch | 82 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 5 files changed, 91 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index da78ca0..d5e15dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+h2database (1.4.192-3) UNRELEASED; urgency=medium
+
+  * Transition to the Servlet API 3.1
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 19 Jul 2016 09:33:57 +0200
+
 h2database (1.4.192-2) unstable; urgency=medium
 
   * Fixed the build failure in offline mode
diff --git a/debian/control b/debian/control
index e571897..1b7134a 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9),
                libjts-java,
                liblucene3-java,
                libosgi-compendium-java,
-               libservlet3.0-java,
+               libservlet3.1-java,
                libslf4j-java,
                maven-repo-helper
 Standards-Version: 3.9.8
diff --git a/debian/patches/01-use-jar-files-from-debian.patch b/debian/patches/01-use-jar-files-from-debian.patch
index efa01d7..2b86525 100644
--- a/debian/patches/01-use-jar-files-from-debian.patch
+++ b/debian/patches/01-use-jar-files-from-debian.patch
@@ -18,7 +18,7 @@ Last-Update: 2011-07-13
 -                File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" +
 -                File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" +
 -                File.pathSeparator + "ext/jts-core-1.14.0.jar" +
-+                File.pathSeparator + "/usr/share/java/servlet-api-3.0.jar" +
++                File.pathSeparator + "/usr/share/java/servlet-api-3.1.jar" +
 +                File.pathSeparator + "/usr/share/java/lucene3-core.jar" +
 +                File.pathSeparator + "/usr/share/java/slf4j-api.jar" +
 +                File.pathSeparator + "/usr/share/java/org.eclipse.osgi.jar" +
diff --git a/debian/patches/05-servlet-api-compatibility.patch b/debian/patches/05-servlet-api-compatibility.patch
new file mode 100644
index 0000000..e004e74
--- /dev/null
+++ b/debian/patches/05-servlet-api-compatibility.patch
@@ -0,0 +1,82 @@
+Description: Fixes the compatibility with the latest version of the Servlet API
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/test/org/h2/test/server/TestWeb.java
++++ b/src/test/org/h2/test/server/TestWeb.java
+@@ -624,6 +624,11 @@
+         }
+ 
+         @Override
++        public long getContentLengthLong() {
++            return 0;
++        }
++
++        @Override
+         public String getContentType() {
+             return null;
+         }
+@@ -846,6 +851,11 @@
+         }
+ 
+         @Override
++        public String changeSessionId() {
++            return null;
++        }
++
++        @Override
+         public Principal getUserPrincipal() {
+             return null;
+         }
+@@ -938,6 +948,10 @@
+             return null;
+         }
+ 
++        @Override
++        public <T extends javax.servlet.http.HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, javax.servlet.ServletException {
++            return null;
++        }
+     }
+ 
+     /**
+@@ -1017,6 +1031,11 @@
+         }
+ 
+         @Override
++        public void setContentLengthLong(long len) {
++            // ignore
++        }
++
++        @Override
+         public void setContentType(String arg0) {
+             // ignore
+         }
+@@ -1157,6 +1176,15 @@
+             }
+         }
+ 
++        @Override
++        public boolean isReady() {
++            return true;
++        }
++
++        @Override
++        public void setWriteListener(javax.servlet.WriteListener writeListener) {
++
++        }
+     }
+ 
+ }
+--- a/src/test/org/h2/test/unit/TestServlet.java
++++ b/src/test/org/h2/test/unit/TestServlet.java
+@@ -146,6 +146,11 @@
+             throw new UnsupportedOperationException();
+         }
+ 
++        @Override
++        public String getVirtualServerName() {
++            throw new UnsupportedOperationException();
++        }
++
+         /**
+          * @deprecated as of servlet API 2.1
+          */
diff --git a/debian/patches/series b/debian/patches/series
index 2912c0d..e74963d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-use-jar-files-from-debian.patch
 03-osgi-compatibility.patch
 04-reproducible-javadoc.patch
+05-servlet-api-compatibility.patch

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