This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch issue-85/CONFSRVDEV-37138-merge-upstream in repository https://gitbox.apache.org/repos/asf/struts.git
commit f50587ade4a721e2f8d655a9c23b176879ffde3c Author: Automated Release Script <bamboo_hg_u...@buildeng.atlassian.com> AuthorDate: Mon Feb 3 03:06:29 2025 +0000 [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 2b301aca6..aac5d707d 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.7.0-atlassian-2</version> + <version>6.7.0-atlassian-3-SNAPSHOT</version> </parent> <artifactId>struts2-core</artifactId> <packaging>jar</packaging> diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index c28e4c20b..78238c51c 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.7.0-atlassian-2</version> + <version>6.7.0-atlassian-3-SNAPSHOT</version> </parent> <artifactId>struts2-junit-plugin</artifactId> diff --git a/plugins/pom.xml b/plugins/pom.xml index 938273a8a..8f6ca7ddf 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.7.0-atlassian-2</version> + <version>6.7.0-atlassian-3-SNAPSHOT</version> </parent> <artifactId>struts2-plugins</artifactId> diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index 950f4aa4c..c27b647bf 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.7.0-atlassian-2</version> + <version>6.7.0-atlassian-3-SNAPSHOT</version> </parent> <artifactId>struts2-spring-plugin</artifactId> diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml index e2399afe7..679e4ee49 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.7.0-atlassian-2</version> + <version>6.7.0-atlassian-3-SNAPSHOT</version> </parent> <artifactId>struts2-velocity-plugin</artifactId> diff --git a/pom.xml b/pom.xml index 859e2e5bf..81ef61f36 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>struts2-parent</artifactId> - <version>6.7.0-atlassian-2</version> + <version>6.7.0-atlassian-3-SNAPSHOT</version> <packaging>pom</packaging> <name>Struts 2</name> <url>https://struts.apache.org/</url> @@ -51,7 +51,7 @@ <connection>scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git</connection> <developerConnection>scm:git:ssh://g...@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.7.0-atlassian-2</tag> + <tag>HEAD</tag> </scm> <issueManagement> @@ -107,7 +107,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.build.outputTimestamp>2025-02-03T03:06:03Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2025-02-03T03:06:29Z</project.build.outputTimestamp> <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target>