From 96aedf9bd5442a61897a19c96144e6fea48b83ce Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Sun, 19 Dec 2021 12:50:28 +0100
Subject: [PATCH] [maven-release-plugin] prepare release STRUTS_6_0_0_RC1

---
 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-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 +-
 pom.xml                         | 10 +++++-----
 37 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/apps/pom.xml b/apps/pom.xml
index 791f306ba..ae5e8b875 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
     <artifactId>struts2-apps</artifactId>
     <packaging>pom</packaging>
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 9aff868e1..96f6d6877 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-rest-showcase</artifactId>
     <packaging>war</packaging>
-    <version>2.6-SNAPSHOT</version>
+    <version>6.0.0-RC1</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 78564ac36..067c74154 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-showcase</artifactId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 4ad736216..8b2f49a4a 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-assembly</artifactId>
diff --git a/bom/pom.xml b/bom/pom.xml
index a45491815..b5a32ff39 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -29,7 +29,7 @@
     </parent>
 
     <artifactId>struts2-bom</artifactId>
-    <version>2.6-SNAPSHOT</version>
+    <version>6.0.0-RC1</version>
     <packaging>pom</packaging>
 
     <name>Struts 2 Bill of Materials</name>
@@ -44,7 +44,7 @@
     </licenses>
 
     <properties>
-        <struts-version.version>2.6-SNAPSHOT</struts-version.version>
+        <struts-version.version>6.0.0-RC1</struts-version.version>
         <maven.site.skip>true</maven.site.skip>
         <maven.site.deploy.skip>true</maven.site.deploy.skip>
     </properties>
@@ -173,4 +173,8 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+  <scm>
+    <tag>STRUTS_6_0_0_RC1</tag>
+  </scm>
 </project>
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index c6cd0e652..e87da1472 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-osgi-admin-bundle</artifactId>
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index a2f639bd7..c33fbcdec 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-osgi-demo-bundle</artifactId>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index c6d4a9de8..8d370f065 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-osgi-bundles</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 980714243..9d2f56509 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
     <artifactId>struts2-core</artifactId>
     <packaging>jar</packaging>
diff --git a/plugins/async/pom.xml b/plugins/async/pom.xml
index b92e8ad60..022c75975 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-async-plugin</artifactId>
diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml
index fc616fa53..80f4239da 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index fefaa93c3..a9683837f 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-cdi-plugin</artifactId>
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index 128600008..82764443e 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-config-browser-plugin</artifactId>
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index f229e8bd9..28eaa38b5 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-convention-plugin</artifactId>
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index c763c4633..3b2224627 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-dwr-plugin</artifactId>
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index bf3ed66e3..5458d2313 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-embeddedjsp-plugin</artifactId>
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index 0951f85f8..3f2c353ac 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-gxp-plugin</artifactId>
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 6e8632f74..9a25ef0dd 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-jasperreports-plugin</artifactId>
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 71e9c4596..8fdbd8885 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-javatemplates-plugin</artifactId>
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 0ee1990de..33dcb7a7d 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
    </parent>
 
     <artifactId>struts2-jfreechart-plugin</artifactId>
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index a89b221a3..5eec7ac37 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-json-plugin</artifactId>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index b978c8dde..ee896ec3e 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index d5b73c73b..d9ff073d0 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-osgi-plugin</artifactId>
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index 7270d60d8..1546a1437 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-oval-plugin</artifactId>
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index ed234cbf6..c81ccfea4 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-pell-multipart-plugin</artifactId>
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index 09af5adb1..210ce51bb 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-plexus-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index b9f625463..3fc04919d 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-plugins</artifactId>
diff --git a/plugins/portlet-mocks/pom.xml b/plugins/portlet-mocks/pom.xml
index 6bfd8491f..b9b91d1fd 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-portlet-mocks-plugin</artifactId>
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 8fb4c1ddc..e8ab50855 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-portlet-tiles-plugin</artifactId>
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 1866afd47..165828ddd 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-portlet-plugin</artifactId>
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index a149de6b5..7cf3164ca 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-rest-plugin</artifactId>
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index e2f75bfd8..08a7d727e 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-sitemesh-plugin</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 774271d41..c7d8af1b4 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index 7a2106707..84e016bea 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-testng-plugin</artifactId>
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 2507ee7a6..2ed59f39a 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-tiles-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index 8da8e57a0..bcc662472 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>2.6-SNAPSHOT</version>
+        <version>6.0.0-RC1</version>
     </parent>
 
     <artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 399d6646b..29ae5e801 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-parent</artifactId>
-    <version>2.6-SNAPSHOT</version>
+    <version>6.0.0-RC1</version>
     <packaging>pom</packaging>
     <name>Struts 2</name>
     <url>http://struts.apache.org/</url>
@@ -51,7 +51,7 @@
         <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>HEAD</tag>
+        <tag>STRUTS_6_0_0_RC1</tag>
     </scm>
 
     <issueManagement>
@@ -104,7 +104,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.build.outputTimestamp>2020-07-11T19:40:00Z</project.build.outputTimestamp>
+        <project.build.outputTimestamp>2021-12-19T11:45:29Z</project.build.outputTimestamp>
         <java.version>1.8</java.version>
 
         <!-- dependency versions in alphanumeric order -->
@@ -341,10 +341,10 @@
                         <useDefaultExcludes>true</useDefaultExcludes>
                         <addDefaultLicenseMatchers>false</addDefaultLicenseMatchers>
                         <licenses>
-                            <licens implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20"/>
+                            <licens implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20" />
                         </licenses>
                         <licenseFamilies>
-                            <licenseFamily implementation="org.apache.rat.license.Apache20LicenseFamily"/>
+                            <licenseFamily implementation="org.apache.rat.license.Apache20LicenseFamily" />
                         </licenseFamilies>
                         <includes>
                             <include>pom.xml</include>