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

[BATCH-97] Add profile to integration project to allow tests to be run.

Browse Source 
Update wrong version on some poms (like docs).
This commit is contained in:
dsyer
2008-04-01 08:07:14 +00:00
parent d471b84fda
commit 565c73a5e9
6 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/pom.xml vendored
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.batch</groupId>
<artifactId>spring-batch</artifactId>
<version>1.0.0.FINAL-SNAPSHOT</version>
<version>1.0.0.dev-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
docs/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.batch</groupId>
<artifactId>spring-batch</artifactId>
<version>1.0.1.dev-SNAPSHOT</version>
<version>1.0.0.dev-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

1
pom.xml
View File

@@ -348,6 +348,7 @@
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
<version>3.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>

6
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepTests.java
View File

@@ -73,8 +73,6 @@ public class ItemOrientedStepTests extends TestCase {
private ItemOrientedStep itemOrientedStep;
private RepeatTemplate template;
private JobInstance jobInstance;
private ResourcelessTransactionManager transactionManager;
@@ -98,6 +96,8 @@ public class ItemOrientedStepTests extends TestCase {
transactionManager = new ResourcelessTransactionManager();
RepeatTemplate template;
itemOrientedStep = (ItemOrientedStep) getStep(new String[] { "foo", "bar", "spam" });
template = new RepeatTemplate();
template.setCompletionPolicy(new SimpleCompletionPolicy(1));
@@ -125,7 +125,7 @@ public class ItemOrientedStepTests extends TestCase {
public void testChunkExecutor() throws Exception {
template = new RepeatTemplate();
RepeatTemplate template = new RepeatTemplate();
// Only process one item:
template.setCompletionPolicy(new SimpleCompletionPolicy(1));

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

@@ -75,7 +75,6 @@
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<!-- This is just for the JMS spec - could use javax.jms -->

40
spring-batch-integration/pom.xml
View File

@@ -1,4 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-batch-integration</artifactId>
<packaging>jar</packaging>
@@ -10,16 +11,41 @@
<artifactId>spring-batch</artifactId>
<relativePath>..</relativePath>
</parent>
<profiles>
<profile>
<id>notest</id>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
<build>
<plugins>
<!-- run tests during the integration-test phase, not
the normal test phase -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>test</id>
<build>
<plugins>
<!-- run tests during the integration-test phase, not
the normal test phase -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>false</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
@@ -179,4 +205,4 @@
</dependencies>
<!-- Reporting: it doesn't make much sense to have clover or Jdepend reports in this project but they are included by the parent anyway. -->
</project>
</project>