From e717e469a4ad74edd689073cb1fb5afb818f1521 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Mon, 4 Dec 2017 08:29:12 +0100 Subject: [PATCH 1/6] Uses the latest Spring version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 672b126da..73267690e 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ UTF-8 - 4.1.9.RELEASE + 4.3.13.RELEASE 3.1.15 5.2 3.0.7 From 6c3316a14a15a5a24fca5666d1d22900c25fd530 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Mon, 4 Dec 2017 08:29:29 +0100 Subject: [PATCH 2/6] Fixes test --- .../apache/struts2/interceptor/FileUploadInterceptorTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java index 9876fdf8e..9b6753572 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java @@ -224,10 +224,8 @@ public class FileUploadInterceptorTest extends StrutsInternalTestCase { public void testInvalidContentTypeMultipartRequest() throws Exception { MockHttpServletRequest req = new MockHttpServletRequest(); - req.setCharacterEncoding("text/html"); - req.setContentType("text/xml"); // not a multipart contentype + req.setContentType("multipart/form-data"); // not a multipart contentype req.setMethod("post"); - req.addHeader("Content-type", "multipart/form-data"); MyFileupAction action = container.inject(MyFileupAction.class); MockActionInvocation mai = new MockActionInvocation(); From 705887272356956587b23335c8bf2334e73d6cce Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Mon, 4 Dec 2017 08:29:44 +0100 Subject: [PATCH 3/6] Adds missing dependency --- plugins/json/pom.xml | 6 ++++++ plugins/rest/pom.xml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml index ccacc2960..c84fdff03 100644 --- a/plugins/json/pom.xml +++ b/plugins/json/pom.xml @@ -89,6 +89,12 @@ test + + org.springframework + spring-web + test + + org.easytesting fest-assert diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index 77b8119e7..06fa959ed 100644 --- a/plugins/rest/pom.xml +++ b/plugins/rest/pom.xml @@ -68,6 +68,12 @@ true + + org.springframework + spring-web + true + + org.springframework spring-core From bfa119c7dbd70aff48f0c6f2f0f52abf2bcf44a8 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Mon, 4 Dec 2017 08:29:54 +0100 Subject: [PATCH 4/6] Uses proper date format --- .../apache/struts2/rest/DefaultHttpHeadersTest.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java b/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java index 9cc1ac652..f23d014d5 100644 --- a/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java +++ b/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java @@ -30,19 +30,28 @@ import java.util.TimeZone; import static javax.servlet.http.HttpServletResponse.*; public class DefaultHttpHeadersTest extends TestCase { + + private static final String DATE_FORMAT = "EEE, dd MMM yyyy HH:mm:ss zzz"; + private static final TimeZone GMT = TimeZone.getTimeZone("GMT"); + private MockHttpServletResponse mockResponse; private MockHttpServletRequest mockRequest; + private SimpleDateFormat dateFormat; @Override public void setUp() { mockResponse = new MockHttpServletResponse(); mockRequest = new MockHttpServletRequest(); + + dateFormat = new SimpleDateFormat(DATE_FORMAT, Locale.US); + dateFormat.setTimeZone(GMT); } @Override public void tearDown() { mockRequest = null; mockRequest = null; + dateFormat = null; } public void testApply() { @@ -59,7 +68,7 @@ public class DefaultHttpHeadersTest extends TestCase { assertEquals(SC_CREATED, mockResponse.getStatus()); assertEquals("http://localhost/foo/bar/44.xhtml", mockResponse.getHeader("Location")); assertEquals("asdf", mockResponse.getHeader("ETag")); - assertEquals(String.valueOf(now.getTime()), mockResponse.getHeader("Last-Modified")); + assertEquals(dateFormat.format(now), mockResponse.getHeader("Last-Modified")); } From cf19d5130c3e7ef70af87944418233c81782809c Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Sat, 6 Jan 2018 09:07:16 +0100 Subject: [PATCH 5/6] Adds missing test dependency --- plugins/embeddedjsp/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index d629781eb..414a2a4bc 100644 --- a/plugins/embeddedjsp/pom.xml +++ b/plugins/embeddedjsp/pom.xml @@ -46,6 +46,11 @@ spring-core test + + org.springframework + spring-web + test + org.easymock easymock From 67bdf684196ae214d814513f52a0d38d4ed8e954 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Sat, 6 Jan 2018 10:13:59 +0100 Subject: [PATCH 6/6] Normalises name of property with Spring version --- apps/pom.xml | 2 +- pom.xml | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 1a7d12c96..791f306ba 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -99,7 +99,7 @@ org.springframework spring-test - ${struts2.springPlatformVersion} + ${spring.platformVersion} test diff --git a/pom.xml b/pom.xml index 73267690e..b15d3b880 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ UTF-8 - 4.3.13.RELEASE + 4.3.13.RELEASE 3.1.15 5.2 3.0.7 @@ -878,47 +878,47 @@ org.springframework spring-core - ${struts2.springPlatformVersion} + ${spring.platformVersion} org.springframework spring-webmvc-portlet - ${struts2.springPlatformVersion} + ${spring.platformVersion} org.springframework spring-context - ${struts2.springPlatformVersion} + ${spring.platformVersion} org.springframework spring-aop - ${struts2.springPlatformVersion} + ${spring.platformVersion} org.springframework spring-aspects - ${struts2.springPlatformVersion} + ${spring.platformVersion} org.springframework spring-beans - ${struts2.springPlatformVersion} + ${spring.platformVersion} org.springframework spring-test - ${struts2.springPlatformVersion} + ${spring.platformVersion} org.springframework spring-context-support - ${struts2.springPlatformVersion} + ${spring.platformVersion} org.springframework spring-web - ${struts2.springPlatformVersion} + ${spring.platformVersion}