From dbfb59cb7cacbec9f81d2983113996d22424b149 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart
Date: Fri, 12 Jul 2024 07:27:08 +0200
Subject: [PATCH 01/14] [maven-release-plugin] prepare release STRUTS_6_5_0
---
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 +-
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 +-
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 | 6 +++---
39 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/apps/pom.xml b/apps/pom.xml
index 16c95aa5f4..63d839ee36 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-parent
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-apps
pom
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 1961facbcb..988470dfd4 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -24,12 +24,12 @@
org.apache.struts
struts2-apps
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-rest-showcase
war
- 6.5.0-SNAPSHOT
+ 6.5.0
Struts 2 Rest Showcase Webapp
Struts 2 Rest Showcase Example
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 228a8b3968..493224953d 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-apps
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-showcase
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 8ea9075640..64b23130bf 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-parent
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-assembly
diff --git a/bom/pom.xml b/bom/pom.xml
index a2bd291aa2..7ceff99bbe 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -25,11 +25,11 @@
org.apache.struts
struts2-parent
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-bom
- 6.5.0-SNAPSHOT
+ 6.5.0
pom
Struts 2 Bill of Materials
@@ -44,7 +44,7 @@
- 6.5.0-SNAPSHOT
+ 6.5.0
true
true
@@ -190,7 +190,7 @@
- STRUTS_6_3_0_1
+ STRUTS_6_5_0
scm:git:https://gitbox.apache.org/repos/asf/struts.git
scm:git:https://gitbox.apache.org/repos/asf/struts.git
https://github.com/apache/struts/
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 1485e7f685..050912b933 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-osgi-bundles
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-osgi-admin-bundle
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index ad74c96482..8760613f3c 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-osgi-bundles
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-osgi-demo-bundle
diff --git a/bundles/pom.xml b/bundles/pom.xml
index ebd7adbf3f..64336a28c0 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-parent
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-osgi-bundles
diff --git a/core/pom.xml b/core/pom.xml
index 4027d37e71..5689f0cf86 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-parent
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-core
jar
diff --git a/plugins/async/pom.xml b/plugins/async/pom.xml
index 4eb41aa7f6..f17ae22348 100644
--- a/plugins/async/pom.xml
+++ b/plugins/async/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-async-plugin
diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml
index f789b404d8..fb22614885 100644
--- a/plugins/bean-validation/pom.xml
+++ b/plugins/bean-validation/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
4.0.0
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 571dc169e0..b16fea0ec8 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-cdi-plugin
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index 0dd09fd9a4..a57c2beca3 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-config-browser-plugin
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index 520c2f33af..e44081aedd 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-convention-plugin
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index 1ed3c97cad..a03bdfe2ad 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-dwr-plugin
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index e18fe8f70c..693c6ab6f6 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-embeddedjsp-plugin
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index 61f2a6a4c8..539d0665d8 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-gxp-plugin
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 23a4c49cf9..393db8e9d8 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-jasperreports-plugin
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 9fe59abc6a..841bb2ed81 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-javatemplates-plugin
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index ee88bc1206..93e6f6c3c3 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-jfreechart-plugin
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 3f62a31722..5a6012acf3 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-json-plugin
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 6b0b02d571..2582bfa8fe 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-junit-plugin
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index 45787dcc02..3cb69e2002 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-osgi-plugin
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index ac39682a2a..7b673b9d2e 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-oval-plugin
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index 4cce2037d6..dfa0e9a39c 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-pell-multipart-plugin
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index 6836cbd982..a2b0d92bc3 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-plexus-plugin
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 27f7290714..fc6552cb88 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-parent
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-plugins
diff --git a/plugins/portlet-junit/pom.xml b/plugins/portlet-junit/pom.xml
index bc7198e0ee..67edeb922b 100644
--- a/plugins/portlet-junit/pom.xml
+++ b/plugins/portlet-junit/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-portlet-junit-plugin
diff --git a/plugins/portlet-mocks/pom.xml b/plugins/portlet-mocks/pom.xml
index cd5dec22a8..3a6e0c7674 100644
--- a/plugins/portlet-mocks/pom.xml
+++ b/plugins/portlet-mocks/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-portlet-mocks-plugin
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 9fa3a28f46..0151a39d84 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-portlet-tiles-plugin
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 99a5248bde..4f7740c6a3 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-portlet-plugin
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index e56121eeb1..096bfd6268 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-rest-plugin
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index 0c314cd59a..1447619493 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-sitemesh-plugin
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index f34745f6fb..679e77d829 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-spring-plugin
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index 72317e345a..eb74c4465d 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-testng-plugin
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 3dd9897300..a0cf0bae1f 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-tiles-plugin
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index c7efbdc945..9174e54ac2 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-velocity-plugin
diff --git a/plugins/xslt/pom.xml b/plugins/xslt/pom.xml
index 2ddc88da3d..c5a8968d41 100644
--- a/plugins/xslt/pom.xml
+++ b/plugins/xslt/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0-SNAPSHOT
+ 6.5.0
struts2-xslt-plugin
diff --git a/pom.xml b/pom.xml
index 65977ba852..ad320398f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
4.0.0
struts2-parent
- 6.5.0-SNAPSHOT
+ 6.5.0
pom
Struts 2
https://struts.apache.org/
@@ -51,7 +51,7 @@
scm:git:https://gitbox.apache.org/repos/asf/struts.git
scm:git:https://gitbox.apache.org/repos/asf/struts.git
https://github.com/apache/struts/
- STRUTS_6_3_0_1
+ STRUTS_6_5_0
@@ -104,7 +104,7 @@
UTF-8
- 2024-04-07T09:22:16Z
+ 2024-07-12T05:22:09Z
1.8
1.8
From 54e387dc6f12698aef14d849641a44a03f62f321 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart
Date: Fri, 12 Jul 2024 07:27:19 +0200
Subject: [PATCH 02/14] [maven-release-plugin] prepare for next development
iteration
---
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 +-
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 +-
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 | 6 +++---
39 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/apps/pom.xml b/apps/pom.xml
index 63d839ee36..c1ad3e1553 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-parent
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-apps
pom
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 988470dfd4..c80c386bed 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -24,12 +24,12 @@
org.apache.struts
struts2-apps
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-rest-showcase
war
- 6.5.0
+ 6.6.0-SNAPSHOT
Struts 2 Rest Showcase Webapp
Struts 2 Rest Showcase Example
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 493224953d..3ea6e3dc80 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-apps
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-showcase
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 64b23130bf..a7c92a79f0 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-parent
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-assembly
diff --git a/bom/pom.xml b/bom/pom.xml
index 7ceff99bbe..93beb6666d 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -25,11 +25,11 @@
org.apache.struts
struts2-parent
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-bom
- 6.5.0
+ 6.6.0-SNAPSHOT
pom
Struts 2 Bill of Materials
@@ -44,7 +44,7 @@
- 6.5.0
+ 6.6.0-SNAPSHOT
true
true
@@ -190,7 +190,7 @@
- STRUTS_6_5_0
+ STRUTS_6_3_0_1
scm:git:https://gitbox.apache.org/repos/asf/struts.git
scm:git:https://gitbox.apache.org/repos/asf/struts.git
https://github.com/apache/struts/
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 050912b933..16e1191252 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-osgi-bundles
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-osgi-admin-bundle
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index 8760613f3c..0a09ae4105 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-osgi-bundles
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-osgi-demo-bundle
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 64336a28c0..1709f6898b 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-parent
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-osgi-bundles
diff --git a/core/pom.xml b/core/pom.xml
index 5689f0cf86..84b2c7212b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-parent
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-core
jar
diff --git a/plugins/async/pom.xml b/plugins/async/pom.xml
index f17ae22348..3bd4d14047 100644
--- a/plugins/async/pom.xml
+++ b/plugins/async/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-async-plugin
diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml
index fb22614885..937d7a403a 100644
--- a/plugins/bean-validation/pom.xml
+++ b/plugins/bean-validation/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
4.0.0
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index b16fea0ec8..88dd28eb09 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-cdi-plugin
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index a57c2beca3..f98bb67735 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-config-browser-plugin
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index e44081aedd..7f47c82046 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-convention-plugin
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index a03bdfe2ad..06c0302516 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-dwr-plugin
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 693c6ab6f6..4df4492767 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-embeddedjsp-plugin
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index 539d0665d8..8572ebc6fd 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-gxp-plugin
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 393db8e9d8..6250aa21a8 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-jasperreports-plugin
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 841bb2ed81..54f33a6a01 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-javatemplates-plugin
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 93e6f6c3c3..fe3b3d33d2 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-jfreechart-plugin
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 5a6012acf3..1fa42d6d05 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-json-plugin
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 2582bfa8fe..6c16187c9c 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-junit-plugin
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index 3cb69e2002..45b9f5728a 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-osgi-plugin
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index 7b673b9d2e..9ceead1773 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-oval-plugin
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index dfa0e9a39c..67bbd3f4ea 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-pell-multipart-plugin
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index a2b0d92bc3..dbff6b0cd0 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-plexus-plugin
diff --git a/plugins/pom.xml b/plugins/pom.xml
index fc6552cb88..2decc59c9a 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-parent
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-plugins
diff --git a/plugins/portlet-junit/pom.xml b/plugins/portlet-junit/pom.xml
index 67edeb922b..1973421325 100644
--- a/plugins/portlet-junit/pom.xml
+++ b/plugins/portlet-junit/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-portlet-junit-plugin
diff --git a/plugins/portlet-mocks/pom.xml b/plugins/portlet-mocks/pom.xml
index 3a6e0c7674..5bdde386de 100644
--- a/plugins/portlet-mocks/pom.xml
+++ b/plugins/portlet-mocks/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-portlet-mocks-plugin
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 0151a39d84..701ebcc9be 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-portlet-tiles-plugin
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 4f7740c6a3..a222f61485 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-portlet-plugin
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index 096bfd6268..3dc209ac2c 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-rest-plugin
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index 1447619493..82526780fd 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-sitemesh-plugin
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 679e77d829..edd9a21607 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-spring-plugin
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index eb74c4465d..45f9b94761 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-testng-plugin
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index a0cf0bae1f..b88b807c86 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-tiles-plugin
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index 9174e54ac2..804ae096cc 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-velocity-plugin
diff --git a/plugins/xslt/pom.xml b/plugins/xslt/pom.xml
index c5a8968d41..fe49f299e3 100644
--- a/plugins/xslt/pom.xml
+++ b/plugins/xslt/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 6.5.0
+ 6.6.0-SNAPSHOT
struts2-xslt-plugin
diff --git a/pom.xml b/pom.xml
index ad320398f6..854f756326 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
4.0.0
struts2-parent
- 6.5.0
+ 6.6.0-SNAPSHOT
pom
Struts 2
https://struts.apache.org/
@@ -51,7 +51,7 @@
scm:git:https://gitbox.apache.org/repos/asf/struts.git
scm:git:https://gitbox.apache.org/repos/asf/struts.git
https://github.com/apache/struts/
- STRUTS_6_5_0
+ STRUTS_6_3_0_1
@@ -104,7 +104,7 @@
UTF-8
- 2024-07-12T05:22:09Z
+ 2024-07-12T05:27:19Z
1.8
1.8
From fcc2c9d3abd7542da9f4ec9140986d7a88acb579 Mon Sep 17 00:00:00 2001
From: Kusal Kithul-Godage
Date: Sat, 13 Jul 2024 18:52:50 +1000
Subject: [PATCH 03/14] WW-5441 Bump net.sf.jasperreports:jasperreports to
6.21.3
---
plugins/jasperreports/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 6250aa21a8..642602b142 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -35,7 +35,7 @@
net.sf.jasperreports
jasperreports
- 6.21.0
+ 6.21.3
provided
From 56c1291d2fe718dd40062d39fa3ec4f05efbac1d Mon Sep 17 00:00:00 2001
From: Kusal Kithul-Godage
Date: Sat, 13 Jul 2024 21:21:52 +1000
Subject: [PATCH 04/14] WW-5440 Deprecate AnnotationParameterFilterInterceptor
---
.../xwork2/interceptor/annotations/Allowed.java | 2 ++
.../annotations/AnnotationParameterFilterInterceptor.java | 7 +++++--
.../xwork2/interceptor/annotations/BlockByDefault.java | 2 ++
.../xwork2/interceptor/annotations/Blocked.java | 2 ++
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Allowed.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Allowed.java
index 40c6bdbbd1..39bfdcb26b 100644
--- a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Allowed.java
+++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Allowed.java
@@ -28,9 +28,11 @@
* a HttpRequest parameter.
*
* @author martin.gilday
+ * @deprecated since 6.6.0, use {@link org.apache.struts2.interceptor.parameter.StrutsParameter}.
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
+@Deprecated
public @interface Allowed {
}
diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationParameterFilterInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationParameterFilterInterceptor.java
index 8309d61d2b..d1b7260ac4 100644
--- a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationParameterFilterInterceptor.java
+++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationParameterFilterInterceptor.java
@@ -23,13 +23,13 @@
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
import com.opensymphony.xwork2.interceptor.Interceptor;
import com.opensymphony.xwork2.interceptor.ParameterFilterInterceptor;
-import com.opensymphony.xwork2.interceptor.ParametersInterceptor;
import com.opensymphony.xwork2.util.AnnotationUtils;
import org.apache.struts2.dispatcher.HttpParameters;
+import org.apache.struts2.interceptor.parameter.ParametersInterceptor;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
import java.lang.reflect.Field;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
/**
@@ -46,7 +46,10 @@
*
*
* @author martin.gilday
+ * @deprecated since 6.6.0, integrated into {@link ParametersInterceptor} with {@link StrutsParameter} using
+ * {@code struts.parameters.requireAnnotations=true}
*/
+@Deprecated
public class AnnotationParameterFilterInterceptor extends AbstractInterceptor {
/* (non-Javadoc)
diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/BlockByDefault.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/BlockByDefault.java
index ddb855b3da..e7b4520220 100644
--- a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/BlockByDefault.java
+++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/BlockByDefault.java
@@ -31,9 +31,11 @@
* To allow access to a field it must be annotated with {@link Allowed}
*
* @author martin.gilday
+ * @deprecated since 6.6.0, use {@code struts.parameters.requireAnnotations=true} to block all parameters globally.
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
+@Deprecated
public @interface BlockByDefault {
}
diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Blocked.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Blocked.java
index 630368a87b..17ec80940d 100644
--- a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Blocked.java
+++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Blocked.java
@@ -28,9 +28,11 @@
* a HttpRequest parameter.
*
* @author martin.gilday
+ * @deprecated since 6.6.0, use {@code struts.parameters.requireAnnotations=true} to block all parameters globally.
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
+@Deprecated
public @interface Blocked {
}
From 10edbce8d92cb9909b6685f6ca0b2b39bc27680c Mon Sep 17 00:00:00 2001
From: Kusal Kithul-Godage
Date: Sat, 13 Jul 2024 21:22:09 +1000
Subject: [PATCH 05/14] WW-5440 Fix MultipleFileUploadUsingArrayAction
---
.../fileupload/MultipleFileUploadUsingArrayAction.java | 6 +++++-
apps/showcase/src/main/resources/struts-fileupload.xml | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java
index 59ea954e21..ff26356131 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java
@@ -28,12 +28,16 @@
import java.util.List;
/**
- * Showcase action - mutiple file upload using array.
+ * Showcase action - multiple file upload using array.
*/
public class MultipleFileUploadUsingArrayAction extends ActionSupport implements UploadedFilesAware {
private List uploadedFiles;
+ public List getUpload() {
+ return this.uploadedFiles;
+ }
+
public String upload() throws Exception {
System.out.println("\n\n upload2");
System.out.println("files:");
diff --git a/apps/showcase/src/main/resources/struts-fileupload.xml b/apps/showcase/src/main/resources/struts-fileupload.xml
index 5b500b73f6..e34539fcee 100644
--- a/apps/showcase/src/main/resources/struts-fileupload.xml
+++ b/apps/showcase/src/main/resources/struts-fileupload.xml
@@ -40,7 +40,7 @@
- /WEB-INF/fileupload/multipleUploadUsingList.jsp
+ /WEB-INF/fileupload/multipleUploadUsingList.jsp
/WEB-INF/fileupload/multiple-success.jsp
@@ -50,7 +50,7 @@
- /WEB-INF/fileupload/multipleUploadUsingArray.jsp
+ /WEB-INF/fileupload/multipleUploadUsingArray.jsp
/WEB-INF/fileupload/multiple-success.jsp
From f9953938f7313840a7122e4706235c8334fbee4e Mon Sep 17 00:00:00 2001
From: Kusal Kithul-Godage
Date: Sat, 13 Jul 2024 19:39:13 +1000
Subject: [PATCH 06/14] WW-5440 Add missing annotations
---
.../demo/rest/example/OrdersController.java | 24 +++----
.../org/demo/rest/example/OrdersService.java | 7 +-
.../showcase/DynamicTreeSelectAction.java | 3 +-
.../LotsOfOptiontransferselectAction.java | 17 ++++-
.../showcase/LotsOfRichtexteditorAction.java | 7 +-
.../struts2/showcase/MoreSelectsAction.java | 10 ++-
.../showcase/ShowAjaxDynamicTreeAction.java | 2 +
.../apache/struts2/showcase/UITagExample.java | 8 +++
.../showcase/action/AbstractCRUDAction.java | 11 ++--
.../showcase/action/EmployeeAction.java | 5 +-
.../showcase/action/ExampleAction.java | 10 ++-
.../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 +-
.../ajax/AutocompleterExampleAction.java | 5 +-
.../ajax/Example4ShowPanelAction.java | 3 +
.../struts2/showcase/ajax/Example5Action.java | 3 +
.../showcase/ajax/tree/GetCategory.java | 3 +
.../struts2/showcase/ajax/tree/Toggle.java | 2 +
.../showcase/async/ChatRoomAction.java | 13 ++--
.../showcase/chat/ChatLoginAction.java | 5 +-
.../struts2/showcase/chat/CrudRoomAction.java | 3 +
.../showcase/chat/EnterRoomAction.java | 5 +-
.../struts2/showcase/chat/ExitRoomAction.java | 5 +-
.../chat/MessagesAvailableInRoomAction.java | 6 +-
.../chat/SendMessageToRoomAction.java | 10 +--
.../chat/UsersAvailableInRoomAction.java | 7 +-
.../conversion/OperationsEnumAction.java | 3 +-
.../freemarker/StandardTagsAction.java | 6 +-
.../hangman/GuessCharacterAction.java | 6 +-
.../modelDriven/ModelDrivenAction.java | 3 +
.../showcase/person/EditPersonAction.java | 6 +-
.../showcase/person/ListPeopleAction.java | 3 +-
.../showcase/person/NewPersonAction.java | 3 +
.../showcase/source/ViewSourceAction.java | 12 +++-
.../tag/nonui/actionPrefix/SubmitAction.java | 3 +
.../tag/nonui/debugtag/DebugTagAction.java | 3 +-
.../iteratortag/AppendIteratorTagDemo.java | 7 +-
.../iteratortag/IteratorGeneratorTagDemo.java | 9 +--
.../iteratortag/MergeIteratorTagDemo.java | 9 +--
.../iteratortag/SubsetIteratorTagDemo.java | 13 ++--
.../struts2/showcase/token/TokenAction.java | 2 +
.../AbstractValidationActionSupport.java | 1 +
.../validation/AjaxFormSubmitAction.java | 31 +++++----
.../BeanValidationExampleAction.java | 13 +++-
.../NonFieldValidatorsExampleAction.java | 5 ++
.../showcase/validation/QuizAction.java | 4 ++
.../validation/SubmitApplication.java | 3 +
.../VisitorValidatorsExampleAction.java | 3 +
.../struts2/showcase/xslt/JVMAction.java | 6 +-
.../osgi/admin/actions/BundlesAction.java | 9 +--
.../osgi/admin/actions/ShellAction.java | 15 +++--
.../main/java/actions/osgi/BundlesAction.java | 1 +
.../java/actions/osgi/HelloWorldAction.java | 4 +-
.../xwork2/ValidationAwareSupport.java | 15 ++---
.../dispatcher/DefaultActionSupport.java | 10 +--
.../xwork2/ActionSupportTest.java | 7 +-
.../xwork2/ModelDrivenAction.java | 8 ++-
.../xwork2/ModelDrivenAnnotationAction.java | 8 ++-
.../xwork2/ProxyInvocationAction.java | 2 +
.../com/opensymphony/xwork2/SimpleAction.java | 26 ++++----
.../xwork2/SimpleAnnotationAction.java | 32 +++++++--
.../xwork2/ValidationOrderAction.java | 36 +++++-----
.../ModelDrivenInterceptorTest.java | 8 ++-
.../ScopedModelDrivenInterceptorTest.java | 10 +++
.../annotations/AllowingByDefaultAction.java | 9 ++-
.../annotations/BlockingByDefaultAction.java | 9 ++-
.../xwork2/test/ModelDrivenAction2.java | 4 +-
.../test/ModelDrivenAnnotationAction2.java | 4 +-
.../xwork2/test/SimpleAction2.java | 3 +-
.../xwork2/test/SimpleAction3.java | 8 ++-
.../xwork2/test/SimpleAnnotationAction2.java | 2 +
.../xwork2/test/SimpleAnnotationAction3.java | 8 ++-
.../ValidateAnnotatedMethodOnlyAction.java | 3 +
.../com/opensymphony/xwork2/util/Bar.java | 5 +-
.../util/StrutsLocalizedTextProviderTest.java | 10 +--
.../validator/ActionValidatorManagerTest.java | 5 +-
.../validator/AnnotationValidationAction.java | 1 +
.../AnnotationValidationExpAction.java | 1 +
.../StringLengthFieldValidatorTest.java | 7 ++
.../VisitorValidatorModelAction.java | 3 +
.../validator/VisitorValidatorTestAction.java | 7 +-
.../struts2/ExecutionCountTestAction.java | 3 +-
.../apache/struts2/HttpMethodsTestAction.java | 2 +
.../java/org/apache/struts2/TestAction.java | 1 +
.../interceptor/CookieInterceptorTest.java | 9 +++
.../FileUploadInterceptorTest.java | 4 +-
.../views/jsp/IteratorGeneratorTagTest.java | 13 ++--
.../views/jsp/SortIteratorTagTest.java | 22 +++----
.../views/jsp/SubsetIteratorTagTest.java | 29 ++++-----
.../views/jsp/ui/DoubleValidationAction.java | 2 +
.../views/jsp/ui/FieldErrorTagTest.java | 13 ++--
.../views/jsp/ui/IntValidationAction.java | 2 +
.../beanvalidation/actions/FieldAction.java | 2 +
.../actions/FieldMatchAction.java | 5 ++
.../actions/ModelDrivenAction.java | 5 +-
.../actions/ValidateGroupAction.java | 7 +-
.../config_browser/ActionNamesAction.java | 5 +-
.../config_browser/ListValidatorsAction.java | 8 ++-
.../config_browser/ShowBeansAction.java | 2 +
.../config_browser/ShowConfigAction.java | 25 ++++---
.../config_browser/ShowValidatorAction.java | 24 ++++---
.../src/test/java/actions/MessageAction.java | 2 +-
.../json/JSONValidationInterceptorTest.java | 5 ++
.../apache/struts2/junit/JUnitTestAction.java | 2 +
.../junit/session/SessionGetAction.java | 1 +
.../junit/session/SessionSetAction.java | 1 +
.../oval/interceptor/FieldsWithProfiles.java | 4 ++
.../oval/interceptor/MemberObject.java | 8 +--
.../oval/interceptor/ModelDrivenAction.java | 11 ++--
.../struts2/oval/interceptor/SimpleField.java | 5 +-
.../oval/interceptor/SimpleFieldI18n.java | 2 +
.../SimpleFieldI18nDefaultKey.java | 4 +-
.../SimpleFieldJPAAnnotations.java | 2 +
.../SimpleFieldOGNLExpression.java | 4 +-
.../oval/interceptor/SimpleFieldsXML.java | 4 +-
.../interceptor/SimpleFieldsXMLChild.java | 3 +
.../oval/interceptor/SimpleMethod.java | 4 +-
.../rest/RestActionInvocationTest.java | 65 ++++++++++---------
.../xwork2/ModelDrivenAction.java | 8 ++-
123 files changed, 647 insertions(+), 308 deletions(-)
diff --git a/apps/rest-showcase/src/main/java/org/demo/rest/example/OrdersController.java b/apps/rest-showcase/src/main/java/org/demo/rest/example/OrdersController.java
index 2184e2b1ec..50d9c8fa65 100644
--- a/apps/rest-showcase/src/main/java/org/demo/rest/example/OrdersController.java
+++ b/apps/rest-showcase/src/main/java/org/demo/rest/example/OrdersController.java
@@ -18,30 +18,30 @@
*/
package org.demo.rest.example;
-import java.util.Collection;
-
+import com.opensymphony.xwork2.ModelDriven;
+import com.opensymphony.xwork2.Validateable;
+import com.opensymphony.xwork2.ValidationAwareSupport;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.struts2.convention.annotation.Result;
+import org.apache.struts2.convention.annotation.Results;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
import org.apache.struts2.rest.DefaultHttpHeaders;
import org.apache.struts2.rest.HttpHeaders;
-import org.apache.struts2.convention.annotation.Results;
-import org.apache.struts2.convention.annotation.Result;
-import com.opensymphony.xwork2.ModelDriven;
-import com.opensymphony.xwork2.Validateable;
-import com.opensymphony.xwork2.ValidationAwareSupport;
+import java.util.Collection;
@Results({
@Result(name="success", type="redirectAction", params = {"actionName" , "orders"})
})
-public class OrdersController extends ValidationAwareSupport implements ModelDriven