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 772f8999b7a0993cb936534d4e16a06c4a446309
Merge: 4b51f93 8b4755d
Author: Lukasz Lenart <lukasz.len...@gmail.com>
AuthorDate: Thu Nov 15 16:14:15 2018 +0100
Merge pull request #267 from
pHeidelbach/WW-4930-smi-cannot-be-disabled-for-action-packges-found-via-convention-plugin
WW-4930 Add constant to enable smi inheritance
.../struts2/convention/ConventionConstants.java | 2 +
.../PackageBasedActionConfigBuilder.java | 9 +-
.../config/entities/ConventionConstantConfig.java | 10 ++
.../src/main/resources/struts-plugin.xml | 2 +
.../PackageBasedActionConfigBuilderTest.java | 103 +++++++++++++++++----
5 files changed, 109 insertions(+), 17 deletions(-)
