Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removing redundant dependency on JPA 1.0 jar to fix integration test

Browse Source
This commit is contained in:
Michael Minella
2013-01-09 11:00:14 -06:00
parent 057cb32219
commit c097055288
6 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-batch-infrastructure-tests/pom.xml
View File

@@ -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>

6
spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderAsyncTests.java
View File

@@ -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);
}

8
spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/jms/jms-context.xml
View File

@@ -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">

5
spring-batch-infrastructure/pom.xml
View File

@@ -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>

6
spring-batch-parent/pom.xml
View File

@@ -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>

5
spring-batch-samples/pom.xml
View File

@@ -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>