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

BATCH-1950: Patch up build

Browse Source 
* Ensure bundlor is available and remove from sample
* Tidy dependencies in some poms
* Update some template.mf dependencies
* Add .travis.yml for automated builds independent of bamboo
This commit is contained in:
Dave Syer
2013-01-15 08:26:11 +00:00
parent 60af65c7ae
commit bc9ee74a25
15 changed files with 96 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,7 +139,7 @@
<version>1.4</version>
<optional>true</optional>
</dependency>
<dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
<optional>true</optional>

2
spring-batch-infrastructure/src/test/resources/log4j.properties
View File

@@ -4,7 +4,7 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d %p %t [%c] - <%m>%n
log4j.category.org.springframework.batch=DEBUG
#log4j.category.org.springframework.batch=DEBUG
log4j.category.org.springframework.transaction=INFO
log4j.category.org.springframework.batch.support.transaction.ResourcelessTransactionManager=INFO
log4j.category.org.springframework.jdbc.datasource=INFO

31
spring-batch-infrastructure/template.mf
View File

@@ -15,21 +15,24 @@ Import-Template:
org.apache.commons.logging.*;version="[1.1.0,2.0.0)",
com.ibatis.sqlmap.*;version="[2.3.0,3.0.0)";resolution:=optional,
org.springframework.batch.*;version="[2.0.0,3.0.0)",
org.springframework.aop.*;version="[2.5.5,4.0.0)",
org.springframework.beans.*;version="[2.5.5,4.0.0)",
org.springframework.context.*;version="[2.5.5,4.0.0)",
org.springframework.core.*;version="[2.5.5,4.0.0)",
org.springframework.dao.*;version="[2.5.5,4.0.0)";resolution:=optional,
org.springframework.jdbc.*;version="[2.5.5,4.0.0)";resolution:=optional,
org.springframework.jms.*;version="[2.5.5,4.0.0)";resolution:=optional,
org.springframework.mail.*;version="[2.5.5,4.0.0)";resolution:=optional,
org.springframework.orm.*;version="[2.5.5,4.0.0)";resolution:=optional,
org.springframework.oxm.*;version="[1.5.5,2.0.0)";resolution:=optional,
org.springframework.xml.*;version="[1.5.5,2.0.0)";resolution:=optional,
org.springframework.validation.*;version="[2.5.5,4.0.0)";resolution:=optional,
org.springframework.transaction.*;version="[2.5.5,4.0.0)";resolution:=optional,
org.springframework.util.*;version="[2.5.5,4.0.0)";resolution:=optional,
org.springframework.aop.*;version="[3.1.2,4.0.0)",
org.springframework.beans.*;version="[3.1.2,4.0.0)",
org.springframework.context.*;version="[3.1.2,4.0.0)",
org.springframework.core.*;version="[3.1.2,4.0.0)",
org.springframework.dao.*;version="[3.1.2,4.0.0)";resolution:=optional,
org.springframework.jdbc.*;version="[3.1.2,4.0.0)";resolution:=optional,
org.springframework.jms.*;version="[3.1.2,4.0.0)";resolution:=optional,
org.springframework.mail.*;version="[3.1.2,4.0.0)";resolution:=optional,
org.springframework.orm.*;version="[3.1.2,4.0.0)";resolution:=optional,
org.springframework.oxm.*;version="[3.1.2,4.0.0)";resolution:=optional,
org.springframework.xml.*;version="[3.1.2,4.0.0)";resolution:=optional,
org.springframework.validation.*;version="[3.1.2,4.0.0)";resolution:=optional,
org.springframework.transaction.*;version="[3.1.2,4.0.0)";resolution:=optional,
org.springframework.util.*;version="[3.1.2,4.0.0)";resolution:=optional,
org.springframework.osgi.*;version="[1.1.0,2.0.0)";resolution:=optional,
org.springframework.amqp.*;version="[1.1.0,2.0.0)";resolution:=optional,
org.springframework.retry.*;version="[1.0.0,2.0.0)";resolution:=optional,
org.springframework.classify.*;version="[1.0.0,2.0.0)";resolution:=optional,
javax.sql.*;version="0";resolution:=optional,
javax.jms;version="0";resolution:=optional,
javax.persistence;version="0";resolution:=optional,