From eba05e53da47dfe8cc5b4fec7e9228d5145138e6 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Sun, 19 Oct 2025 19:12:31 +0200
Subject: [PATCH] Reverse merge changes related to releasing Struts 7.1.1
 (#1378)

* [maven-release-plugin] prepare release STRUTS_7_1_1

* [maven-release-plugin] rollback the release of STRUTS_7_1_1

* [maven-release-plugin] prepare release STRUTS_7_1_1

* [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                                 | 2 +-
 core/pom.xml                                | 2 +-
 jakarta/pom.xml                             | 2 +-
 jakarta/velocity-tools-jsp-jakarta/pom.xml  | 2 +-
 jakarta/velocity-tools-view-jakarta/pom.xml | 2 +-
 parent/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/jasperreports/pom.xml               | 2 +-
 plugins/jasperreports7/pom.xml              | 2 +-
 plugins/javatemplates/pom.xml               | 2 +-
 plugins/jfreechart/pom.xml                  | 2 +-
 plugins/json/pom.xml                        | 2 +-
 plugins/junit/pom.xml                       | 2 +-
 plugins/pom.xml                             | 2 +-
 plugins/rest/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                                     | 4 ++--
 29 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/apps/pom.xml b/apps/pom.xml
index a306ab704..311396f6f 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <artifactId>struts2-apps</artifactId>
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index d14497e08..627873013 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>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-rest-showcase</artifactId>
     <packaging>war</packaging>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.2-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 d9579fa83..c0d297290 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>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-showcase</artifactId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index faa36a6c0..905292e7f 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/bom/pom.xml b/bom/pom.xml
index 2797574a0..133c16ffc 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-project</artifactId>
-        <version>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-bom</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index bc7ca33ed..886ba45ed 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <artifactId>struts2-core</artifactId>
diff --git a/jakarta/pom.xml b/jakarta/pom.xml
index ea567d701..a7886256f 100644
--- a/jakarta/pom.xml
+++ b/jakarta/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <artifactId>struts2-jakarta</artifactId>
diff --git a/jakarta/velocity-tools-jsp-jakarta/pom.xml b/jakarta/velocity-tools-jsp-jakarta/pom.xml
index 2e80e0625..f1106d610 100644
--- a/jakarta/velocity-tools-jsp-jakarta/pom.xml
+++ b/jakarta/velocity-tools-jsp-jakarta/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-jakarta</artifactId>
-        <version>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
     <artifactId>struts2-velocity-tools-jsp-jakarta</artifactId>
     <packaging>jar</packaging>
diff --git a/jakarta/velocity-tools-view-jakarta/pom.xml b/jakarta/velocity-tools-view-jakarta/pom.xml
index fed377ab8..ba8c750ab 100644
--- a/jakarta/velocity-tools-view-jakarta/pom.xml
+++ b/jakarta/velocity-tools-view-jakarta/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-jakarta</artifactId>
-        <version>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
     <artifactId>struts2-velocity-tools-view-jakarta</artifactId>
     <packaging>jar</packaging>
diff --git a/parent/pom.xml b/parent/pom.xml
index c13d6bd8d..5b180d4c4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-bom</artifactId>
-        <version>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
         <relativePath>../bom/pom.xml</relativePath>
     </parent>
 
diff --git a/plugins/async/pom.xml b/plugins/async/pom.xml
index 1ecf43079..eb792cbac 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>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-async-plugin</artifactId>
diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml
index f66b9c3a9..7ed0ae93c 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>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 109e0273c..14b5429e7 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>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-cdi-plugin</artifactId>
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index c62588034..3e6d651ff 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>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-config-browser-plugin</artifactId>
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index 8ace44f02..fc42de531 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>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-convention-plugin</artifactId>
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 9ec4131c3..fa43d482a 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>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-jasperreports-plugin</artifactId>
diff --git a/plugins/jasperreports7/pom.xml b/plugins/jasperreports7/pom.xml
index c4077ff8d..02920566c 100644
--- a/plugins/jasperreports7/pom.xml
+++ b/plugins/jasperreports7/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-jasperreports7-plugin</artifactId>
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index a33662da0..36f4e7d37 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>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-javatemplates-plugin</artifactId>
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 2b1e1d340..361a2ec2f 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>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-jfreechart-plugin</artifactId>
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 7c938ba04..952a2f87d 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>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-json-plugin</artifactId>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index b95905466..53ca5f641 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>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 22ae25891..e092947f8 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index ef7404f07..93b4c6adc 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>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-rest-plugin</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 20d41c49c..261d45258 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>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index 46339f87b..c014101e6 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>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-testng-plugin</artifactId>
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 5b8bb3f68..c18033378 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>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-tiles-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index 51574fa5a..14d57fe6e 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>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-velocity-plugin</artifactId>
diff --git a/plugins/xslt/pom.xml b/plugins/xslt/pom.xml
index e04a135c7..0151f5b6b 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>7.1.1-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-xslt-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 41c3de93b..68efecc67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-project</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Struts 2</name>
     <url>https://struts.apache.org/</url>
@@ -106,7 +106,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.build.outputTimestamp>2025-09-24T07:45:02Z</project.build.outputTimestamp>
+        <project.build.outputTimestamp>2025-10-01T06:32:34Z</project.build.outputTimestamp>
         <maven.compiler.release>17</maven.compiler.release>
 
         <!-- dependency versions in alphanumeric order -->