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 df5ad6914e7ba19c0ccad853076508e90e807e72
Merge: f50587ade 7a77c7a82
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Wed Feb 5 10:52:02 2025 +1100
Merge remote-tracking branch 'origin/release/struts-6-7-x' into
issue-85/CONFSRVDEV-37138-merge-upstream
.asf.yaml | 12 +-
Jenkinsfile | 65 ++--------
apps/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 +-
apps/showcase/pom.xml | 2 +-
assembly/pom.xml | 2 +-
bom/pom.xml | 8 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
.../opensymphony/xwork2/inject/ContainerImpl.java | 54 +++++++-
.../security/DefaultExcludedPatternsChecker.java | 1 +
.../com/opensymphony/xwork2/util/DebugUtils.java | 2 +-
.../apache/struts2/components/ActionComponent.java | 4 +-
.../org/apache/struts2/components/Component.java | 20 +--
.../java/org/apache/struts2/components/Form.java | 2 +-
.../org/apache/struts2/components/Include.java | 9 +-
.../java/org/apache/struts2/components/Label.java | 4 +-
.../org/apache/struts2/components/ListUIBean.java | 2 +-
.../struts2/components/ServletUrlRenderer.java | 2 +-
.../java/org/apache/struts2/components/UIBean.java | 40 ++++--
.../java/org/apache/struts2/components/URL.java | 2 +-
.../apache/struts2/dispatcher/AttributeMap.java | 2 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 2 +-
.../multipart/AbstractMultiPartRequest.java | 33 ++++-
.../multipart/JakartaMultiPartRequest.java | 38 +++++-
.../multipart/JakartaStreamMultiPartRequest.java | 38 +++++-
.../org/apache/struts2/views/jsp/TagUtils.java | 6 +-
.../src/main/resources/struts-excluded-classes.xml | 11 ++
.../xwork2/inject/ContainerImplTest.java | 142 +++++++++++++++++----
.../DefaultExcludedPatternsCheckerTest.java | 2 +-
.../opensymphony/xwork2/test/StrutsUtilBean.java} | 37 +++---
.../apache/struts2/components/UIBeanTagTest.java | 88 +++++++++++++
.../struts2/dispatcher/AttributeMapTest.java | 24 +++-
.../apache/struts2/dispatcher/DispatcherTest.java | 3 +
.../ActionFileUploadInterceptorTest.java | 69 +++++++++-
.../parameter/ParametersInterceptorTest.java | 10 +-
.../org/apache/struts2/util/StrutsUtilTest.java | 53 ++------
plugins/async/pom.xml | 2 +-
plugins/bean-validation/pom.xml | 2 +-
plugins/cdi/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 2 +-
plugins/javatemplates/pom.xml | 2 +-
plugins/jfreechart/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/pell-multipart/pom.xml | 2 +-
.../dispatcher/multipart/PellMultiPartRequest.java | 7 +
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 +-
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
plugins/xslt/pom.xml | 2 +-
pom.xml | 4 +-
70 files changed, 626 insertions(+), 246 deletions(-)
diff --cc core/pom.xml
index aac5d707d,048acd258..73387ae1e
--- 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.7.0-atlassian-3-SNAPSHOT</version>
- <version>6.7.3-SNAPSHOT</version>
++ <version>6.7.2-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --cc plugins/junit/pom.xml
index 78238c51c,b8d915ade..cf955907e
--- 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.7.0-atlassian-3-SNAPSHOT</version>
- <version>6.7.3-SNAPSHOT</version>
++ <version>6.7.2-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --cc plugins/pom.xml
index 8f6ca7ddf,652db777e..b88992ea0
--- 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.7.0-atlassian-3-SNAPSHOT</version>
- <version>6.7.3-SNAPSHOT</version>
++ <version>6.7.2-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --cc plugins/spring/pom.xml
index c27b647bf,481fbab32..6a720e303
--- 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.7.0-atlassian-3-SNAPSHOT</version>
- <version>6.7.3-SNAPSHOT</version>
++ <version>6.7.2-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --cc plugins/velocity/pom.xml
index 679e4ee49,373961462..f1fe4346b
--- 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.7.0-atlassian-3-SNAPSHOT</version>
- <version>6.7.3-SNAPSHOT</version>
++ <version>6.7.2-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --cc pom.xml
index 81ef61f36,d0c506711..b2af7bba9
--- a/pom.xml
+++ b/pom.xml
@@@ -29,7 -29,7 +29,7 @@@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.7.0-atlassian-3-SNAPSHOT</version>
- <version>6.7.3-SNAPSHOT</version>
++ <version>6.7.2-atlassian-1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
