!51 [sync] PR-49: Add -Xmx4096m for riscv64

From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia

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 <wang__ge@126.com>
+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
+

springframework.spec

@@ -1,6 +1,6 @@
 Name:                springframework
 Version:             3.2.18
-Release:             8
+Release:             14
 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)
@@ -85,6 +86,7 @@ BuildRequires:       mvn(velocity-tools:velocity-tools-view) mvn(velocity:veloci
 BuildRequires:       mvn(xmlunit:xmlunit) mvn(org.apache.taglibs:taglibs-standard-jstlel)
 BuildRequires:       mvn(javax.servlet:jstl) mvn(org.apache.taglibs:taglibs-standard-spec)
 BuildRequires:       mvn(com.jayway.jsonpath:json-path) mvn(net.sf.jopt-simple:jopt-simple) xmvn
+BuildRequires:       mvn(org.sonatype.oss:oss-parent:pom:)
 BuildRequires:       jboss-jms-1.1-api jdo2-api jboss-ejb-3.1-api
 Obsoletes:           springframework-instrument-tomcat < %{version}-%{release}
 BuildArch:           noarch
@@ -160,17 +162,6 @@ Summary:             Spring OXM
 This package provide marshaling and unmarshalling
 for XML with JAXB context and JiBX binding factories.
 
-%package devel
-Summary:             Spring test context and MVC framework
-Provides:            springframework-test = %{version}-%{release}
-Provides:            springframework-test-mvc = %{version}-%{release}
-Obsoletes:           springframework-test < %{version}-%{release}
-Obsoletes:           springframework-test-mvc < %{version}-%{release}
-
-%description devel
-Spring's test MVC framework and Spring's test context framework. Also includes common Servlet and
-Portlet API mocks.
-
 %package tx
 Summary:             Spring Transaction Management
 %description tx
@@ -327,6 +318,9 @@ done
 %mvn_package :spring-project __noinstall
 
 %build
+%if "%{_arch}" == "riscv64"
+export JAVA_TOOL_OPTIONS="-Xmx4096m"
+%endif
 %mvn_build -X -f -s -- -Dproject.build.sourceEncoding=ISO-8859-1 -Dmaven.test.skip=true
 
 %install
@@ -365,6 +359,24 @@ done
 %files web -f .mfiles-spring-web
 
 %changelog
+* Thu Apr 11 2024 Dingli Zhang <dingli@iscas.ac.cn> - 3.2.18-14
+- Add -Xmx4096m for riscv64
+
+* Thu Jan 04 2024 xu_ping <707078654@qq.com> - 3.2.18-13
+- remove unuse code
+
+* Thu May 18 2023 Ge Wang <wang__ge@126.com> - 3.2.18-12
+- Add build require sonatype-oss-parent
+
+* Mon Nov 21 2022 xu_ping <xuping33@h-partners.com> - 3.2.18-11
+- Modify invalid source
+
+* Tue Aug 2 2022 caodongxia <caodongxia@h-partners.com> - 3.2.18-10
+- This packages depends on log4j,release add 1 to rebuild
+
+* Thu Mar 31 2022 Ge Wang <wangge20@huawei.com> - 3.2.18-9
+- Override abstract method to solve compile failure
+
 * Fri Oct 29 2021 houyingchao <houyingchao@huawei.com> - 3.2.18-8
 - Fix CVE-2016-5007