From c5f65b697f0094c9356c297f23068a8ee19112ea Mon Sep 17 00:00:00 2001
From: Michael Minella <mminella@gopivotal.com>
Date: Sun, 8 Sep 2013 13:23:49 -0500
Subject: [PATCH] [maven-release-plugin] prepare for next development iteration

---
 pom.xml                                   | 6 +++++-
 spring-batch-infrastructure-tests/pom.xml | 4 ----
 spring-batch-parent/pom.xml               | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2bd64a6f5..55a1d6842 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,11 +6,15 @@
 	<name>Spring Batch</name>
 	<description>Spring Batch provides tools for enterprise batch or bulk processing. It can be used to wire up jobs, and track
 	their execution, or simply as an optimization for repetitive processing in a transactional environment. Spring Batch is part of the Spring Portfolio.</description>
+<<<<<<< HEAD
 <<<<<<< HEAD
 	<version>3.0.0.BUILD-SNAPSHOT</version>
 =======
 	<version>2.2.2.RELEASE</version>
 >>>>>>> [maven-release-plugin] prepare release 2.2.2.RELEASE
+=======
+	<version>2.2.3.BUILD-SNAPSHOT</version>
+>>>>>>> [maven-release-plugin] prepare for next development iteration
 	<packaging>pom</packaging>
 	<modules>
 		<module>spring-batch-parent</module>
@@ -27,7 +31,7 @@
 		<url>http://github.com/SpringSource/spring-batch</url>
 		<connection>scm:git:git://github.com/SpringSource/spring-batch.git</connection>
 		<developerConnection>scm:git:ssh://git@github.com/SpringSource/spring-batch.git</developerConnection>
-	  <tag>2.2.2.RELEASE</tag>
+	  <tag>HEAD</tag>
   </scm>
 	<issueManagement>
 		<system>JIRA</system>
diff --git a/spring-batch-infrastructure-tests/pom.xml b/spring-batch-infrastructure-tests/pom.xml
index 0b78ae28c..e49977afc 100644
--- a/spring-batch-infrastructure-tests/pom.xml
+++ b/spring-batch-infrastructure-tests/pom.xml
@@ -57,11 +57,7 @@
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
 			<artifactId>spring-batch-infrastructure</artifactId>
-<<<<<<< HEAD
 			<version>3.0.0.BUILD-SNAPSHOT</version>
-=======
-			<version>2.2.2.RELEASE</version>
->>>>>>> [maven-release-plugin] prepare release 2.2.2.RELEASE
 		</dependency>
 		<dependency>
 			<groupId>org.hsqldb</groupId>
diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml
index 0c1d18388..718a318c0 100644
--- a/spring-batch-parent/pom.xml
+++ b/spring-batch-parent/pom.xml
@@ -12,7 +12,7 @@
 		<url>http://github.com/SpringSource/spring-batch</url>
 		<connection>scm:git:git://github.com/SpringSource/spring-batch.git</connection>
 		<developerConnection>scm:git:git://github.com/SpringSource/spring-batch.git</developerConnection>
-		<tag>2.2.2.RELEASE</tag>
+		<tag>HEAD</tag>
 	</scm>
 	<licenses>
 		<license>