This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch fork/6.6
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 91ef86894e25acabc29d2d68ed66c8bcafe92306
Merge: 183352bc4 d33be1d43
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Tue Oct 8 16:34:39 2024 +1100
Merge remote-tracking branch 'origin/master' into fork/6.6
.github/workflows/codeql.yml | 6 +--
.github/workflows/scorecards-analysis.yaml | 6 +--
apps/showcase/pom.xml | 2 +-
.../showcase/fileupload/FileUploadAction.java | 6 +++
.../webapp/WEB-INF/fileupload/upload-success.jsp | 3 +-
.../apache/struts2/showcase/FileUploadTest.java | 32 ++++++++++++++--
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 23 +++++++++++-
.../struts2/components/IteratorComponent.java | 5 ++-
.../java/org/apache/struts2/components/UIBean.java | 8 +++-
.../multipart/JakartaMultiPartRequest.java | 1 +
.../multipart/JakartaStreamMultiPartRequest.java | 15 +++++++-
.../dispatcher/multipart/StrutsUploadedFile.java | 19 +++++++++-
.../struts2/dispatcher/multipart/UploadedFile.java | 9 +++++
.../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 16 ++++++++
.../struts2/components/IteratorComponentTest.java | 36 ++++++++++++++++++
.../org/apache/struts2/components/UIBeanTest.java | 43 +++++++++++++++++++---
.../ActionFileUploadInterceptorTest.java | 5 +++
.../interceptor/FileUploadInterceptorTest.java | 5 +++
.../apache/struts2/views/jsp/IteratorTagTest.java | 36 +++++++++++++++++-
.../struts2/views/java/simple/AbstractTest.java | 11 ++++++
.../apache/struts2/views/java/simple/HeadTest.java | 2 +-
.../apache/struts2/views/java/simple/LinkTest.java | 18 ++-------
.../struts2/views/java/simple/ScriptTest.java | 12 ------
plugins/jfreechart/pom.xml | 2 +-
.../dispatcher/multipart/PellMultiPartRequest.java | 1 +
plugins/tiles/pom.xml | 2 +-
pom.xml | 34 ++++++++---------
27 files changed, 286 insertions(+), 72 deletions(-)
diff --cc pom.xml
index bad45abe4,294dda0ef..f4e2ce028
--- a/pom.xml
+++ b/pom.xml
@@@ -384,10 -381,7 +384,10 @@@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.1.1</version>
+ <configuration>
+ <arguments>-Dmaven.test.skip -Dgpg.skip</arguments>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
