This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 9ce0a4893ab5b67434135d47f7cb4881c505ed6b
Merge: 62b9871a6 f977f0c0e
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Mon Jul 22 15:57:02 2024 +1000
Merge remote-tracking branch 'origin/master' into fork/6.6
.asf.yaml | 5 +-
.github/workflows/scorecards-analysis.yaml | 4 +-
apps/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 +-
.../org/demo/rest/example/OrdersController.java | 24 +-
.../java/org/demo/rest/example/OrdersService.java | 7 +-
apps/showcase/pom.xml | 10 +-
.../struts2/showcase/DynamicTreeSelectAction.java | 3 +-
.../showcase/LotsOfOptiontransferselectAction.java | 17 +-
.../showcase/LotsOfRichtexteditorAction.java | 7 +-
.../apache/struts2/showcase/MoreSelectsAction.java | 10 +-
.../showcase/ShowAjaxDynamicTreeAction.java | 2 +
.../org/apache/struts2/showcase/UITagExample.java | 8 +
.../showcase/action/AbstractCRUDAction.java | 101 +++---
.../struts2/showcase/action/EmployeeAction.java | 5 +-
.../struts2/showcase/action/ExampleAction.java | 10 +-
.../struts2/showcase/action/JSPEvalAction.java | 8 +-
.../struts2/showcase/action/SkillAction.java | 2 +
.../showcase/actionchaining/ActionChain1.java | 3 +
.../showcase/actionchaining/ActionChain2.java | 5 +-
.../showcase/actionchaining/ActionChain3.java | 8 +-
.../struts2/showcase/ajax/AjaxTestAction.java | 3 +-
.../showcase/ajax/AutocompleterExampleAction.java | 5 +-
.../showcase/ajax/Example4ShowPanelAction.java | 3 +
.../struts2/showcase/ajax/Example5Action.java | 3 +
.../struts2/showcase/ajax/tree/GetCategory.java | 3 +
.../apache/struts2/showcase/ajax/tree/Toggle.java | 2 +
.../struts2/showcase/async/ChatRoomAction.java | 13 +-
.../struts2/showcase/chat/ChatLoginAction.java | 5 +-
.../struts2/showcase/chat/CrudRoomAction.java | 3 +
.../struts2/showcase/chat/EnterRoomAction.java | 5 +-
.../struts2/showcase/chat/ExitRoomAction.java | 5 +-
.../chat/MessagesAvailableInRoomAction.java | 6 +-
.../showcase/chat/SendMessageToRoomAction.java | 10 +-
.../showcase/chat/UsersAvailableInRoomAction.java | 7 +-
.../showcase/conversion/OperationsEnumAction.java | 3 +-
.../MultipleFileUploadUsingArrayAction.java | 6 +-
.../showcase/freemarker/StandardTagsAction.java | 6 +-
.../showcase/hangman/GuessCharacterAction.java | 6 +-
.../showcase/modelDriven/ModelDrivenAction.java | 4 +
.../showcase/modelDriven/{ => model}/Gangster.java | 2 +-
.../struts2/showcase/person/EditPersonAction.java | 6 +-
.../struts2/showcase/person/ListPeopleAction.java | 3 +-
.../struts2/showcase/person/NewPersonAction.java | 3 +
.../struts2/showcase/source/ViewSourceAction.java | 12 +-
.../tag/nonui/actionPrefix/SubmitAction.java | 3 +
.../tag/nonui/debugtag/DebugTagAction.java | 3 +-
.../nonui/iteratortag/AppendIteratorTagDemo.java | 7 +-
.../iteratortag/IteratorGeneratorTagDemo.java | 9 +-
.../nonui/iteratortag/MergeIteratorTagDemo.java | 9 +-
.../nonui/iteratortag/SubsetIteratorTagDemo.java | 13 +-
.../apache/struts2/showcase/token/TokenAction.java | 2 +
.../AbstractValidationActionSupport.java | 1 +
.../showcase/validation/AjaxFormSubmitAction.java | 31 +-
.../validation/BeanValidationExampleAction.java | 13 +-
.../NonFieldValidatorsExampleAction.java | 5 +
.../struts2/showcase/validation/QuizAction.java | 4 +
.../showcase/validation/SubmitApplication.java | 3 +
.../validation/VisitorValidatorsExampleAction.java | 3 +
.../apache/struts2/showcase/xslt/JVMAction.java | 6 +-
.../src/main/resources/struts-fileupload.xml | 4 +-
apps/showcase/src/main/resources/struts.xml | 9 +
.../apache/struts2/showcase/ConventionTest.java | 88 +++++
assembly/pom.xml | 4 +-
bom/pom.xml | 6 +-
bundles/admin/pom.xml | 2 +-
.../struts2/osgi/admin/actions/BundlesAction.java | 9 +-
.../struts2/osgi/admin/actions/ShellAction.java | 15 +-
bundles/demo/pom.xml | 2 +-
.../src/main/java/actions/osgi/BundlesAction.java | 1 +
.../main/java/actions/osgi/HelloWorldAction.java | 4 +-
bundles/pom.xml | 2 +-
core/pom.xml | 8 +-
.../com/opensymphony/xwork2/ActionSupport.java | 5 +
.../opensymphony/xwork2/DefaultLocaleProvider.java | 18 +-
.../com/opensymphony/xwork2/LocaleProvider.java | 16 +
.../xwork2/ValidationAwareSupport.java | 15 +-
.../xwork2/config/ConfigurationUtil.java | 13 +-
.../config/providers/EnvsValueSubstitutor.java | 4 +-
.../providers/XmlDocConfigurationProvider.java | 17 +-
.../xwork2/interceptor/ValidationAware.java | 6 +-
.../xwork2/interceptor/annotations/Allowed.java | 2 +
.../AnnotationParameterFilterInterceptor.java | 7 +-
.../interceptor/annotations/BlockByDefault.java | 2 +
.../xwork2/interceptor/annotations/Blocked.java | 2 +
.../xwork2/ognl/ErrorMessageBuilder.java | 4 +-
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 54 ++--
.../xwork2/ognl/SecurityMemberAccess.java | 103 +++++-
.../com/opensymphony/xwork2/util/DebugUtils.java} | 40 +--
.../com/opensymphony/xwork2/util/ProxyUtil.java | 33 ++
.../xwork2/validator/ActionValidatorManager.java | 4 +-
.../validator/DefaultActionValidatorManager.java | 18 +-
.../validator/DelegatingValidatorContext.java | 12 +-
.../struts2/components/ServletUrlRenderer.java | 18 +-
.../java/org/apache/struts2/components/Set.java | 12 +-
.../struts2/dispatcher/DefaultActionSupport.java | 10 +-
.../struts2/interceptor/I18nInterceptor.java | 25 +-
.../struts2/interceptor/csp/CspInterceptor.java | 53 ++-
.../struts2/interceptor/csp/CspSettings.java | 8 +
.../interceptor/csp/DefaultCspSettings.java | 34 +-
.../interceptor/exec/StrutsBackgroundProcess.java | 20 +-
.../parameter/ParametersInterceptor.java | 51 +--
.../org/apache/struts2/ognl/ProviderAllowlist.java | 35 +-
.../views/freemarker/FreemarkerManager.java | 26 +-
.../com/opensymphony/xwork2/ActionSupportTest.java | 7 +-
.../xwork2/DefaultLocaleProviderTest.java | 174 ++++++++++
.../opensymphony/xwork2/LocaleProviderTest.java} | 70 ++--
.../com/opensymphony/xwork2/ModelDrivenAction.java | 8 +-
.../xwork2/ModelDrivenAnnotationAction.java | 8 +-
.../opensymphony/xwork2/ProxyInvocationAction.java | 2 +
.../java/com/opensymphony/xwork2/SimpleAction.java | 26 +-
.../xwork2/SimpleAnnotationAction.java | 32 +-
.../opensymphony/xwork2/ValidationOrderAction.java | 36 ++-
.../interceptor/ModelDrivenInterceptorTest.java | 8 +-
.../ScopedModelDrivenInterceptorTest.java | 10 +
.../annotations/AllowingByDefaultAction.java | 9 +-
.../annotations/BlockingByDefaultAction.java | 9 +-
.../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 36 ++-
.../xwork2/ognl/SecurityMemberAccessTest.java | 81 ++++-
.../xwork2/test/ModelDrivenAction2.java | 4 +-
.../xwork2/test/ModelDrivenAnnotationAction2.java | 4 +-
.../opensymphony/xwork2/test/SimpleAction2.java | 3 +-
.../opensymphony/xwork2/test/SimpleAction3.java | 8 +-
.../xwork2/test/SimpleAnnotationAction2.java | 2 +
.../xwork2/test/SimpleAnnotationAction3.java | 8 +-
.../ValidateAnnotatedMethodOnlyAction.java | 3 +
.../java/com/opensymphony/xwork2/util/Bar.java | 5 +-
.../util/StrutsLocalizedTextProviderTest.java | 10 +-
.../validator/ActionValidatorManagerTest.java | 5 +-
.../validator/AnnotationValidationAction.java | 1 +
.../validator/AnnotationValidationExpAction.java | 1 +
.../DefaultActionValidatorManagerTest.java | 358 ++++++++++-----------
.../validator/StringLengthFieldValidatorTest.java | 7 +
.../validator/VisitorFieldValidatorTest.java | 11 +
.../validator/VisitorValidatorModelAction.java | 3 +
.../validator/VisitorValidatorTestAction.java | 18 +-
.../apache/struts2/ExecutionCountTestAction.java | 3 +-
.../org/apache/struts2/HttpMethodsTestAction.java | 2 +
.../test/java/org/apache/struts2/TestAction.java | 1 +
.../struts2/interceptor/CookieInterceptorTest.java | 9 +
.../struts2/interceptor/CspInterceptorTest.java | 116 ++++++-
.../interceptor/FileUploadInterceptorTest.java | 4 +-
.../struts2/interceptor/I18nInterceptorTest.java | 20 ++
.../exec/StrutsBackgroundProcessTest.java | 60 +++-
.../parameter/ParametersInterceptorTest.java | 61 ++--
.../apache/struts2/ognl/ProviderAllowlistTest.java | 27 +-
.../struts2/url/StrutsQueryStringParserTest.java | 8 +
.../views/jsp/IteratorGeneratorTagTest.java | 13 +-
.../org/apache/struts2/views/jsp/SetTagTest.java | 58 +++-
.../struts2/views/jsp/SortIteratorTagTest.java | 22 +-
.../struts2/views/jsp/SubsetIteratorTagTest.java | 29 +-
.../org/apache/struts2/views/jsp/URLTagTest.java | 36 +++
.../views/jsp/ui/DoubleValidationAction.java | 2 +
.../struts2/views/jsp/ui/FieldErrorTagTest.java | 13 +-
.../struts2/views/jsp/ui/IntValidationAction.java | 2 +
.../VisitorValidatorTestAction-validation.xml | 8 +
plugins/async/pom.xml | 2 +-
plugins/bean-validation/pom.xml | 2 +-
.../struts/beanvalidation/actions/FieldAction.java | 2 +
.../beanvalidation/actions/FieldMatchAction.java | 5 +
.../beanvalidation/actions/ModelDrivenAction.java | 5 +-
.../actions/ValidateGroupAction.java | 7 +-
plugins/cdi/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
.../struts2/config_browser/ActionNamesAction.java | 5 +-
.../config_browser/ListValidatorsAction.java | 8 +-
.../struts2/config_browser/ShowBeansAction.java | 2 +
.../struts2/config_browser/ShowConfigAction.java | 25 +-
.../config_browser/ShowValidatorAction.java | 24 +-
plugins/convention/pom.xml | 2 +-
.../convention/ClasspathConfigurationProvider.java | 11 +-
.../convention/ClasspathPackageProvider.java | 11 +-
.../PackageBasedActionConfigBuilder.java | 61 ++--
.../src/test/java/actions/MessageAction.java | 2 +-
.../PackageBasedActionConfigBuilderTest.java | 52 ++-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 4 +-
plugins/javatemplates/pom.xml | 2 +-
plugins/jfreechart/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
.../json/JSONValidationInterceptorTest.java | 5 +
plugins/junit/pom.xml | 2 +-
.../org/apache/struts2/junit/JUnitTestAction.java | 2 +
.../struts2/junit/session/SessionGetAction.java | 1 +
.../struts2/junit/session/SessionSetAction.java | 1 +
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
.../oval/interceptor/FieldsWithProfiles.java | 4 +
.../struts2/oval/interceptor/MemberObject.java | 8 +-
.../oval/interceptor/ModelDrivenAction.java | 11 +-
.../struts2/oval/interceptor/SimpleField.java | 5 +-
.../struts2/oval/interceptor/SimpleFieldI18n.java | 2 +
.../interceptor/SimpleFieldI18nDefaultKey.java | 4 +-
.../interceptor/SimpleFieldJPAAnnotations.java | 2 +
.../interceptor/SimpleFieldOGNLExpression.java | 4 +-
.../struts2/oval/interceptor/SimpleFieldsXML.java | 4 +-
.../oval/interceptor/SimpleFieldsXMLChild.java | 3 +
.../struts2/oval/interceptor/SimpleMethod.java | 4 +-
plugins/pell-multipart/pom.xml | 2 +-
plugins/plexus/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/portlet-junit/pom.xml | 2 +-
plugins/portlet-mocks/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
plugins/rest/pom.xml | 2 +-
.../struts2/rest/RestActionInvocationTest.java | 65 ++--
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
.../com/opensymphony/xwork2/ModelDrivenAction.java | 8 +-
.../xwork2/ognl/SecurityMemberAccessProxyTest.java | 92 +++---
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 14 +-
.../struts2/tiles/StrutsTilesContainerFactory.java | 16 +-
.../StrutsWildcardServletApplicationContext.java | 9 +-
.../tiles/StrutsTilesContainerFactoryTest.java | 9 +-
...trutsWildcardServletApplicationContextTest.java | 79 +++++
plugins/tiles/src/test/resources/WEB-INF/tiles.xml | 39 +++
.../org/apache/tiles/core/config/tiles_defs1.xml | 75 +++++
plugins/velocity/pom.xml | 2 +-
plugins/xslt/pom.xml | 2 +-
pom.xml | 47 +--
224 files changed, 2552 insertions(+), 1002 deletions(-)
diff --cc core/pom.xml
index 3ced5b437,e3d9d5d28..23c48639e
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-atlassian-2-SNAPSHOT</version>
- <version>6.7.0-SNAPSHOT</version>
++ <version>6.6.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --cc plugins/junit/pom.xml
index 5d365738b,f30858ced..141f48381
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-atlassian-2-SNAPSHOT</version>
- <version>6.7.0-SNAPSHOT</version>
++ <version>6.6.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --cc plugins/pom.xml
index 755df8045,f03266978..bcbb010c5
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-atlassian-2-SNAPSHOT</version>
- <version>6.7.0-SNAPSHOT</version>
++ <version>6.6.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --cc plugins/spring/pom.xml
index 0e5776ff4,c42df09f4..451eaa989
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-atlassian-2-SNAPSHOT</version>
- <version>6.7.0-SNAPSHOT</version>
++ <version>6.6.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --cc plugins/velocity/pom.xml
index 9484028f6,34299d922..d7219d731
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-atlassian-2-SNAPSHOT</version>
- <version>6.7.0-SNAPSHOT</version>
++ <version>6.6.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --cc pom.xml
index deefe04b9,123210039..332afb450
--- a/pom.xml
+++ b/pom.xml
@@@ -29,7 -29,7 +29,7 @@@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-atlassian-2-SNAPSHOT</version>
- <version>6.7.0-SNAPSHOT</version>
++ <version>6.6.0-atlassian-1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
