This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/7.1.0 in repository https://gitbox.apache.org/repos/asf/struts.git
commit 8fcab78c5d484aa8469b7bc3fa343f3b9288d198 Author: Lukasz Lenart <[email protected]> AuthorDate: Wed Sep 24 09:39:45 2025 +0200 [maven-release-plugin] rollback the release of STRUTS_7_1_0 --- apps/pom.xml | 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml | 2 +- bom/pom.xml | 6 ++++-- 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 | 5 +++-- 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 | 8 ++++---- 29 files changed, 38 insertions(+), 35 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index cc3a8ac0f..e156f1d6c 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.0</version> + <version>7.0.4-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 ddf8fc46a..e31d009d9 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.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-rest-showcase</artifactId> <packaging>war</packaging> - <version>7.1.0</version> + <version>7.0.4-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 354645ce7..2a27dfc58 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.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-showcase</artifactId> diff --git a/assembly/pom.xml b/assembly/pom.xml index c83eab527..b59fbed0e 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.0</version> + <version>7.0.4-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> diff --git a/bom/pom.xml b/bom/pom.xml index 8befc86a0..ab4aa1c45 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -19,12 +19,14 @@ * under the License. */ --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-project</artifactId> - <version>7.1.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-bom</artifactId> diff --git a/core/pom.xml b/core/pom.xml index 14d1b469e..a70b30133 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.0</version> + <version>7.0.4-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>struts2-core</artifactId> diff --git a/jakarta/pom.xml b/jakarta/pom.xml index c84bbd828..a360c73ce 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.0</version> + <version>7.0.4-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 38f584f1e..9d63965c4 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.0</version> + <version>7.0.4-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 d51a2d0c2..c7b9f343a 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.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-velocity-tools-view-jakarta</artifactId> <packaging>jar</packaging> diff --git a/parent/pom.xml b/parent/pom.xml index 7b1d4c07e..092a438f2 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.0</version> + <version>7.0.4-SNAPSHOT</version> <relativePath>../bom/pom.xml</relativePath> </parent> diff --git a/plugins/async/pom.xml b/plugins/async/pom.xml index 7eb596b39..3969caa10 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.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-async-plugin</artifactId> diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml index 96e467841..0d7b47d14 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.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml index 69e2e89e1..9a34ceb67 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.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-cdi-plugin</artifactId> diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml index 4c111d0b5..53affac03 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.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-config-browser-plugin</artifactId> diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml index a6fbf0e3d..88b59e5dd 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.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-convention-plugin</artifactId> diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index 04b86183f..1ab776426 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.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-jasperreports-plugin</artifactId> diff --git a/plugins/jasperreports7/pom.xml b/plugins/jasperreports7/pom.xml index ebcd507e4..e5d92a637 100644 --- a/plugins/jasperreports7/pom.xml +++ b/plugins/jasperreports7/pom.xml @@ -19,12 +19,13 @@ * under the License. */ --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>7.1.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-jasperreports7-plugin</artifactId> diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml index bc2945922..87ede20fa 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.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-javatemplates-plugin</artifactId> diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml index a10cc6619..e6c1deb3c 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.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-jfreechart-plugin</artifactId> diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml index 4ad6ec231..2471a9414 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.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-json-plugin</artifactId> diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index 186086de8..d6c66d649 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.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-junit-plugin</artifactId> diff --git a/plugins/pom.xml b/plugins/pom.xml index 69258f30a..a8b3cd829 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.0</version> + <version>7.0.4-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index 215a5ce63..41bffba9e 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.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-rest-plugin</artifactId> diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index d2f709c73..e4d366b84 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.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-spring-plugin</artifactId> diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml index ae4a59f30..354793246 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.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-testng-plugin</artifactId> diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index 27ee5498b..fcb81ba1a 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.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-tiles-plugin</artifactId> diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml index 0516549f2..a6ddf860b 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.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-velocity-plugin</artifactId> diff --git a/plugins/xslt/pom.xml b/plugins/xslt/pom.xml index 1d06c5758..261f1fb36 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.0</version> + <version>7.0.4-SNAPSHOT</version> </parent> <artifactId>struts2-xslt-plugin</artifactId> diff --git a/pom.xml b/pom.xml index 6fc00a71b..3f4ef54f8 100644 --- a/pom.xml +++ b/pom.xml @@ -25,12 +25,12 @@ <groupId>org.apache.struts</groupId> <artifactId>struts-master</artifactId> <version>15</version> - <relativePath /> + <relativePath/> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>struts2-project</artifactId> - <version>7.1.0</version> + <version>7.0.4-SNAPSHOT</version> <packaging>pom</packaging> <name>Struts 2</name> <url>https://struts.apache.org/</url> @@ -52,7 +52,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>STRUTS_7_1_0</tag> + <tag>HEAD</tag> </scm> <issueManagement> @@ -106,7 +106,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.build.outputTimestamp>2025-09-24T07:36:52Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2025-02-17T09:41:25Z</project.build.outputTimestamp> <maven.compiler.release>17</maven.compiler.release> <!-- dependency versions in alphanumeric order -->
