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
commit 29d7a13c702a43531889e208fd9410af64c0ff6a Merge: 0650944 68648fe Author: Lukasz Lenart <lukaszlen...@apache.org> AuthorDate: Sat Jan 23 17:18:42 2021 +0100 Merge pull request #468 from apache/WW-4799-conversion-format [WW-4799] Adding struts.date.format as a conversion format for DateConverter .../opensymphony/xwork2/DefaultActionProxy.java | 6 +- .../xwork2/conversion/impl/DateConverter.java | 77 ++++++++- .../com/opensymphony/xwork2/StubTextProvider.java | 96 +++++++++++ .../xwork2/conversion/impl/DateConverterTest.java | 187 +++++++++++---------- .../conversion/impl/XWorkBasicConverterTest.java | 96 +++++++---- .../xwork2/conversion/impl/XWorkConverterTest.java | 27 +++ .../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 21 +-- .../validator/SimpleActionValidationTest.java | 18 +- 8 files changed, 384 insertions(+), 144 deletions(-)