[struts] branch master updated: Merge pull request #404 from JCgH4164838Gh792C124B5/WW-5069

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/master by this push:
     new 9faa39c  Merge pull request #404 from JCgH4164838Gh792C124B5/WW-5069
     new 387c203  Merge pull request #409 from 
JCgH4164838Gh792C124B5/WW-5069_CPickPR404
9faa39c is described below

commit 9faa39c8dc7d6cbdc10ebb393531a90a3ec58c97
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Mon Apr 20 07:23:57 2020 +0200

    Merge pull request #404 from JCgH4164838Gh792C124B5/WW-5069
    
    Initial fix for WW-5069 (improve build behaviour JDK9+)
    
    (cherry picked from commit 1526b36dd623164d671ec1f03ecf832b6b71f313)
---
 .../java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java   | 1 +
 .../com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java     | 1 +
 2 files changed, 2 insertions(+)

diff --git 
a/core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java
 
b/core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java
index a8f64e9..98a5ed0 100644
--- 
a/core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java
+++ 
b/core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java
@@ -48,6 +48,7 @@ public class DateRangeValidatorTest extends XWorkTestCase {
         HashMap<String, Object> params = new HashMap<>();
         params.put("date", date.getTime());
         context.put(ActionContext.PARAMETERS, 
HttpParameters.create(params).build());
+        context.put(ActionContext.LOCALE, Locale.US);  // Force US Locale for 
date conversion tests on JDK9+
 
         ActionProxy proxy = actionProxyFactory.createActionProxy("", 
MockConfigurationProvider.VALIDATION_ACTION_NAME, null, context);
         proxy.execute();
diff --git 
a/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java
 
b/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java
index 62ed2ba..0b64968 100644
--- 
a/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java
+++ 
b/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java
@@ -40,6 +40,7 @@ public class VisitorFieldValidatorTest extends XWorkTestCase {
     public void setUp() throws Exception {
         super.setUp();
 
+        ActionContext.getContext().put(ActionContext.LOCALE, Locale.US);  // 
Force US Locale for date conversion tests on JDK9+
         action = container.inject(VisitorValidatorTestAction.class);
 
         TestBean bean = action.getBean();