From 89da0190524c5361723d7da6346efa75c526aef3 Mon Sep 17 00:00:00 2001 From: small_leek Date: Thu, 3 Sep 2020 14:46:57 +0800 Subject: [PATCH] modify sub-packages --- ...rts-remove-deprecated-html-exporters.patch | 66 +++++++++++++++++++ 0002-port-spring-test-to-servlet-4.0.patch | 49 ++++++++++++++ springframework-3.2.18.RELEASE.pom | 4 +- springframework.spec | 33 ++++++---- 4 files changed, 139 insertions(+), 13 deletions(-) create mode 100644 0001-jasperreports-remove-deprecated-html-exporters.patch create mode 100644 0002-port-spring-test-to-servlet-4.0.patch diff --git a/0001-jasperreports-remove-deprecated-html-exporters.patch b/0001-jasperreports-remove-deprecated-html-exporters.patch new file mode 100644 index 0000000..3d20b80 --- /dev/null +++ b/0001-jasperreports-remove-deprecated-html-exporters.patch @@ -0,0 +1,66 @@ +From 40adb84142c6e2471f62a051e21458cc25e00e28 Mon Sep 17 00:00:00 2001 +From: maminjie +Date: Wed, 2 Sep 2020 18:56:10 +0800 +Subject: [PATCH] remove deprecated html exporters + +--- + .../ui/jasperreports/JasperReportsUtils.java | 6 +++--- + .../servlet/view/jasperreports/JasperReportsHtmlView.java | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/spring-context-support/src/main/java/org/springframework/ui/jasperreports/JasperReportsUtils.java b/spring-context-support/src/main/java/org/springframework/ui/jasperreports/JasperReportsUtils.java +index b74611a..cb39b5c 100644 +--- a/spring-context-support/src/main/java/org/springframework/ui/jasperreports/JasperReportsUtils.java ++++ b/spring-context-support/src/main/java/org/springframework/ui/jasperreports/JasperReportsUtils.java +@@ -31,7 +31,7 @@ import net.sf.jasperreports.engine.JasperReport; + import net.sf.jasperreports.engine.data.JRBeanArrayDataSource; + import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; + import net.sf.jasperreports.engine.export.JRCsvExporter; +-import net.sf.jasperreports.engine.export.JRHtmlExporter; ++import net.sf.jasperreports.engine.export.HtmlExporter; + import net.sf.jasperreports.engine.export.JRPdfExporter; + import net.sf.jasperreports.engine.export.JRXlsExporter; + +@@ -165,7 +165,7 @@ public abstract class JasperReportsUtils { + Writer writer) throws JRException { + + JasperPrint print = JasperFillManager.fillReport(report, parameters, convertReportData(reportData)); +- render(new JRHtmlExporter(), print, writer); ++ render(new HtmlExporter(), print, writer); + } + + /** +@@ -184,7 +184,7 @@ public abstract class JasperReportsUtils { + Writer writer, Map exporterParameters) throws JRException { + + JasperPrint print = JasperFillManager.fillReport(report, parameters, convertReportData(reportData)); +- JRHtmlExporter exporter = new JRHtmlExporter(); ++ HtmlExporter exporter = new HtmlExporter(); + exporter.setParameters(exporterParameters); + render(exporter, print, writer); + } +diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java +index 83ac591..05d18b3 100644 +--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java ++++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java +@@ -17,7 +17,7 @@ + package org.springframework.web.servlet.view.jasperreports; + + import net.sf.jasperreports.engine.JRExporter; +-import net.sf.jasperreports.engine.export.JRHtmlExporter; ++import net.sf.jasperreports.engine.export.HtmlExporter; + + /** + * Implementation of {@code AbstractJasperReportsSingleFormatView} +@@ -35,7 +35,7 @@ public class JasperReportsHtmlView extends AbstractJasperReportsSingleFormatView + + @Override + protected JRExporter createExporter() { +- return new JRHtmlExporter(); ++ return new HtmlExporter(); + } + + @Override +-- +2.23.0 + diff --git a/0002-port-spring-test-to-servlet-4.0.patch b/0002-port-spring-test-to-servlet-4.0.patch new file mode 100644 index 0000000..eb602af --- /dev/null +++ b/0002-port-spring-test-to-servlet-4.0.patch @@ -0,0 +1,49 @@ +From 5613b4bfcd3aaf5fcaf51a1e400510897a9a764a Mon Sep 17 00:00:00 2001 +From: maminjie +Date: Thu, 3 Sep 2020 13:45:53 +0800 +Subject: [PATCH] port spring-test to servlet-4.0 + +--- + .../mock/web/MockServletContext.java | 28 +++++++++++++++++++ + 1 file changed, 28 insertions(+) + +diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java +index 35303d8..9294ce0 100644 +--- a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java ++++ b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java +@@ -601,4 +601,32 @@ public class MockServletContext implements ServletContext { + public String getVirtualServerName() { + throw new UnsupportedOperationException("Not implemented yet"); + } ++ ++ public void setResponseCharacterEncoding(String type) { ++ throw new UnsupportedOperationException("Not implemented yet"); ++ } ++ ++ public String getResponseCharacterEncoding() { ++ throw new UnsupportedOperationException("Not implemented yet"); ++ } ++ ++ public void setRequestCharacterEncoding(String type) { ++ throw new UnsupportedOperationException("Not implemented yet"); ++ } ++ ++ public String getRequestCharacterEncoding() { ++ throw new UnsupportedOperationException("Not implemented yet"); ++ } ++ ++ public void setSessionTimeout(int timeout) { ++ throw new UnsupportedOperationException("Not implemented yet"); ++ } ++ ++ public int getSessionTimeout() { ++ throw new UnsupportedOperationException("Not implemented yet"); ++ } ++ ++ public ServletRegistration.Dynamic addJspFile(String s1, String s2) { ++ throw new UnsupportedOperationException("Not implemented yet"); ++ } + } +-- +2.23.0 + diff --git a/springframework-3.2.18.RELEASE.pom b/springframework-3.2.18.RELEASE.pom index ad893c6..f2103f6 100644 --- a/springframework-3.2.18.RELEASE.pom +++ b/springframework-3.2.18.RELEASE.pom @@ -30,8 +30,8 @@ spring-oxm spring-struts spring-webmvc - - + spring-test + spring-test-mvc spring-webmvc-portlet diff --git a/springframework.spec b/springframework.spec index 6745291..ebb3870 100644 --- a/springframework.spec +++ b/springframework.spec @@ -1,6 +1,6 @@ Name: springframework Version: 3.2.18 -Release: 5 +Release: 6 Summary: The Spring Java Application Framework Epoch: 0 License: ASL 2.0 @@ -37,6 +37,8 @@ Patch6: springframework-3.2.13-derby.patch Patch7: springframework-3.2.14-jopt-simple.patch Patch8: springframework-3.2.14-build-with-tomcat8.patch Patch9: springframework-3.2.18-hibernate4.3.patch +Patch10: 0001-jasperreports-remove-deprecated-html-exporters.patch +Patch11: 0002-port-spring-test-to-servlet-4.0.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.lowagie:itext) mvn(com.rometools:rome) @@ -174,17 +176,19 @@ Summary: Spring Web Struts This package provide integrate a Struts application with Spring -%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} +%package test +Summary: Spring test context framework -%description devel -Spring's test MVC framework and Spring's test context framework. Also includes common Servlet and +%description test +Spring's test context framework. Also includes common Servlet and Portlet API mocks. +%package test-mvc +Summary: Spring Test MVC Framework + +%description test-mvc +Spring's test MVC framework. + %package tx Summary: Spring Transaction Management %description tx @@ -381,10 +385,10 @@ done %mvn_package :spring-project __noinstall %build -%mvn_build -X -f -s -- -Dproject.build.sourceEncoding=ISO-8859-1 -Dmaven.test.skip=true +%mvn_build -X -f -s -- -Dproject.build.sourceEncoding=ISO-8859-1 %install -%mvn_install -- -Dmaven.test.skip=true +%mvn_install %files -f .mfiles-springframework %license license.txt notice.txt @@ -418,6 +422,10 @@ done %files struts -f .mfiles-spring-struts +%files test -f .mfiles-spring-test + +%files test-mvc -f .mfiles-spring-test-mvc + %files tx -f .mfiles-spring-tx %files web -f .mfiles-spring-web @@ -427,5 +435,8 @@ done %files webmvc-portlet -f .mfiles-spring-webmvc-portlet %changelog +* Thu Sep 3 2020 maminjie - 3.2.18-6 +- port package to jasperreports-6.11.0 and servlet-4.0 + * Tue Jun 9 2020 yaokai - 3.2.18-5 - package init -- Gitee