Merge branch 'master' into action-context-boost
diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 0000000..45c3c73
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,10 @@
+notifications:
+ commits: commits@struts.apache.org
+ # Send all issue emails (new, closed, comments) to issues@
+ issues: issues@struts.apache.org
+ # Send new/closed PR notifications to dev@
+ pullrequests_status: dev@struts.apache.org
+ # Send individual PR comments/reviews to issues@
+ pullrequests_comment: issues@struts.apache.org
+ # Link opened PRs with JIRA
+ jira_options: link label worklog
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 @@
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 69e4180..9f4f0cb 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java
@@ -48,6 +48,7 @@
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();
