This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5165-upgrade-spring
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 9f9edf4705d84b71df4188d58e2a0186ccf4ef32
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Tue May 17 07:37:39 2022 +0200
WW-5165 Upgrades Spring to version 5.3.20
---
core/pom.xml | 10 ++++++++++
.../test/java/org/apache/struts2/result/PlainResultTest.java | 6 +++---
plugins/portlet-mocks/pom.xml | 1 +
plugins/portlet/pom.xml | 7 ++-----
pom.xml | 7 +------
5 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index f34b8e92e..02f1a09f1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -242,6 +242,16 @@
<artifactId>spring-web</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/core/src/test/java/org/apache/struts2/result/PlainResultTest.java
b/core/src/test/java/org/apache/struts2/result/PlainResultTest.java
index 3c4264f72..995e1aac1 100644
--- a/core/src/test/java/org/apache/struts2/result/PlainResultTest.java
+++ b/core/src/test/java/org/apache/struts2/result/PlainResultTest.java
@@ -58,7 +58,7 @@ public class PlainResultTest extends StrutsInternalTestCase {
result.execute(invocation);
assertEquals("{ 'value': 'test' }", response.getContentAsString());
- assertEquals("application/json", response.getContentType());
+ assertEquals("application/json;charset=UTF-8",
response.getContentType());
}
public void testWriteContentTypeCsvWithCookie() throws Exception {
@@ -72,7 +72,7 @@ public class PlainResultTest extends StrutsInternalTestCase {
result.execute(invocation);
assertEquals("name;value\nline;1\nline;2",
response.getContentAsString());
- assertEquals("text/csv", response.getContentType());
+ assertEquals("text/csv;charset=UTF-8", response.getContentType());
}
public void testHeaders() throws Exception {
@@ -146,4 +146,4 @@ public class PlainResultTest extends StrutsInternalTestCase
{
ActionContext.getContext().withServletResponse(response).withActionInvocation(invocation);
}
-}
\ No newline at end of file
+}
diff --git a/plugins/portlet-mocks/pom.xml b/plugins/portlet-mocks/pom.xml
index c516946d8..806ed3284 100644
--- a/plugins/portlet-mocks/pom.xml
+++ b/plugins/portlet-mocks/pom.xml
@@ -51,6 +51,7 @@
</dependencies>
<properties>
+ <spring.platformVersion>4.3.30.RELEASE</spring.platformVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 2c12c7c2c..47f4a58da 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -130,11 +130,7 @@
<artifactId>spring-test</artifactId>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc-portlet</artifactId>
- <optional>true</optional>
- </dependency>
+
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
@@ -143,6 +139,7 @@
</dependencies>
<properties>
+ <spring.platformVersion>4.3.30.RELEASE</spring.platformVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
diff --git a/pom.xml b/pom.xml
index 9932e54e2..83015b061 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
<log4j2.version>2.17.2</log4j2.version>
<ognl.version>3.3.2</ognl.version>
<slf4j.version>1.7.32</slf4j.version>
- <spring.platformVersion>4.3.30.RELEASE</spring.platformVersion>
+ <spring.platformVersion>5.3.20</spring.platformVersion>
<tiles.version>3.0.8</tiles.version>
<tiles-request.version>1.0.7</tiles-request.version>
<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
@@ -988,11 +988,6 @@
<artifactId>spring-core</artifactId>
<version>${spring.platformVersion}</version>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc-portlet</artifactId>
- <version>${spring.platformVersion}</version>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
