This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git
from 431053679 Merge pull request #917 from apache/WW-5406-injection-order add bf5f29132 WW-5409 introduce final attribute to package element which make them unextendable add 4088f2ee2 WW-5409 update new dtd from 6.4.0 to 6.5.0 add 85783a0cc WW-5409 rename 6.5.0.dtd to 6.5.dtd to follow the naming pattern add 63267a8e0 Merge pull request #914 from atlassian-forks/issue/WW-5409-introduce-final-attribute-to-package-element No new revisions were added by this update. Summary of changes: .../xwork2/config/entities/PackageConfig.java | 13 +++++ .../providers/XmlDocConfigurationProvider.java | 25 +++++--- .../config/StrutsXmlConfigurationProvider.java | 1 + .../resources/{struts-6.0.dtd => struts-6.5.dtd} | 5 +- .../XmlConfigurationProviderPackagesTest.java | 68 ++++++++++++++++++---- .../xwork-test-package-extends-final.xml} | 14 +++-- .../config/providers/xwork-test-package-final.xml} | 14 +++-- 7 files changed, 109 insertions(+), 31 deletions(-) copy core/src/main/resources/{struts-6.0.dtd => struts-6.5.dtd} (96%) copy core/src/test/resources/{struts-checkbox-submit-unchecked.xml => com/opensymphony/xwork2/config/providers/xwork-test-package-extends-final.xml} (66%) copy core/src/test/resources/{struts-checkbox-submit-unchecked.xml => com/opensymphony/xwork2/config/providers/xwork-test-package-final.xml} (65%)