From 8bee7ac310039b404cac0fc05ee656b0150c1c22 Mon Sep 17 00:00:00 2001
From: Michael Minella <mminella@gopivotal.com>
Date: Fri, 22 Nov 2013 17:12:22 -0600
Subject: [PATCH] Cleaned up merge issues and warnings in POM files

---
 pom.xml                                   | 12 ------------
 spring-batch-core/pom.xml                 |  2 --
 spring-batch-infrastructure-tests/pom.xml |  4 ----
 3 files changed, 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3dffcdc6a..c3f742948 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,19 +6,7 @@
 	<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
-<<<<<<< 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
-=======
-	<version>2.2.3.RELEASE</version>
->>>>>>> [maven-release-plugin] prepare release 2.2.3.RELEASE
 	<packaging>pom</packaging>
 	<modules>
 		<module>spring-batch-parent</module>
diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml
index d7c90ce02..d24a52774 100644
--- a/spring-batch-core/pom.xml
+++ b/spring-batch-core/pom.xml
@@ -21,7 +21,6 @@
 		<dependency>
 		    <groupId>javax.batch</groupId>
 		    <artifactId>javax.batch-api</artifactId>
-		    <version>1.0</version>
 		</dependency>
 		<dependency>
 		    <groupId>com.ibm.jbatch</groupId>
@@ -35,7 +34,6 @@
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>1.2.132</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
diff --git a/spring-batch-infrastructure-tests/pom.xml b/spring-batch-infrastructure-tests/pom.xml
index 7e54292b1..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.3.RELEASE</version>
->>>>>>> [maven-release-plugin] prepare release 2.2.3.RELEASE
 		</dependency>
 		<dependency>
 			<groupId>org.hsqldb</groupId>