This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libspring-java.
commit e337dc67cac72b7edc746535d3e0c34aa29c4773 Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 22 13:02:03 2016 +0200 Transition to the Servlet API 3.1 (Closes: #830496) --- debian/changelog | 7 ++ debian/control | 1 - debian/maven.rules | 6 +- .../patches/0041-servlet-api-compatibility.patch | 125 +++++++++++++++++++++ debian/patches/series | 1 + 5 files changed, 135 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7e9a8da..fd2920e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libspring-java (4.1.9-2) UNRELEASED; urgency=medium + + * Team upload. + * Transition to the Servlet API 3.1 (Closes: #830496) + + -- Emmanuel Bourg <[email protected]> Fri, 22 Jul 2016 12:55:56 +0200 + libspring-java (4.1.9-1) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index 19a228b..bb81113 100644 --- a/debian/control +++ b/debian/control @@ -71,7 +71,6 @@ Build-Depends-Indep: bsh, libquartz2-java, libreactor-core-java, librome-java, - libservlet3.0-java, libservlet3.1-java, libtiles-java (>= 3.0), libtomcat8-java, diff --git a/debian/maven.rules b/debian/maven.rules index b325607..3da5e1f 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -12,10 +12,8 @@ s/javax.jms/org.apache.geronimo.specs/ s/jms-api/geronimo-jms_1.1_spec/ * s/.*/d javax.portlet portlet-api * * * * s/javax.resource/org.apache.geronimo.specs/ s/connector-api/geronimo-j2ee-connector_1.5_spec/ * s/.*/debian/ * * s/javax.servlet.jsp.jstl/javax.servlet/ s/javax.servlet.jsp.jstl-api/jstl/ * s/.*/1.1/ * * -javax.servlet s/javax.servlet-api/servlet-api/ * s/3.0.*/3.0/ * * -javax.servlet javax.servlet-api * s/3.1.*/3.1/ * * -javax.servlet.jsp s/javax.servlet.jsp-api/jsp-api/ * s/2.2.*/2.2/ * * * -javax.servlet.jsp javax.servlet.jsp-api * s/2.3.*/2.3/ * * * +javax.servlet javax.servlet-api * s/.*/3.1/ * * +javax.servlet.jsp javax.servlet.jsp-api * s/2.*/2.3/ * * * s/javax.transaction/org.apache.geronimo.specs/ s/javax.transaction-api/geronimo-jta_1.2_spec/ * s/.*/debian/ * * s/javax.validation/org.apache.geronimo.specs/ s/validation-api/geronimo-validation_1.0_spec/ * s/.*/debian/ * * junit junit * s/.*/4.x/ * * diff --git a/debian/patches/0041-servlet-api-compatibility.patch b/debian/patches/0041-servlet-api-compatibility.patch new file mode 100644 index 0000000..f6ea20a --- /dev/null +++ b/debian/patches/0041-servlet-api-compatibility.patch @@ -0,0 +1,125 @@ +Description: Fixes the compatibility with the latest version of the Servlet API +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java ++++ b/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java +@@ -197,6 +197,14 @@ + public void write(byte[] b, int off, int len) throws IOException { + content.write(b, off, len); + } ++ ++ @Override ++ public boolean isReady() { ++ return true; ++ } ++ ++ @Override ++ public void setWriteListener(javax.servlet.WriteListener listener) { } + } + + +--- a/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java ++++ b/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java +@@ -182,6 +182,21 @@ + } + return ch; + } ++ ++ @Override ++ public boolean isReady() { ++ return is.isReady(); ++ } ++ ++ @Override ++ public boolean isFinished() { ++ return is.isFinished(); ++ } ++ ++ @Override ++ public void setReadListener(javax.servlet.ReadListener listener) { ++ is.setReadListener(listener); ++ } + } + + } +--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java ++++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java +@@ -152,6 +152,20 @@ + super.close(); + pushbackInputStream.close(); + } ++ @Override ++ public boolean isReady() { ++ try { ++ return pushbackInputStream.available() > 0; ++ } catch (IOException e) { ++ throw new RuntimeException(e); ++ } ++ } ++ @Override ++ public boolean isFinished() { ++ return false; ++ } ++ @Override ++ public void setReadListener(javax.servlet.ReadListener listener) { } + }; + } + }; +--- a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java ++++ b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java +@@ -65,4 +65,17 @@ + this.sourceStream.close(); + } + ++ @Override ++ public boolean isReady() { ++ return true; ++ } ++ ++ @Override ++ public boolean isFinished() { ++ return false; ++ } ++ ++ @Override ++ public void setReadListener(javax.servlet.ReadListener listener) { ++ } + } +--- a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java ++++ b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java +@@ -71,4 +71,13 @@ + this.targetStream.close(); + } + ++ @Override ++ public boolean isReady() { ++ return true; ++ } ++ ++ @Override ++ public void setWriteListener(javax.servlet.WriteListener listener) { ++ } ++ + } +--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java ++++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java +@@ -1160,4 +1160,8 @@ + return this.parts.values(); + } + ++ @Override ++ public <T extends javax.servlet.http.HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, ServletException { ++ throw new UnsupportedOperationException(); ++ } + } +--- a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java ++++ b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java +@@ -692,4 +692,8 @@ + } + } + ++ @Override ++ public String getVirtualServerName() { ++ throw new UnsupportedOperationException(); ++ } + } diff --git a/debian/patches/series b/debian/patches/series index 70415f7..3d900c5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,3 +10,4 @@ 0038-rome-compatibility.patch 0039-openjpa-compatibility.patch 0040-ignore-json-assert.patch +0041-servlet-api-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
