[maven-release-plugin] prepare for next development iteration

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>

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>

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>