This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5364-populate-allowlist in repository https://gitbox.apache.org/repos/asf/struts.git
from 9aff37a83 Merge branch 'master' into WW-5364-populate-allowlist add 5e33c7f2c WW-5343 Add unit test coverage for ProviderAllowlist add 16f822a2b WW-5343 Move JUnit4 test case into Struts-core add a26823386 WW-5343 Add integration tests for ConfigurationProvider populating ProviderAllowlist No new revisions were added by this update. Summary of changes: .../opensymphony/xwork2}/XWorkJUnit4TestCase.java | 3 +- .../providers/XmlDocConfigurationProvider.java | 6 +- .../org/apache/struts2/ognl/ProviderAllowlist.java | 18 +++- .../ConfigurationProviderOgnlAllowlistTest.java | 96 ++++++++++++++++++++++ .../apache/struts2/ognl/ProviderAllowlistTest.java | 70 ++++++++++++++++ ...clude-parent.xml => xwork-test-allowlist-2.xml} | 16 ++-- ...rceptors-basic.xml => xwork-test-allowlist.xml} | 24 +++--- .../apache/struts2/junit/XWorkJUnit4TestCase.java | 89 +------------------- .../org/apache/struts2/junit/XWorkTestCase.java | 4 + 9 files changed, 210 insertions(+), 116 deletions(-) copy {plugins/junit/src/main/java/org/apache/struts2/junit => core/src/main/java/com/opensymphony/xwork2}/XWorkJUnit4TestCase.java (97%) create mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationProviderOgnlAllowlistTest.java create mode 100644 core/src/test/java/org/apache/struts2/ognl/ProviderAllowlistTest.java copy core/src/test/resources/com/opensymphony/xwork2/config/providers/{xwork-include-parent.xml => xwork-test-allowlist-2.xml} (76%) copy core/src/test/resources/com/opensymphony/xwork2/config/providers/{xwork-test-interceptors-basic.xml => xwork-test-allowlist.xml} (70%) create mode 100644 plugins/junit/src/main/java/org/apache/struts2/junit/XWorkTestCase.java