This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libowasp-esapi-java.
commit 338745cf5a581f84ef6008cdbc86fee3c70940a5 Author: Emmanuel Bourg <[email protected]> Date: Mon Jun 20 17:06:43 2016 +0200 Transition to the Servlet API 3.1 (Closes: #801021) --- debian/changelog | 1 + debian/control | 4 +-- debian/maven.rules | 6 ++-- debian/patches/01-servlet-api-compatibility.patch | 40 +++++++++++++++++++++++ debian/patches/series | 1 + 5 files changed, 46 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1cf1354..f4d48e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libowasp-esapi-java (2.1.0-3) UNRELEASED; urgency=medium * Team upload. + * Transition to the Servlet API 3.1 (Closes: #801021) * Build with the DH sequencer instead of CDBS * Standards-Version updated to 3.9.8 (no changes) * Use secure Vcs-* URLs diff --git a/debian/control b/debian/control index 656f83f..b8fe7c8 100644 --- a/debian/control +++ b/debian/control @@ -23,8 +23,8 @@ Build-Depends-Indep: bsh, libmaven-javadoc-plugin-java, libowasp-antisamy-java, libowasp-antisamy-java-doc, - libservlet2.5-java, - libservlet2.5-java-doc, + libservlet3.1-java, + libservlet3.1-java-doc, libxom-java, libxom-java-doc Standards-Version: 3.9.8 diff --git a/debian/maven.rules b/debian/maven.rules index d5ae964..01e7700 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -6,7 +6,5 @@ org.beanshell s/bsh-core/bsh jar * * * org.owasp.antisamy antisamy jar s/.*/debian/ * * org.owasp.esapi esapi jar s/.*/debian/ * * log4j log4j * s/1\.2\..*/1.2.x/ * * -s/org.apache.tomcat/javax.el/ el-api jar s/.*/2.1/ * * -s/org.apache.tomcat/javax.servlet/ jsp-api jar s/.*/2.1/ * * -s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/ * * -s/javax.servlet/javax.servlet.jsp/ jsp-api * s/.*/debian/ * * +javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * * +s/javax.servlet/javax.servlet.jsp/ s/jsp-api/javax.servlet.jsp-api/ * s/.*/2.3/ * * diff --git a/debian/patches/01-servlet-api-compatibility.patch b/debian/patches/01-servlet-api-compatibility.patch new file mode 100644 index 0000000..9674760 --- /dev/null +++ b/debian/patches/01-servlet-api-compatibility.patch @@ -0,0 +1,40 @@ +Description: Fixes the compatibility with the latest version of the Servlet API +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/src/main/java/org/owasp/esapi/waf/internal/InterceptingServletOutputStream.java ++++ b/src/main/java/org/owasp/esapi/waf/internal/InterceptingServletOutputStream.java +@@ -158,4 +158,11 @@ + + } + ++ public boolean isReady() { ++ return true; ++ } ++ ++ public void setWriteListener(javax.servlet.WriteListener listener) { ++ } ++ + } +--- a/src/main/java/org/owasp/esapi/waf/internal/InterceptingHTTPServletRequest.java ++++ b/src/main/java/org/owasp/esapi/waf/internal/InterceptingHTTPServletRequest.java +@@ -184,6 +184,20 @@ + public synchronized void reset() throws IOException { + raf.seek(0); + } ++ public void setReadListener(javax.servlet.ReadListener listener) { ++ } ++ ++ public boolean isReady() { ++ return true; ++ } ++ ++ public boolean isFinished() { ++ try { ++ return raf.getFilePointer() >= raf.length(); ++ } catch (IOException e) { ++ throw new RuntimeException(e); ++ } ++ } + } + + } diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..971921d --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-servlet-api-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libowasp-esapi-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
