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-core/src/test/java/org/springframework/batch/core/scope/StepScopeTests.java
View File

@@ -56,7 +56,7 @@ public class StepScopeTests {
@After
public void tearDown() throws Exception {
StepSynchronizationManager.close();
StepSynchronizationManager.release();
}
@Test

12
spring-batch-core/src/test/resources/log4j.properties
View File

@@ -5,13 +5,13 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2}:%L - %m%n
log4j.category.org.apache.activemq=ERROR
log4j.category.org.springframework.retry=DEBUG
log4j.category.org.springframework.batch=DEBUG
log4j.category.org.springframework.batch.support=INFO
log4j.category.org.springframework.batch.support.transaction.ResourcelessTransactionManager=DEBUG
log4j.category.org.springframework.core.repository=DEBUG
#log4j.category.org.springframework.retry=DEBUG
#log4j.category.org.springframework.batch=DEBUG
#log4j.category.org.springframework.batch.support=INFO
#log4j.category.org.springframework.batch.support.transaction.ResourcelessTransactionManager=DEBUG
#log4j.category.org.springframework.core.repository=DEBUG
# log4j.category.org.springframework.transaction=INFO
log4j.category.org.springframework.beans=DEBUG
#log4j.category.org.springframework.beans=DEBUG
# log4j.category.org.hibernate.SQL=DEBUG
# for debugging datasource initialization

22
spring-batch-core/template.mf
View File

@@ -13,16 +13,20 @@ Import-Template:
org.aopalliance.*;version="[1.0.0, 2.0.0)",
org.aspectj.*;version="[1.5.2,1.7.0)";resolution:=optional,
org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
org.springframework.batch.*;version="[2.0.0, 3.0.0)";resolution:=optional,
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.transaction.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.util.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.batch.*;version="[2.2.0, 3.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.transaction.*;version="[3.1.2, 4.0.0)";resolution:=optional,
org.springframework.util.*;version="[3.1.2, 4.0.0)";resolution:=optional,
org.springframework.stereotype.*;version="[3.1.2, 4.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,
org.springframework.osgi.*;version="[1.1.0, 2.0.0)";resolution:=optional,
org.osgi.framework;version="0";resolution:=optional,
org.w3c.dom;version="0";resolution:=optional,
javax.annotation.*;version="0";resolution:=optional,
javax.sql.*;version="0";resolution:=optional