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 2023/09/04 06:02:43 UTC
[struts] branch fork/6.3 created (now 301969bd3)
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a change to branch fork/6.3
in repository https://gitbox.apache.org/repos/asf/struts.git
at 301969bd3 [maven-release-plugin] prepare for next development iteration
This branch includes the following new commits:
new 0b3df53a9 Update README.md
new 11122ab6e Update scm and distributionManagement
new 29dd8ea7f Skip tests and GPG for release
new c254d7e51 Comment unnecessary modules
new 17cec424a Update POM version to atlassian-1
new e9facfa6e CONFSRVDEV-26304 Add type inference to directive parameters (cherry-picked from 82ef6576c5d and 059de2305af)
new 4762b6c7d CONFSRVDEV-26354 Port legacy WebWork syntax support (partial revert 7840fa1)
new 82091028b [maven-release-plugin] prepare release struts2-parent-6.2.0-atlassian-1
new 489167f0a [maven-release-plugin] prepare for next development iteration
new a647661a9 Merge branch 'fork/6.2' into fork/6.3
new 9e1fd914e Comment more unnecessary modules
new fb12482a2 mvn versions:set -DnewVersion=6.3.0-atlassian-1-SNAPSHOT
new b480454eb Update README.md
new 088a5b0ec [maven-release-plugin] prepare release struts2-parent-6.3.0-atlassian-1
new 301969bd3 [maven-release-plugin] prepare for next development iteration
The 15 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] 11/15: Comment more unnecessary modules
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.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 9e1fd914ec8ec2cce41528a85acf7f90eed2aa6b
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Mon Sep 4 15:34:37 2023 +1000
Comment more unnecessary modules
---
plugins/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/plugins/pom.xml b/plugins/pom.xml
index c454dd817..35c407748 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -36,7 +36,7 @@
<!-- <module>bean-validation</module>-->
<!-- <module>cdi</module>-->
<!-- <module>config-browser</module>-->
- <module>convention</module>
+<!-- <module>convention</module>-->
<!-- <module>dwr</module>-->
<!-- <module>embeddedjsp</module>-->
<!-- <module>gxp</module>-->
@@ -49,9 +49,9 @@
<!-- <module>oval</module>-->
<!-- <module>pell-multipart</module>-->
<!-- <module>plexus</module>-->
- <module>portlet</module>
- <module>portlet-junit</module>
- <module>portlet-mocks</module>
+<!-- <module>portlet</module>-->
+<!-- <module>portlet-junit</module>-->
+<!-- <module>portlet-mocks</module>-->
<!-- <module>portlet-tiles</module>-->
<!-- <module>rest</module>-->
<!-- <module>sitemesh</module>-->
[struts] 05/15: Update POM version to 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.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 17cec424aa7d882d0e663e83d5a45a4618522820
Author: Kusal Kithul-Godage <kk...@atlassian.com>
AuthorDate: Mon Jul 10 19:04:53 2023 +1000
Update POM version to atlassian-1
---
apps/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 ++--
apps/showcase/pom.xml | 2 +-
assembly/pom.xml | 2 +-
bom/pom.xml | 2 +-
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-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 | 2 +-
38 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/apps/pom.xml b/apps/pom.xml
index 9f7ba391d..512422603 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-apps</artifactId>
<packaging>pom</packaging>
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index b4c9c6a21..ebff80f72 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
<name>Struts 2 Rest Showcase Webapp</name>
<description>Struts 2 Rest Showcase Example</description>
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 32f307c59..f69c8adf3 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-showcase</artifactId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 3d05b90c2..781c21afa 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-assembly</artifactId>
diff --git a/bom/pom.xml b/bom/pom.xml
index f7a6868a9..70296d102 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>struts2-bom</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2 Bill of Materials</name>
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 4e0f1c1de..7592d4902 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-admin-bundle</artifactId>
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index 281252b5e..7887da454 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-demo-bundle</artifactId>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 9f3a37712..0c3e35769 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-bundles</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 1dccd3828..dd1f6df1e 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.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/async/pom.xml b/plugins/async/pom.xml
index 045abd92d..070166b42 100644
--- a/plugins/async/pom.xml
+++ b/plugins/async/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-async-plugin</artifactId>
diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml
index 88a4cbde7..8888a5116 100644
--- a/plugins/bean-validation/pom.xml
+++ b/plugins/bean-validation/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 6cc7e51fe..230e3d354 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-cdi-plugin</artifactId>
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index c26d2046c..11be0eed5 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-config-browser-plugin</artifactId>
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index ca4d5d464..0a956a03d 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-convention-plugin</artifactId>
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index 0c570e8a7..7f7fa07e4 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-dwr-plugin</artifactId>
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 0489a0677..cfd5fab97 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index f9d5590b6..b7fb1df46 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-gxp-plugin</artifactId>
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 573d326b1..1698abc8b 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-jasperreports-plugin</artifactId>
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index fb5664651..5740757b3 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-javatemplates-plugin</artifactId>
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 1649841d1..0faed9d6b 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-jfreechart-plugin</artifactId>
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index dc9bec5bd..c424f4028 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-json-plugin</artifactId>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 05b5f8b93..437e3a73d 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.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index 70e970afa..237b6a62d 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-plugin</artifactId>
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index d7a0fddec..7b8ddac34 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-oval-plugin</artifactId>
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index 968acaf7e..009ecd770 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-pell-multipart-plugin</artifactId>
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index 0d71eeb13..f1453ca70 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-plexus-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 5d175f4c4..22fed373d 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.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/portlet-mocks/pom.xml b/plugins/portlet-mocks/pom.xml
index fd3571ad4..7f862bd8a 100644
--- a/plugins/portlet-mocks/pom.xml
+++ b/plugins/portlet-mocks/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-mocks-plugin</artifactId>
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 44fac7012..b8d0c97de 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-tiles-plugin</artifactId>
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 50266833e..a043906df 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-plugin</artifactId>
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index b8493ae46..0c530e7b8 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-plugin</artifactId>
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index 17047a0c5..88747faa5 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitemesh-plugin</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 4a7073b61..e1acf1db3 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.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index 4606be828..0456d369e 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-testng-plugin</artifactId>
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index d7976f443..58d87388a 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index 80902d70d..84d9169d2 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.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/plugins/xslt/pom.xml b/plugins/xslt/pom.xml
index da34ad7e9..268bd6889 100644
--- a/plugins/xslt/pom.xml
+++ b/plugins/xslt/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-xslt-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 97b009d08..7f01cac0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.2.0</version>
+ <version>6.2.0-atlassian-1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
[struts] 13/15: Update README.md
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.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit b480454ebb750ac80f8a72f630202d573fc39af3
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Mon Sep 4 15:52:13 2023 +1000
Update README.md
---
README.md | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index e7140fb7f..00947a6f1 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@
2. Add upstream repo as a remote: `git remote add apache https://github.com/apache/struts.git`
3. Fetch the upstream tags: `git fetch --tags apache`
4. Merge latest patch version tag into this branch, eg. `git merge STRUTS_2_5_31`
-5. Ensure correct snapshot version, eg. `2.5.31-atlassian-1-SNAPSHOT`
+5. Ensure correct snapshot version, eg. `mvn versions:set -DnewVersion=2.5.31-atlassian-1-SNAPSHOT`
## Creating a new branch fork for a new major/minor release
@@ -31,11 +31,8 @@
2. Add upstream repo as a remote: `git remote add apache https://github.com/apache/struts.git`
3. Fetch the upstream tags: `git fetch --tags apache`
4. Checkout a new branch from the desired tag, eg. `git checkout -b fork/6.2 STRUTS_6_2_0`
-5. Either:
- * Merge previous forked branch into new branch, eg. `git merge origin/fork/2.5`
- * Cherry-pick desired commits from previous forked branch into new branch, eg. `git cherry-pick <hash>`. Please
- ensure release related commits are included.
-6. Ensure correct snapshot version, eg. `6.2.0-atlassian-1-SNAPSHOT`
+5. Merge previous forked branch into new branch, eg. `git merge origin/fork/2.5`
+6. Ensure correct snapshot version, eg. `mvn versions:set -DnewVersion=6.3.0-atlassian-1-SNAPSHOT`
## Releasing a new version
@@ -44,8 +41,7 @@
releases)
3. Grant yourself Artifactory write permission: `atlas packages permission grant`
4. Commence release,
- eg. `mvn -B release:clean release:prepare release:perform -DdevelopmentVersion=6.2.0-atlassian-2-SNAPSHOT`
-5. Push SNAPSHOT update: `git push`
+ eg. `mvn -B release:clean release:prepare release:perform -DdevelopmentVersion=6.3.0-atlassian-2-SNAPSHOT`
---
The Apache Struts web framework
[struts] 08/15: [maven-release-plugin] prepare release struts2-parent-6.2.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.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 82091028bab17095e7d85d35d13875cc884d990f
Author: Kusal Kithul-Godage <kk...@atlassian.com>
AuthorDate: Mon Jul 10 19:10:05 2023 +1000
[maven-release-plugin] prepare release struts2-parent-6.2.0-atlassian-1
---
core/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/portlet-mocks/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
pom.xml | 6 +++---
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index dd1f6df1e..e48e96a77 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.2.0-atlassian-1-SNAPSHOT</version>
+ <version>6.2.0-atlassian-1</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index 0a956a03d..a1d85570d 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0-atlassian-1-SNAPSHOT</version>
+ <version>6.2.0-atlassian-1</version>
</parent>
<artifactId>struts2-convention-plugin</artifactId>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 437e3a73d..65e7427a1 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.2.0-atlassian-1-SNAPSHOT</version>
+ <version>6.2.0-atlassian-1</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 22fed373d..4fa04ec1e 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.2.0-atlassian-1-SNAPSHOT</version>
+ <version>6.2.0-atlassian-1</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/portlet-mocks/pom.xml b/plugins/portlet-mocks/pom.xml
index 7f862bd8a..8c08057aa 100644
--- a/plugins/portlet-mocks/pom.xml
+++ b/plugins/portlet-mocks/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0-atlassian-1-SNAPSHOT</version>
+ <version>6.2.0-atlassian-1</version>
</parent>
<artifactId>struts2-portlet-mocks-plugin</artifactId>
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index a043906df..3c53f7e78 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0-atlassian-1-SNAPSHOT</version>
+ <version>6.2.0-atlassian-1</version>
</parent>
<artifactId>struts2-portlet-plugin</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index e1acf1db3..b740f3060 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.2.0-atlassian-1-SNAPSHOT</version>
+ <version>6.2.0-atlassian-1</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index 84d9169d2..cab0d760c 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.2.0-atlassian-1-SNAPSHOT</version>
+ <version>6.2.0-atlassian-1</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 7f01cac0e..9a14c491a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.2.0-atlassian-1-SNAPSHOT</version>
+ <version>6.2.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.2.0-atlassian-1</tag>
</scm>
<distributionManagement>
@@ -89,7 +89,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2023-06-28T07:08:44Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2023-07-10T09:09:42Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
[struts] 15/15: [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.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 301969bd3d8c47fdcdb783347969bf3acccf9c6c
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Mon Sep 4 16:00:27 2023 +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 627e0bfcd..fb8ddc061 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.3.0-atlassian-1</version>
+ <version>6.3.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 07a428925..e2915edc9 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.3.0-atlassian-1</version>
+ <version>6.3.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 43f688318..fca344d9f 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.3.0-atlassian-1</version>
+ <version>6.3.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 686edbfeb..992b9dab4 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.3.0-atlassian-1</version>
+ <version>6.3.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index bb86081e3..35177ae70 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.3.0-atlassian-1</version>
+ <version>6.3.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 3b20176f9..81e29643b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.3.0-atlassian-1</version>
+ <version>6.3.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.3.0-atlassian-1</tag>
+ <tag>HEAD</tag>
</scm>
<distributionManagement>
@@ -89,7 +89,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2023-09-04T05:59:57Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2023-09-04T06:00:27Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
[struts] 10/15: Merge branch 'fork/6.2' into fork/6.3
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.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit a647661a9daa15aa2d32306d200eccbcfba0e599
Merge: 1a88f78a7 489167f0a
Author: Kusal Kithul-Godage <gi...@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>
[struts] 07/15: CONFSRVDEV-26354 Port legacy WebWork syntax support (partial revert 7840fa1)
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.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 4762b6c7dab0eddfe2217cc3592a8915192989b4
Author: Kusal Kithul-Godage <kk...@atlassian.com>
AuthorDate: Thu Mar 30 18:19:56 2023 +1100
CONFSRVDEV-26354 Port legacy WebWork syntax support (partial revert 7840fa1)
---
.../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 +++--
5 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/core/src/main/java/org/apache/struts2/components/Component.java b/core/src/main/java/org/apache/struts2/components/Component.java
index ba0d672bf..8c649276c 100644
--- a/core/src/main/java/org/apache/struts2/components/Component.java
+++ b/core/src/main/java/org/apache/struts2/components/Component.java
@@ -22,7 +22,6 @@ import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.security.NotExcludedAcceptedPatternsChecker;
-import com.opensymphony.xwork2.util.TextParseUtil;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
@@ -319,14 +318,9 @@ public class Component {
* @return the modified expression wrapped with %{...}
*/
protected String completeExpression(String expr) {
- if (expr == null) {
- return null;
- }
- if (ComponentUtils.isExpression(expr)) {
- LOG.warn("Expression {} is already an expression!", expr);
- return expr;
- }
- return "%{" + expr + "}";
+ // Start forked modification
+ return expr;
+ // End modification
}
/**
@@ -378,16 +372,10 @@ public class Component {
* @return the Object found, or <tt>null</tt> if not found.
*/
protected Object findValue(String expression, Class<?> toType) {
- if (toType == String.class) {
- if (ComponentUtils.containsExpression(expression)) {
- return TextParseUtil.translateVariables('%', expression, stack);
- } else {
- return expression;
- }
- } else {
- String strippedExpression = stripExpression(expression);
- return getStack().findValue(strippedExpression, toType, throwExceptionOnELFailure);
- }
+ // Start forked modification
+ String strippedExpression = stripExpression(expression);
+ return getStack().findValue(strippedExpression, toType, throwExceptionOnELFailure);
+ // End modification
}
/**
diff --git a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
index 9c4e30a0c..484997df1 100644
--- a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
@@ -186,7 +186,9 @@ public abstract class DoubleListUIBean extends ListUIBean {
Form form = (Form) findAncestor(Form.class);
if (doubleId != null) {
- addParameter("doubleId", findString(doubleId));
+ // Start forked modification
+ addParameter("doubleId", doubleId);
+ // End modification
} else if (form != null) {
addParameter("doubleId", form.getParameters().get("id") + "_" + escape(doubleName != null ? findString(doubleName) : null));
} else {
diff --git a/core/src/main/java/org/apache/struts2/components/FormButton.java b/core/src/main/java/org/apache/struts2/components/FormButton.java
index 0ed08d47b..0a12f36b3 100644
--- a/core/src/main/java/org/apache/struts2/components/FormButton.java
+++ b/core/src/main/java/org/apache/struts2/components/FormButton.java
@@ -98,8 +98,9 @@ public abstract class FormButton extends ClosingUIBean {
protected void populateComponentHtmlId(Form form) {
String tmpId = "";
if (id != null) {
- // this check is needed for backwards compatibility with 2.1.x
- tmpId = findString(id);
+ // Start forked modification
+ tmpId = id;
+ // End modification
} else {
if (form != null && form.getParameters().get("id") != null) {
tmpId = tmpId + form.getParameters().get("id").toString() + "_";
diff --git a/core/src/main/java/org/apache/struts2/components/Label.java b/core/src/main/java/org/apache/struts2/components/Label.java
index c09b88c80..03b2129a0 100644
--- a/core/src/main/java/org/apache/struts2/components/Label.java
+++ b/core/src/main/java/org/apache/struts2/components/Label.java
@@ -18,14 +18,13 @@
*/
package org.apache.struts2.components;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.util.TextProviderHelper;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.struts2.util.TextProviderHelper;
-import com.opensymphony.xwork2.util.ValueStack;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* <!-- START SNIPPET: javadoc -->
@@ -89,7 +88,9 @@ public class Label extends UIBean {
}
} else if (name != null) {
String expr = completeExpression(name);
- addParameter("nameValue", findString(expr));
+ // Start forked modification
+ addParameter("nameValue", expr);
+ // End modification
}
}
diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java b/core/src/main/java/org/apache/struts2/components/UIBean.java
index 9dc4807f3..be5a33af2 100644
--- a/core/src/main/java/org/apache/struts2/components/UIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/UIBean.java
@@ -1032,8 +1032,9 @@ public abstract class UIBean extends Component {
String tryId;
String generatedId;
if (id != null) {
- // this check is needed for backwards compatibility with 2.1.x
- tryId = findString(id);
+ // Start forked modification
+ tryId = id;
+ // End modification
} else if (null == (generatedId = escape(name != null ? findString(name) : null))) {
LOG.debug("Cannot determine id attribute for [{}], consider defining id, name or key attribute!", this);
tryId = null;
[struts] 01/15: Update README.md
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.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 0b3df53a95aafd50107a99814893baaa7f5976d8
Author: Kusal Kithul-Godage <kk...@atlassian.com>
AuthorDate: Mon Jun 26 12:55:26 2023 +1000
Update README.md
---
README.md | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/README.md b/README.md
index ca6366563..e7140fb7f 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,40 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+# This branch is an Atlassian fork of Apache Struts
+
+## Updating this branch fork for a new patch release
+
+1. Clone this repo and checkout this branch
+2. Add upstream repo as a remote: `git remote add apache https://github.com/apache/struts.git`
+3. Fetch the upstream tags: `git fetch --tags apache`
+4. Merge latest patch version tag into this branch, eg. `git merge STRUTS_2_5_31`
+5. Ensure correct snapshot version, eg. `2.5.31-atlassian-1-SNAPSHOT`
+
+## Creating a new branch fork for a new major/minor release
+
+1. Clone this repo and checkout this branch
+2. Add upstream repo as a remote: `git remote add apache https://github.com/apache/struts.git`
+3. Fetch the upstream tags: `git fetch --tags apache`
+4. Checkout a new branch from the desired tag, eg. `git checkout -b fork/6.2 STRUTS_6_2_0`
+5. Either:
+ * Merge previous forked branch into new branch, eg. `git merge origin/fork/2.5`
+ * Cherry-pick desired commits from previous forked branch into new branch, eg. `git cherry-pick <hash>`. Please
+ ensure release related commits are included.
+6. Ensure correct snapshot version, eg. `6.2.0-atlassian-1-SNAPSHOT`
+
+## Releasing a new version
+
+1. Ensure snapshot versions are correct
+2. Ensure that the `scm` and `distributionManagement` sections in `pom.xml` are correct (consistent with previous
+ releases)
+3. Grant yourself Artifactory write permission: `atlas packages permission grant`
+4. Commence release,
+ eg. `mvn -B release:clean release:prepare release:perform -DdevelopmentVersion=6.2.0-atlassian-2-SNAPSHOT`
+5. Push SNAPSHOT update: `git push`
+
+---
The Apache Struts web framework
-------------------------------
[struts] 14/15: [maven-release-plugin] prepare release struts2-parent-6.3.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.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 088a5b0ec0021722a4a097406ecc56d07be5a811
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Mon Sep 4 16:00:20 2023 +1000
[maven-release-plugin] prepare release struts2-parent-6.3.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 f8192156e..627e0bfcd 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.3.0-atlassian-1-SNAPSHOT</version>
+ <version>6.3.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 334ca2fc8..07a428925 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.3.0-atlassian-1-SNAPSHOT</version>
+ <version>6.3.0-atlassian-1</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 2ac99fa72..43f688318 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.3.0-atlassian-1-SNAPSHOT</version>
+ <version>6.3.0-atlassian-1</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 48be43941..686edbfeb 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.3.0-atlassian-1-SNAPSHOT</version>
+ <version>6.3.0-atlassian-1</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index 5e7eef90e..bb86081e3 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.3.0-atlassian-1-SNAPSHOT</version>
+ <version>6.3.0-atlassian-1</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index b2ccf8737..3b20176f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.3.0-atlassian-1-SNAPSHOT</version>
+ <version>6.3.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.3.0-atlassian-1</tag>
</scm>
<distributionManagement>
@@ -89,7 +89,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2023-09-04T05:35:14Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2023-09-04T05:59:57Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
[struts] 02/15: Update scm and distributionManagement
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.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 11122ab6eccf96811b1a938acbd438da51aafa38
Author: Kusal Kithul-Godage <kk...@atlassian.com>
AuthorDate: Mon Mar 27 17:24:08 2023 +1100
Update scm and distributionManagement
---
pom.xml | 39 ++++++++++++---------------------------
1 file changed, 12 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index d0f86608f..ba18f4440 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,36 +48,21 @@
-->
<scm>
- <connection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</connection>
- <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</developerConnection>
- <url>https://github.com/apache/struts/</url>
- <tag>STRUTS_6_2_0</tag>
+ <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>
</scm>
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/projects/WW</url>
- </issueManagement>
-
- <ciManagement>
- <system>Jenkins</system>
- <url>https://builds.apache.org/job/Struts/</url>
- <notifiers>
- <notifier>
- <type>mail</type>
- <configuration>
- <address>dev@struts.apache.org</address>
- </configuration>
- </notifier>
- </notifiers>
- </ciManagement>
-
<distributionManagement>
- <site>
- <id>struts-site</id>
- <name>Apache Struts</name>
- <url>https://struts.apache.org/maven/</url>
- </site>
+<!-- <repository>-->
+<!-- <id>atlassian-restricted</id>-->
+<!-- <url>https://packages.atlassian.com/mvn/maven-restricted</url>-->
+<!-- </repository>-->
+ <repository>
+ <id>atlassian-3rdparty</id>
+ <url>https://packages.atlassian.com/mvn/maven-3rdparty</url>
+ </repository>
</distributionManagement>
<modules>
[struts] 03/15: Skip tests and GPG for release
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.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 29dd8ea7f57e2be2aacabe678d1983b708490bd8
Author: Kusal Kithul-Godage <kk...@atlassian.com>
AuthorDate: Mon Mar 27 22:21:42 2023 +1100
Skip tests and GPG for release
---
pom.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pom.xml b/pom.xml
index ba18f4440..2b29ac958 100644
--- a/pom.xml
+++ b/pom.xml
@@ -376,6 +376,9 @@
<artifactId>maven-release-plugin</artifactId>
<!-- See https://issues.apache.org/jira/browse/MRELEASE-1029 -->
<version>3.0.0-M1</version>
+ <configuration>
+ <arguments>-Dmaven.test.skip -Dgpg.skip</arguments>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
[struts] 06/15: CONFSRVDEV-26304 Add type inference to directive parameters (cherry-picked from 82ef6576c5d and 059de2305af)
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.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit e9facfa6ef4c8d5635321ea6f56b7e51aafe218c
Author: Kusal Kithul-Godage <kk...@atlassian.com>
AuthorDate: Mon Mar 27 21:27:33 2023 +1100
CONFSRVDEV-26304 Add type inference to directive parameters (cherry-picked from 82ef6576c5d and 059de2305af)
---
.../velocity/components/AbstractDirective.java | 95 +++++++++++++++++++---
1 file changed, 84 insertions(+), 11 deletions(-)
diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
index e955b32aa..318a14c53 100644
--- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
+++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
@@ -18,14 +18,11 @@
*/
package org.apache.struts2.views.velocity.components;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.components.Component;
import org.apache.velocity.context.InternalContextAdapter;
@@ -33,13 +30,24 @@ import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.directive.Directive;
+import org.apache.velocity.runtime.parser.node.ASTReference;
+import org.apache.velocity.runtime.parser.node.ASTStringLiteral;
import org.apache.velocity.runtime.parser.node.Node;
+import org.apache.velocity.runtime.parser.node.SimpleNode;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.util.ValueStack;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.Writer;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+import static java.text.MessageFormat.format;
public abstract class AbstractDirective extends Directive {
+
+ private static final Logger LOG = LogManager.getLogger(AbstractDirective.class);
public String getName() {
return "s" + getBeanName();
}
@@ -143,6 +151,14 @@ public abstract class AbstractDirective extends Directive {
* @throws MethodInvocationException in case of method invocation errors
*/
protected void putProperty(Map propertyMap, InternalContextAdapter contextAdapter, Node node) throws ParseErrorException, MethodInvocationException {
+ // Start forked modification
+ if (putPropertyWithType(propertyMap, contextAdapter, node)) {
+ return;
+ } else {
+ LOG.debug("Property value type preservation failed, falling back to default string resolution behaviour.");
+ }
+ // End modification
+
// node.value uses the StrutsValueStack to evaluate the directive's value parameter
String param = node.value(contextAdapter).toString();
@@ -157,4 +173,61 @@ public abstract class AbstractDirective extends Directive {
throw new ParseErrorException("#" + this.getName() + " arguments must include an assignment operator! For example #tag( Component \"template=mytemplate\" ). #tag( TextField \"mytemplate\" ) is illegal!");
}
}
+
+ /**
+ * @TODO CONFSRVDEV-24358 : Replace this interim workaround with a more reliable solution e.g. new Param directive.
+ * Temporary workaround using reflection to preserve type for attributes based on template variables. This preserves
+ * compatibility for bodyTag/param directives that were converted to s-prefixed directives in Confluence.
+ */
+ private boolean putPropertyWithType(Map propertyMap, InternalContextAdapter contextAdapter, Node node) {
+ String param = node.value(contextAdapter).toString();
+ int idx = param.indexOf('=');
+ if (idx == -1 || !(node instanceof ASTStringLiteral)) {
+ return false;
+ }
+ try {
+ String property = param.substring(0, idx);
+ SimpleNode nodeTree = reflectField(node, "nodeTree");
+ if (nodeTree != null && nodeTree.jjtGetNumChildren() == 3 && nodeTree.jjtGetChild(1) instanceof ASTReference &&
+ StringUtils.isBlank(nodeTree.jjtGetChild(2).literal())) {
+ ASTReference ref = (ASTReference) nodeTree.jjtGetChild(1);
+ Object resolvedVar = ref.value(contextAdapter);
+ if (reflectField(ref, "nullString").equals(resolvedVar)) {
+ // If resolution failed, set to null
+ resolvedVar = null;
+ }
+ String firstChild = nodeTree.jjtGetChild(0).literal();
+ char lastChar = firstChild.charAt(firstChild.length() - 1);
+ char secondLastChar = firstChild.charAt(firstChild.length() - 2);
+ if (lastChar == '=') {
+ // Preserve resolvedVar type
+ propertyMap.put(property, resolvedVar);
+ return true;
+ } else if (secondLastChar == '=' && lastChar == '!') {
+ // If preceded by '!', coerce to boolean and negate
+ resolvedVar = Boolean.FALSE.equals(resolvedVar);
+ propertyMap.put(property, resolvedVar);
+ return true;
+ } else {
+ LOG.debug(
+ "Tag attribute type unable to be preserved due to unsupported operand and/or string manipulation : {}",
+ param);
+ }
+ } else if (nodeTree == null && ("'false'".equalsIgnoreCase(param.substring(idx + 1)) || "false".equalsIgnoreCase(
+ param.substring(idx + 1)))) {
+ // Replace 'false' string with boolean - this will break scenarios where actual 'false' string is desired
+ propertyMap.put(property, false);
+ return true;
+ }
+ } catch (NoSuchFieldException | IllegalAccessException | ClassCastException e) {
+ LOG.debug(format("Exception preserving tag attribute type : {0}", param), e);
+ }
+ return false;
+ }
+
+ private <T> T reflectField(Object instance, String fieldName) throws NoSuchFieldException, IllegalAccessException, ClassCastException {
+ Field field = instance.getClass().getDeclaredField(fieldName);
+ field.setAccessible(true);
+ return (T) field.get(instance);
+ }
}
[struts] 09/15: [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.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 489167f0ac066c7fd51d3a09243f9dbcabfd7bda
Author: Kusal Kithul-Godage <kk...@atlassian.com>
AuthorDate: Mon Jul 10 19:10:12 2023 +1000
[maven-release-plugin] prepare for next development iteration
---
core/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/portlet-mocks/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/velocity/pom.xml | 2 +-
pom.xml | 6 +++---
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index e48e96a77..e40c51992 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.2.0-atlassian-1</version>
+ <version>6.2.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index a1d85570d..60459b1b3 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0-atlassian-1</version>
+ <version>6.2.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-convention-plugin</artifactId>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 65e7427a1..b9ff136f6 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.2.0-atlassian-1</version>
+ <version>6.2.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 4fa04ec1e..84d2017d4 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.2.0-atlassian-1</version>
+ <version>6.2.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/portlet-mocks/pom.xml b/plugins/portlet-mocks/pom.xml
index 8c08057aa..927a2653c 100644
--- a/plugins/portlet-mocks/pom.xml
+++ b/plugins/portlet-mocks/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0-atlassian-1</version>
+ <version>6.2.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-mocks-plugin</artifactId>
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 3c53f7e78..6ddde67e6 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>6.2.0-atlassian-1</version>
+ <version>6.2.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-plugin</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index b740f3060..6d5276ff0 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.2.0-atlassian-1</version>
+ <version>6.2.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index cab0d760c..a6fce0f15 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.2.0-atlassian-1</version>
+ <version>6.2.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 9a14c491a..01a40bb02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.2.0-atlassian-1</version>
+ <version>6.2.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.2.0-atlassian-1</tag>
+ <tag>HEAD</tag>
</scm>
<distributionManagement>
@@ -89,7 +89,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2023-07-10T09:09:42Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2023-07-10T09:10:11Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
[struts] 12/15: mvn versions:set -DnewVersion=6.3.0-atlassian-1-SNAPSHOT
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.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit fb12482a2979edf7c1bf1699c9a7119fbcaed947
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Mon Sep 4 15:50:00 2023 +1000
mvn versions:set -DnewVersion=6.3.0-atlassian-1-SNAPSHOT
---
assembly/pom.xml | 2 +-
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 | 4 ++--
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 186dec261..05072dcf2 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>6.3.0</version>
+ <version>6.3.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-assembly</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index ed12fb54a..f8192156e 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.3.0</version>
+ <version>6.3.0-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 a66c6d8aa..334ca2fc8 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.3.0</version>
+ <version>6.3.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 35c407748..2ac99fa72 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.3.0</version>
+ <version>6.3.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 36c42afd7..48be43941 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.3.0</version>
+ <version>6.3.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index 7c87ba7e4..5e7eef90e 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.3.0</version>
+ <version>6.3.0-atlassian-1-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index d656ffe10..b2ccf8737 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>6.3.0</version>
+ <version>6.3.0-atlassian-1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
@@ -89,7 +89,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2023-09-01T05:56:19Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2023-09-04T05:35:14Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
[struts] 04/15: Comment unnecessary modules
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.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit c254d7e5196ddc2990021bca2ada7bf6bbb8d182
Author: Kusal Kithul-Godage <kk...@atlassian.com>
AuthorDate: Mon Mar 27 22:13:22 2023 +1100
Comment unnecessary modules
---
plugins/pom.xml | 42 +++++++++++++++++++++---------------------
pom.xml | 8 ++++----
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 382e0cfe2..5d175f4c4 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -32,33 +32,33 @@
<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-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>
diff --git a/pom.xml b/pom.xml
index 2b29ac958..97b009d08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,11 +66,11 @@
</distributionManagement>
<modules>
- <module>bom</module>
+<!-- <module>bom</module>-->
<module>core</module>
<module>plugins</module>
- <module>bundles</module>
- <module>apps</module>
+<!-- <module>bundles</module>-->
+<!-- <module>apps</module>-->
</modules>
<licenses>
@@ -124,7 +124,7 @@
<id>includeAssembly</id>
<activation>
<property>
- <name>!skipAssembly</name>
+ <name>includeAssembly</name>
</property>
</activation>
<modules>