From 3dcbb44906e82ff222246e34937608a635e21751 Mon Sep 17 00:00:00 2001
From: Michael Minella <mminella@gopivotal.com>
Date: Fri, 22 Nov 2013 09:56:51 -0600
Subject: [PATCH] [maven-release-plugin] prepare release 2.2.3.RELEASE

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

diff --git a/pom.xml b/pom.xml
index 55a1d6842..3dffcdc6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,6 +7,7 @@
 	<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
 <<<<<<< HEAD
 	<version>3.0.0.BUILD-SNAPSHOT</version>
 =======
@@ -15,6 +16,9 @@
 =======
 	<version>2.2.3.BUILD-SNAPSHOT</version>
 >>>>>>> [maven-release-plugin] prepare for next development iteration
+=======
+	<version>2.2.3.RELEASE</version>
+>>>>>>> [maven-release-plugin] prepare release 2.2.3.RELEASE
 	<packaging>pom</packaging>
 	<modules>
 		<module>spring-batch-parent</module>
@@ -31,7 +35,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>HEAD</tag>
+	  <tag>2.2.3.RELEASE</tag>
   </scm>
 	<issueManagement>
 		<system>JIRA</system>
diff --git a/spring-batch-infrastructure-tests/pom.xml b/spring-batch-infrastructure-tests/pom.xml
index e49977afc..7e54292b1 100644
--- a/spring-batch-infrastructure-tests/pom.xml
+++ b/spring-batch-infrastructure-tests/pom.xml
@@ -57,7 +57,11 @@
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
 			<artifactId>spring-batch-infrastructure</artifactId>
+<<<<<<< HEAD
 			<version>3.0.0.BUILD-SNAPSHOT</version>
+=======
+			<version>2.2.3.RELEASE</version>
+>>>>>>> [maven-release-plugin] prepare release 2.2.3.RELEASE
 		</dependency>
 		<dependency>
 			<groupId>org.hsqldb</groupId>
diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml
index 718a318c0..9586ae017 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>HEAD</tag>
+		<tag>2.2.3.RELEASE</tag>
 	</scm>
 	<licenses>
 		<license>