From 239d65f743d84cedd4e9d77a37aad634a7f4ca11 Mon Sep 17 00:00:00 2001 From: wang--ge Date: Thu, 31 Mar 2022 11:41:28 +0800 Subject: [PATCH] override abstract method to solve compile failure --- ...tInputStream-and-ServletOutputStream.patch | 77 +++++++++++++++++++ springframework.spec | 6 +- 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 0001-override-abstract-method-of-ServletInputStream-and-ServletOutputStream.patch diff --git a/0001-override-abstract-method-of-ServletInputStream-and-ServletOutputStream.patch b/0001-override-abstract-method-of-ServletInputStream-and-ServletOutputStream.patch new file mode 100644 index 0000000..6af5089 --- /dev/null +++ b/0001-override-abstract-method-of-ServletInputStream-and-ServletOutputStream.patch @@ -0,0 +1,77 @@ +From 7597f82cf9a8e9162dc7ce1eec5b9fa4913a6783 Mon Sep 17 00:00:00 2001 +From: wang--ge +Date: Thu, 31 Mar 2022 11:22:28 +0800 +Subject: [PATCH] override abstract method of ServletInputStream and + ServletOutputStream + +--- + .../web/filter/AbstractRequestLoggingFilter.java | 16 ++++++++++++++++ + .../web/filter/ShallowEtagHeaderFilter.java | 11 +++++++++++ + 2 files changed, 27 insertions(+) + +diff --git a/spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java b/spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java +index 211e197..9eac2d6 100644 +--- a/spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java ++++ b/spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java +@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletRequest; + import javax.servlet.http.HttpServletRequestWrapper; + import javax.servlet.http.HttpServletResponse; + import javax.servlet.http.HttpSession; ++import javax.servlet.ReadListener; + + import org.springframework.util.Assert; + import org.springframework.util.StringUtils; +@@ -367,6 +368,21 @@ public abstract class AbstractRequestLoggingFilter extends OncePerRequestFilter + } + return ch; + } ++ ++ @Override ++ public void setReadListener(ReadListener readListener) { ++ throw new UnsupportedOperationException("Not implemented yet"); ++ } ++ ++ @Override ++ public boolean isReady() { ++ throw new UnsupportedOperationException("Not implemented yet"); ++ } ++ ++ @Override ++ public boolean isFinished() { ++ throw new UnsupportedOperationException("Not implemented yet"); ++ } + } + } + +diff --git a/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java +index 4ec3870..3fc1705 100644 +--- a/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java ++++ b/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java +@@ -27,6 +27,7 @@ import javax.servlet.ServletOutputStream; + import javax.servlet.http.HttpServletRequest; + import javax.servlet.http.HttpServletResponse; + import javax.servlet.http.HttpServletResponseWrapper; ++import javax.servlet.WriteListener; + + import org.springframework.util.Assert; + import org.springframework.util.DigestUtils; +@@ -245,6 +246,16 @@ public class ShallowEtagHeaderFilter extends OncePerRequestFilter { + public void write(byte[] b, int off, int len) throws IOException { + content.write(b, off, len); + } ++ ++ @Override ++ public void setWriteListener(WriteListener arg0) { ++ throw new UnsupportedOperationException("Not implemented yet"); ++ } ++ ++ @Override ++ public boolean isReady() { ++ throw new UnsupportedOperationException("Not implemented yet"); ++ } + } + + +-- +2.27.0 + diff --git a/springframework.spec b/springframework.spec index 110af65..a2c01e7 100644 --- a/springframework.spec +++ b/springframework.spec @@ -1,6 +1,6 @@ Name: springframework Version: 3.2.18 -Release: 8 +Release: 9 Summary: The Spring Java Application Framework License: ASL 2.0 URL: http://projects.spring.io/spring-framework/ @@ -34,6 +34,7 @@ Patch8: springframework-3.2.14-build-with-tomcat8.patch Patch9: springframework-3.2.18-hibernate4.3.patch Patch10: CVE-2020-5421.patch patch11: CVE-2016-5007.patch +Patch12: 0001-override-abstract-method-of-ServletInputStream-and-ServletOutputStream.patch BuildRequires: maven-local mvn(aopalliance:aopalliance) mvn(c3p0:c3p0) mvn(com.caucho:hessian) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) mvn(com.h2database:h2) BuildRequires: mvn(com.jamonapi:jamon) mvn(com.rometools:rome) @@ -365,6 +366,9 @@ done %files web -f .mfiles-spring-web %changelog +* Thu Mar 31 2022 Ge Wang - 3.2.18-9 +- Override abstract method to solve compile failure + * Fri Oct 29 2021 houyingchao - 3.2.18-8 - Fix CVE-2016-5007 -- Gitee