You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ku...@apache.org on 2024/10/08 05:35:53 UTC
(struts) branch fork/6.6 created (now 7113ff8f5)
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a change to branch fork/6.6
in repository https://gitbox.apache.org/repos/asf/struts.git
at 7113ff8f5 Update SNAPSHOT version
This branch includes the following new commits:
new 5e7c00afb [maven-release-plugin] prepare release struts2-parent-6.4.0-atlassian-1
new 62b9871a6 [maven-release-plugin] prepare for next development iteration
new 9ce0a4893 Merge remote-tracking branch 'origin/master' into fork/6.6
new b1a8797c9 [maven-release-plugin] prepare release struts2-parent-6.6.0-atlassian-1
new 183352bc4 [maven-release-plugin] prepare for next development iteration
new 91ef86894 Merge remote-tracking branch 'origin/master' into fork/6.6
new 7113ff8f5 Update SNAPSHOT version
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(struts) 06/07: Merge remote-tracking branch 'origin/master' into fork/6.6
Posted by ku...@apache.org.
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 <gi...@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>
(struts) 07/07: Update SNAPSHOT version
Posted by ku...@apache.org.
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 7113ff8f56163c5b4cf6c2cc2b1304aa6fe4f171
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Tue Oct 8 16:35:38 2024 +1100
Update SNAPSHOT version
---
core/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
pom.xml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 23f4f925b..46946ec6e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.6.0-atlassian-2-SNAPSHOT</version>
+ <version>6.6.1-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 47466089d..d0abb9b73 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.0-atlassian-2-SNAPSHOT</version>
+ <version>6.6.1-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 08dc65788..0189e693c 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.6.0-atlassian-2-SNAPSHOT</version>
+ <version>6.6.1-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index cb009b588..c4b73c1b6 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.0-atlassian-2-SNAPSHOT</version>
+ <version>6.6.1-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index 6b5886e45..3a5849da5 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.0-atlassian-2-SNAPSHOT</version>
+ <version>6.6.1-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index f4e2ce028..9b4b69b10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.6.0-atlassian-2-SNAPSHOT</version>
+ <version>6.6.1-atlassian-1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
(struts) 01/07: [maven-release-plugin] prepare release struts2-parent-6.4.0-atlassian-1
Posted by ku...@apache.org.
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 5e7c00afb4e0f1b075bd1f1920b6eb55be61e758
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Tue Apr 23 16:46:32 2024 +1000
[maven-release-plugin] prepare release struts2-parent-6.4.0-atlassian-1
---
core/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
pom.xml | 6 +++---
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index a9085beeb..f19447948 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-atlassian-1-SNAPSHOT</version>
+ <version>6.4.0-atlassian-1</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index b76d4ce0e..258c95868 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-atlassian-1-SNAPSHOT</version>
+ <version>6.4.0-atlassian-1</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 9c0e5ed55..fe4932c38 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-atlassian-1-SNAPSHOT</version>
+ <version>6.4.0-atlassian-1</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 126ea7423..a08f200dd 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-atlassian-1-SNAPSHOT</version>
+ <version>6.4.0-atlassian-1</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index f3c5a46f2..3081be624 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-atlassian-1-SNAPSHOT</version>
+ <version>6.4.0-atlassian-1</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 53d90d889..439f1fe43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-atlassian-1-SNAPSHOT</version>
+ <version>6.4.0-atlassian-1</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
@@ -51,7 +51,7 @@
<connection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</connection>
<developerConnection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</developerConnection>
<url>https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse</url>
- <tag>HEAD</tag>
+ <tag>struts2-parent-6.4.0-atlassian-1</tag>
</scm>
<issueManagement>
@@ -107,7 +107,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2024-04-12T07:47:44Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2024-04-23T06:46:09Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
(struts) 02/07: [maven-release-plugin] prepare for next development iteration
Posted by ku...@apache.org.
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 62b9871a663d6c32ad8491a82f5b50c575dfee91
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Tue Apr 23 16:46:39 2024 +1000
[maven-release-plugin] prepare for next development iteration
---
core/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
pom.xml | 6 +++---
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index f19447948..3ced5b437 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-atlassian-1</version>
+ <version>6.4.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 258c95868..5d365738b 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-atlassian-1</version>
+ <version>6.4.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index fe4932c38..755df8045 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-atlassian-1</version>
+ <version>6.4.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index a08f200dd..0e5776ff4 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-atlassian-1</version>
+ <version>6.4.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index 3081be624..9484028f6 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.4.0-atlassian-1</version>
+ <version>6.4.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 439f1fe43..deefe04b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.4.0-atlassian-1</version>
+ <version>6.4.0-atlassian-2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
@@ -51,7 +51,7 @@
<connection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</connection>
<developerConnection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</developerConnection>
<url>https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse</url>
- <tag>struts2-parent-6.4.0-atlassian-1</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
@@ -107,7 +107,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2024-04-23T06:46:09Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2024-04-23T06:46:38Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
(struts) 04/07: [maven-release-plugin] prepare release struts2-parent-6.6.0-atlassian-1
Posted by ku...@apache.org.
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 b1a8797c9a8629bfc0cf481c15c0b05d89bd8be7
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Mon Jul 22 16:07:07 2024 +1000
[maven-release-plugin] prepare release struts2-parent-6.6.0-atlassian-1
---
core/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
pom.xml | 6 +++---
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 23c48639e..709ee5fa4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.6.0-atlassian-1-SNAPSHOT</version>
+ <version>6.6.0-atlassian-1</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 141f48381..f700c0ae9 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.0-atlassian-1-SNAPSHOT</version>
+ <version>6.6.0-atlassian-1</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index bcbb010c5..0a6de8326 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.6.0-atlassian-1-SNAPSHOT</version>
+ <version>6.6.0-atlassian-1</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 451eaa989..7f4a0e60e 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.0-atlassian-1-SNAPSHOT</version>
+ <version>6.6.0-atlassian-1</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index d7219d731..48fd6a3a4 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.0-atlassian-1-SNAPSHOT</version>
+ <version>6.6.0-atlassian-1</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 332afb450..6d25879b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.6.0-atlassian-1-SNAPSHOT</version>
+ <version>6.6.0-atlassian-1</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
@@ -51,7 +51,7 @@
<connection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</connection>
<developerConnection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</developerConnection>
<url>https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse</url>
- <tag>HEAD</tag>
+ <tag>struts2-parent-6.6.0-atlassian-1</tag>
</scm>
<issueManagement>
@@ -107,7 +107,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2024-07-20T06:28:46Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2024-07-22T06:06:34Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
(struts) 03/07: Merge remote-tracking branch 'origin/master' into fork/6.6
Posted by ku...@apache.org.
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 9ce0a4893ab5b67434135d47f7cb4881c505ed6b
Merge: 62b9871a6 f977f0c0e
Author: Kusal Kithul-Godage <gi...@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>
(struts) 05/07: [maven-release-plugin] prepare for next development iteration
Posted by ku...@apache.org.
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 183352bc421d853a705162dae99b0334bc0fdf61
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Mon Jul 22 16:07:15 2024 +1000
[maven-release-plugin] prepare for next development iteration
---
core/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
pom.xml | 6 +++---
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 709ee5fa4..23f4f925b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.6.0-atlassian-1</version>
+ <version>6.6.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index f700c0ae9..47466089d 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.0-atlassian-1</version>
+ <version>6.6.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 0a6de8326..08dc65788 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.6.0-atlassian-1</version>
+ <version>6.6.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 7f4a0e60e..cb009b588 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.0-atlassian-1</version>
+ <version>6.6.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index 48fd6a3a4..6b5886e45 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.6.0-atlassian-1</version>
+ <version>6.6.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 6d25879b9..bad45abe4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.6.0-atlassian-1</version>
+ <version>6.6.0-atlassian-2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
@@ -51,7 +51,7 @@
<connection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</connection>
<developerConnection>scm:git:ssh://git@stash.atlassian.com:7997/bam/struts2-atlassian.git</developerConnection>
<url>https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse</url>
- <tag>struts2-parent-6.6.0-atlassian-1</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
@@ -107,7 +107,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2024-07-22T06:06:34Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2024-07-22T06:07:14Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>