From c097055288af43e53f0912c31dfa9c6bccbc247f Mon Sep 17 00:00:00 2001
From: Michael Minella <mminella@vmware.com>
Date: Wed, 9 Jan 2013 11:00:14 -0600
Subject: [PATCH] Removing redundant dependency on JPA 1.0 jar to fix
 integration test

---
 spring-batch-infrastructure-tests/pom.xml                 | 5 -----
 .../item/database/JpaPagingItemReaderAsyncTests.java      | 6 +++---
 .../org/springframework/batch/jms/jms-context.xml         | 8 ++++----
 spring-batch-infrastructure/pom.xml                       | 5 -----
 spring-batch-parent/pom.xml                               | 6 ------
 spring-batch-samples/pom.xml                              | 5 -----
 6 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/spring-batch-infrastructure-tests/pom.xml b/spring-batch-infrastructure-tests/pom.xml
index 8cc88bb3c..53e90faca 100644
--- a/spring-batch-infrastructure-tests/pom.xml
+++ b/spring-batch-infrastructure-tests/pom.xml
@@ -149,11 +149,6 @@
 			<groupId>commons-dbcp</groupId>
 			<artifactId>commons-dbcp</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>javax.persistence</groupId>
-			<artifactId>persistence-api</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderAsyncTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderAsyncTests.java
index 7b63a8c63..d8afb943b 100644
--- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderAsyncTests.java
+++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderAsyncTests.java
@@ -24,11 +24,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.sample.Foo;
-import org.springframework.test.jdbc.JdbcTestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.jdbc.JdbcTestUtils;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "JpaPagingItemReaderCommonTests-context.xml")
@@ -58,7 +58,7 @@ public class JpaPagingItemReaderAsyncTests {
 
 	@Before
 	public void init() {
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+		JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 		maxId = jdbcTemplate.queryForInt("SELECT MAX(ID) from T_FOOS");
 		for (int i = ITEM_COUNT; i > maxId; i--) {
 			jdbcTemplate.update("INSERT into T_FOOS (ID,NAME,VALUE) values (?, ?, ?)", i, "foo" + i, i);
@@ -68,7 +68,7 @@ public class JpaPagingItemReaderAsyncTests {
 
 	@After
 	public void destroy() {
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+		JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 		jdbcTemplate.update("DELETE from T_FOOS where ID>?", maxId);
 	}
 
diff --git a/spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/jms/jms-context.xml b/spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/jms/jms-context.xml
index 83845bd48..89a9dc646 100644
--- a/spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/jms/jms-context.xml
+++ b/spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/jms/jms-context.xml
@@ -38,14 +38,14 @@
 		<!-- We aren't adding a listener here (want to do it in unit test)
 		so need to set autoStartup=false -->
 		<property name="autoStartup" value="false" />
-		<!-- We need the transaction manager, but only because we can't 
-		intercept the MessageListenerContainer in the right place 
-		(it tries to open a JMS session before receiveAndExecute() 
+		<!-- We need the transaction manager, but only because we can't
+		intercept the MessageListenerContainer in the right place
+		(it tries to open a JMS session before receiveAndExecute()
 		so the JMS session commits after every item, not after every chunk) -->
 		<property name="transactionManager" ref="transactionManager" />
 		<property name="connectionFactory" ref="txAwareConnectionFactory" />
 		<property name="destinationName" value="queue" />
-		<!-- This is important... it forces the container to acknowledge message receipt, 
+		<!-- This is important... it forces the container to acknowledge message receipt,
 			and avoid duplicate messages in the sunny day case -->
 		<property name="sessionTransacted" value="true" />
 		<property name="adviceChain">
diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml
index efb256c41..53166e392 100644
--- a/spring-batch-infrastructure/pom.xml
+++ b/spring-batch-infrastructure/pom.xml
@@ -133,11 +133,6 @@
 			<artifactId>ibatis-sqlmap</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>javax.persistence</groupId>
-			<artifactId>persistence-api</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>javax.mail</groupId>
 			<artifactId>mail</artifactId>
diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml
index 54b9f5e52..8a9101ef5 100644
--- a/spring-batch-parent/pom.xml
+++ b/spring-batch-parent/pom.xml
@@ -562,12 +562,6 @@
 				<version>2.3.0</version>
 				<optional>true</optional>
 			</dependency>
-			<dependency>
-				<groupId>javax.persistence</groupId>
-				<artifactId>persistence-api</artifactId>
-				<version>1.0</version>
-				<optional>true</optional>
-			</dependency>
 			<dependency>
 				<groupId>org.osgi</groupId>
 				<artifactId>osgi_R4_core</artifactId>
diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index d98df5530..86dda5c34 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/pom.xml
@@ -170,11 +170,6 @@
 			<artifactId>hibernate-annotations</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>javax.persistence</groupId>
-			<artifactId>persistence-api</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jta_1.1_spec</artifactId>