This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git
commit cd3389ab351ccb10c7ac9038f2d48e94a466a634 Author: Lukasz Lenart <lukaszlen...@apache.org> AuthorDate: Sat Jan 20 11:38:59 2024 +0100 [maven-release-plugin] prepare release STRUTS_7_0_0_M1 --- apps/pom.xml | 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml | 2 +- bom/pom.xml | 8 ++++---- core/pom.xml | 5 ++--- jakarta/freemarker-jakarta/pom.xml | 6 ++---- jakarta/pom.xml | 6 ++---- jakarta/sitemesh2-jakarta/pom.xml | 6 ++---- jakarta/velocity-tools-jsp-jakarta/pom.xml | 6 ++---- jakarta/velocity-tools-view-jakarta/pom.xml | 6 ++---- 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/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/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 | 6 +++--- 30 files changed, 42 insertions(+), 53 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index b87c6bb99..b24ecc856 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-apps</artifactId> <packaging>pom</packaging> diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 9a950949c..f08d97998 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-rest-showcase</artifactId> <packaging>war</packaging> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.0-M1</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 d715790cd..68b34a4e8 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-showcase</artifactId> diff --git a/assembly/pom.xml b/assembly/pom.xml index 44f044bd2..aed6edb14 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-assembly</artifactId> diff --git a/bom/pom.xml b/bom/pom.xml index d3b622ebc..c2ccf92c1 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-parent</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-bom</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> <packaging>pom</packaging> <name>Struts 2 Bill of Materials</name> @@ -44,7 +44,7 @@ </licenses> <properties> - <struts-version.version>7.0.0-SNAPSHOT</struts-version.version> + <struts-version.version>7.0.0-M1</struts-version.version> <maven.site.skip>true</maven.site.skip> <maven.site.deploy.skip>true</maven.site.deploy.skip> </properties> @@ -165,7 +165,7 @@ </dependencyManagement> <scm> - <tag>HEAD</tag> + <tag>STRUTS_7_0_0_M1</tag> <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> diff --git a/core/pom.xml b/core/pom.xml index 8027faaf6..dd95636d9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -19,13 +19,12 @@ * 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-parent</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-core</artifactId> <packaging>jar</packaging> diff --git a/jakarta/freemarker-jakarta/pom.xml b/jakarta/freemarker-jakarta/pom.xml index 613124324..5174b86fb 100644 --- a/jakarta/freemarker-jakarta/pom.xml +++ b/jakarta/freemarker-jakarta/pom.xml @@ -19,14 +19,12 @@ * 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-jakarta</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-freemarker-jakarta</artifactId> <packaging>jar</packaging> diff --git a/jakarta/pom.xml b/jakarta/pom.xml index a4987ae2b..2ba0c43a3 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -19,14 +19,12 @@ * 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-parent</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-jakarta</artifactId> <packaging>pom</packaging> diff --git a/jakarta/sitemesh2-jakarta/pom.xml b/jakarta/sitemesh2-jakarta/pom.xml index b26c4ae19..859010025 100644 --- a/jakarta/sitemesh2-jakarta/pom.xml +++ b/jakarta/sitemesh2-jakarta/pom.xml @@ -19,14 +19,12 @@ * 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-jakarta</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-sitemesh2-jakarta</artifactId> <packaging>jar</packaging> diff --git a/jakarta/velocity-tools-jsp-jakarta/pom.xml b/jakarta/velocity-tools-jsp-jakarta/pom.xml index 7dd2f4c61..8d1b7b78d 100644 --- a/jakarta/velocity-tools-jsp-jakarta/pom.xml +++ b/jakarta/velocity-tools-jsp-jakarta/pom.xml @@ -19,14 +19,12 @@ * 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-jakarta</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.0-M1</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 cde691dcc..90e83df63 100644 --- a/jakarta/velocity-tools-view-jakarta/pom.xml +++ b/jakarta/velocity-tools-view-jakarta/pom.xml @@ -19,14 +19,12 @@ * 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-jakarta</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-velocity-tools-view-jakarta</artifactId> <packaging>jar</packaging> diff --git a/plugins/async/pom.xml b/plugins/async/pom.xml index e39a28f63..b7c486019 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-async-plugin</artifactId> diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml index 2da43088f..376ecb797 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml index c28e088ef..e9fe7358b 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-cdi-plugin</artifactId> diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml index ba7d31997..80c963378 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-config-browser-plugin</artifactId> diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml index d2edc93eb..37aab61af 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-convention-plugin</artifactId> diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index c23e13779..d3f6140d4 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-jasperreports-plugin</artifactId> diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml index e1c9b061a..81d00dde8 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-javatemplates-plugin</artifactId> diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml index ef2de302e..ac3f0905a 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-jfreechart-plugin</artifactId> diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml index ec7ddaca0..cb3ab9641 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-json-plugin</artifactId> diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index 3e04a6315..983e5f73c 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-junit-plugin</artifactId> diff --git a/plugins/pom.xml b/plugins/pom.xml index f254ce6e5..78068ea0b 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-plugins</artifactId> diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index 2dcd836a0..732067b90 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-rest-plugin</artifactId> diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml index 6dfe4313a..bc7bb1d2d 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>7.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-sitemesh-plugin</artifactId> diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index 618a66285..0a13dd2f7 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-spring-plugin</artifactId> diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml index f55a03dd8..2f2159e14 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-testng-plugin</artifactId> diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index 406c65ba7..36bb2436d 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-tiles-plugin</artifactId> diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml index 125d65259..91492bd55 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-velocity-plugin</artifactId> diff --git a/plugins/xslt/pom.xml b/plugins/xslt/pom.xml index c2ac42a34..bb2fa5097 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.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> </parent> <artifactId>struts2-xslt-plugin</artifactId> diff --git a/pom.xml b/pom.xml index 917ba09a7..29740dfb5 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>struts2-parent</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.0-M1</version> <packaging>pom</packaging> <name>Struts 2</name> <url>https://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_7_0_0_M1</tag> </scm> <issueManagement> @@ -104,7 +104,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.build.outputTimestamp>2023-11-12T10:00:00Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2024-01-20T10:33:56Z</project.build.outputTimestamp> <maven.compiler.release>17</maven.compiler.release> <maven.compiler.source>17</maven.compiler.source> <maven.compiler.target>17</maven.compiler.target>