This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch fork/6.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit a647661a9daa15aa2d32306d200eccbcfba0e599
Merge: 1a88f78a7 489167f0a
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Mon Sep 4 15:33:51 2023 +1000
Merge branch 'fork/6.2' into fork/6.3
README.md | 34 ++++++++
.../org/apache/struts2/components/Component.java | 26 ++----
.../struts2/components/DoubleListUIBean.java | 4 +-
.../org/apache/struts2/components/FormButton.java | 5 +-
.../java/org/apache/struts2/components/Label.java | 13 +--
.../java/org/apache/struts2/components/UIBean.java | 5 +-
plugins/pom.xml | 42 +++++-----
.../velocity/components/AbstractDirective.java | 95 +++++++++++++++++++---
pom.xml | 50 +++++-------
9 files changed, 181 insertions(+), 93 deletions(-)
diff --cc plugins/pom.xml
index f7912fb1d,84d2017d4..c454dd817
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@@ -32,34 -32,33 +32,34 @@@
<name>Struts 2 Plugins</name>
<modules>
- <module>async</module>
- <module>bean-validation</module>
- <module>cdi</module>
- <module>config-browser</module>
+ <!-- <module>async</module>-->
+ <!-- <module>bean-validation</module>-->
+ <!-- <module>cdi</module>-->
+ <!-- <module>config-browser</module>-->
<module>convention</module>
- <module>dwr</module>
- <module>embeddedjsp</module>
- <module>gxp</module>
- <module>jasperreports</module>
- <module>javatemplates</module>
- <module>jfreechart</module>
- <module>json</module>
+ <!-- <module>dwr</module>-->
+ <!-- <module>embeddedjsp</module>-->
+ <!-- <module>gxp</module>-->
+ <!-- <module>jasperreports</module>-->
+ <!-- <module>javatemplates</module>-->
+ <!-- <module>jfreechart</module>-->
+ <!-- <module>json</module>-->
<module>junit</module>
- <module>osgi</module>
- <module>oval</module>
- <module>pell-multipart</module>
- <module>plexus</module>
+ <!-- <module>osgi</module>-->
+ <!-- <module>oval</module>-->
+ <!-- <module>pell-multipart</module>-->
+ <!-- <module>plexus</module>-->
<module>portlet</module>
+ <module>portlet-junit</module>
<module>portlet-mocks</module>
- <module>portlet-tiles</module>
- <module>rest</module>
- <module>sitemesh</module>
+ <!-- <module>portlet-tiles</module>-->
+ <!-- <module>rest</module>-->
+ <!-- <module>sitemesh</module>-->
<module>spring</module>
- <module>testng</module>
- <module>tiles</module>
+ <!-- <module>testng</module>-->
+ <!-- <module>tiles</module>-->
<module>velocity</module>
- <module>xslt</module>
+ <!-- <module>xslt</module>-->
</modules>
<dependencies>
