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 7ee62ea6cd254fda9b3529ac605504d774563c6d
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Mon Nov 18 17:28:56 2024 +1100
[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 7654e329d..6dae9212f 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-1</version>
+ <version>6.7.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 3054f3547..6bbe84814 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-1</version>
+ <version>6.7.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 5a43c5827..8309a154f 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-1</version>
+ <version>6.7.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 1b8d50ec7..a819396a0 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-1</version>
+ <version>6.7.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index 7735505c9..d8d738e37 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-1</version>
+ <version>6.7.0-atlassian-2-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index ba3252044..ed52b98d4 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-1</version>
+ <version>6.7.0-atlassian-2-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-1</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
@@ -107,7 +107,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
<project.build.outputTimestamp>2024-11-18T06:28:35Z</project.build.outputTimestamp>
+
<project.build.outputTimestamp>2024-11-18T06:28:56Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
