diff --git a/pom.xml b/pom.xml
index 0bff6044b..9f530a3bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,7 @@
spring-batch-infrastructure
spring-batch-core
spring-batch-test
+ spring-batch-integration
http://www.springsource.org/spring-batch
@@ -27,13 +28,13 @@
JIRA
- http://opensource.atlassian.com/projects/spring/browse/BATCH
+ https://jira.springsource.org/browse/BATCH
Spring Batch Forum
- http://forum.springframework.org/forumdisplay.php?f=41
- http://forum.springframework.org/forumdisplay.php?f=41
+ http://forum.spring.io/forum/spring-projects/batch
+ http://forum.spring.io/forum/spring-projects/batch
diff --git a/spring-batch-admin-parent/pom.xml b/spring-batch-admin-parent/pom.xml
deleted file mode 100755
index c29038d68..000000000
--- a/spring-batch-admin-parent/pom.xml
+++ /dev/null
@@ -1,757 +0,0 @@
-
-
- 4.0.0
- org.springframework.batch
- spring-batch-admin-parent
- 2.0.0.BUILD-SNAPSHOT
- Spring Batch Admin Parent
- A set of services (Java, JSON) and a UI (webapp) for managing and launching Spring Batch jobs.
- http://www.springsource.org/spring-batch-admin
- pom
-
- http://github.com/SpringSource/spring-batch-admin
- scm:git:git://github.com/SpringSource/spring-batch-admin.git
- scm:git:git://github.com/SpringSource/spring-batch-admin.git
- HEAD
-
-
-
- Apache 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
-
-
-
-
- dsyer
- Dave Syer
- dsyer@vmware.com
-
-
- mminella
- Michael Minella
- mminella@vmware.com
-
-
-
- false
- 2.2.4.BUILD-SNAPSHOT
- 4.0.0.RELEASE
- 4.0.0.M2
- 1.0.3.RELEASE
-
-
-
- strict
-
- false
-
-
-
- fast
-
- true
- true
-
-
-
- staging
-
-
- staging
- file:///${user.dir}/target/staging
-
-
- staging
- file:///${user.dir}/target/staging
-
-
- staging
- file:///${user.dir}/target/staging
-
-
-
-
- central
-
-
- sonatype-nexus-snapshots
- Sonatype Nexus Snapshots
- https://oss.sonatype.org/content/repositories/snapshots/
-
-
- sonatype-nexus-staging
- Nexus Release Repository
- https://oss.sonatype.org/service/local/staging/deploy/maven2/
-
-
-
-
-
- maven-gpg-plugin
-
-
- sign-artifacts
- verify
-
- sign
-
-
-
-
-
-
-
-
- dist
-
-
-
- maven-javadoc-plugin
-
-
- javadoc
- package
-
- jar
-
-
-
-
-
- maven-source-plugin
-
-
- attach-sources
-
- jar
-
-
-
-
-
-
-
-
-
-
-
-
-
- org.eclipse.m2e
- lifecycle-mapping
- 1.0.0
-
-
-
-
-
- com.springsource.bundlor
- com.springsource.bundlor.maven
- [1.0,)
-
- bundlor
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-antrun-plugin
- [1.0,)
-
- run
-
-
-
-
-
-
-
-
-
-
-
- maven-site-plugin
- 2.0
-
-
- org.apache.maven.doxia
- doxia-module-confluence
- 1.0
-
-
-
-
- com.springsource.bundlor
- com.springsource.bundlor.maven
- true
-
-
- bundlor-transform
-
- bundlor
-
-
-
-
-
- org.apache.maven.plugins
- maven-antrun-plugin
-
-
- org.apache.ant
- ant
- 1.7.0
-
-
- org.apache.ant
- ant-trax
- 1.7.0
-
-
- org.apache.ant
- ant-apache-regexp
- 1.7.0
-
-
- foundrylogic.vpp
- vpp
- 2.2.1
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
-
-
- target/classes/META-INF/MANIFEST.MF
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
- 1.6
- 1.6
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
- **/*Tests.java
-
-
- **/Abstract*.java
-
- junit:junit
-
-
-
-
-
-
-
- maven-jxr-plugin
-
- true
-
-
-
- maven-surefire-report-plugin
-
- true
-
-
-
- maven-project-info-reports-plugin
- 2.1
-
-
- maven-javadoc-plugin
-
- true
-
-
-
-
- javadoc
-
-
-
-
-
-
-
-
-
- org.aspectj
- aspectjrt
- 1.6.6
-
-
- org.aspectj
- aspectjweaver
- 1.6.6
- runtime
-
-
- junit
- junit
- 4.8.2
- test
-
-
- org.easymock
- easymock
- 2.3
- test
-
-
- org.apache.geronimo.specs
- geronimo-jms_1.1_spec
- 1.1
-
-
- org.apache.geronimo.specs
- geronimo-jta_1.1_spec
- 1.1
-
-
- javax.annotation
- jsr250-api
- 1.0
- test
-
-
- net.sf.ehcache
- ehcache-core
- 2.3.0
-
-
- stax
- stax
- 1.2.0
-
-
- org.codehaus.jackson
- jackson-mapper-asl
- 1.9.2
- test
-
-
- org.hibernate
- hibernate-core
- 3.3.1.GA
-
-
- cglib
- cglib
-
-
- asm
- asm
-
-
- asm
- asm-attrs
-
-
- javax.transaction
- jta
-
-
-
-
- org.hibernate
- hibernate-entitymanager
- 3.3.2.GA
-
-
- edu.oswego.cs.concurrent
- edu.oswego.cs.dl.util.concurrent
-
-
-
-
- org.hibernate
- hibernate-annotations
- 3.3.1.GA
-
-
- cglib
- cglib-nodep
- 2.1_3
-
-
- org.slf4j
- jcl-over-slf4j
- 1.5.8
-
-
- org.slf4j
- slf4j-api
- 1.5.8
- runtime
-
-
- org.slf4j
- slf4j-log4j12
- 1.5.8
- runtime
-
-
- commons-lang
- commons-lang
- 2.1
-
-
- commons-io
- commons-io
- 1.4
-
-
- commons-collections
- commons-collections
- 3.2
-
-
- commons-dbcp
- commons-dbcp
- runtime
- 1.2.2
-
-
- commons-fileupload
- commons-fileupload
- runtime
- 1.2.1
-
-
- log4j
- log4j
- 1.2.14
- runtime
-
-
- com.h2database
- h2
- 1.2.125
- test
-
-
- hsqldb
- hsqldb
- 1.8.0.7
- runtime
-
-
- mysql
- mysql-connector-java
- 5.1.6
- runtime
-
-
- org.apache.derby
- derby
- 10.6.1.0
- test
-
-
- org.apache.derby
- com.springsource.org.apache.derby
- 10.5.1000001.764942
- test
-
-
- com.thoughtworks.xstream
- xstream
- 1.3
- runtime
-
-
- org.codehaus.jettison
- jettison
- 1.1
- runtime
-
-
- org.apache.ibatis
- ibatis-sqlmap
- 2.3.0
-
-
- javax.persistence
- persistence-api
- 1.0
-
-
- org.osgi
- osgi_R4_core
- 1.0
-
-
- asm
- asm
- 2.2.3
- runtime
-
-
- asm
- asm-attrs
- 2.2.3
- runtime
-
-
- asm
- asm-commons
- 2.2.3
- runtime
-
-
- javax.servlet
- servlet-api
- 2.5
- provided
-
-
- org.freemarker
- freemarker
- 2.3.15
-
-
- javax.servlet
- jstl
- 1.1.2
-
-
- org.springframework.security
- spring-security-taglibs
- 2.0.4
-
-
- org.springframework
- spring-support
-
-
-
-
- org.springframework.batch
- spring-batch-infrastructure
- ${spring.batch.version}
-
-
- org.springframework.batch
- spring-batch-core
- ${spring.batch.version}
-
-
- org.springframework.batch
- spring-batch-test
- ${spring.batch.version}
-
-
- org.springframework
- spring-aop
- ${spring.framework.version}
-
-
- org.springframework
- spring-beans
- ${spring.framework.version}
-
-
- org.springframework
- spring-messaging
- ${spring.framework.version}
-
-
- org.springframework
- spring-context
- ${spring.framework.version}
-
-
- commons-logging
- commons-logging
-
-
-
-
- org.springframework
- spring-context-support
- ${spring.framework.version}
-
-
- quartz
- quartz
-
-
- javax.transaction
- jta
-
-
-
-
- org.springframework
- spring-core
- ${spring.framework.version}
-
-
- commons-logging
- commons-logging
-
-
-
-
- org.springframework
- spring-expression
- ${spring.framework.version}
-
-
- org.springframework
- spring-jdbc
- ${spring.framework.version}
-
-
- org.springframework
- spring-jms
- ${spring.framework.version}
-
-
- org.springframework
- spring-orm
- ${spring.framework.version}
-
-
- org.springframework
- spring-test
- ${spring.framework.version}
- test
-
-
- org.springframework
- spring-tx
- ${spring.framework.version}
-
-
- org.springframework
- spring-oxm
- ${spring.framework.version}
-
-
- org.springframework
- spring-web
- ${spring.framework.version}
-
-
- org.springframework
- spring-webmvc
- ${spring.framework.version}
-
-
- org.springframework.integration
- spring-integration-core
- ${spring.integration.version}
- compile
-
-
- org.springframework.integration
- spring-integration-jmx
- ${spring.integration.version}
- runtime
-
-
- org.springframework.integration
- spring-integration-http
- ${spring.integration.version}
- compile
-
-
- org.springframework.integration
- spring-integration-file
- ${spring.integration.version}
- compile
-
-
- org.springframework.integration
- spring-integration-jms
- ${spring.integration.version}
- compile
-
-
- org.mockito
- mockito-all
- 1.9.5
- test
-
-
-
-
-
-
- spring-ebr
- Spring Maven Release Repository
- http://repository.springsource.com/maven/bundles/release
-
- false
-
-
-
-
-
- static.springframework.org
- scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-batch-admin/trunk
-
-
- spring-release
- Spring Release Repository
- s3://maven.springframework.org/release
-
-
- spring-snapshot
- Spring Snapshot Repository
- s3://maven.springframework.org/snapshot
-
-
-
-
- spring-milestones
- Spring Maven Milestone Repository
- http://maven.springframework.org/milestone/
-
- false
-
-
-
- spring-snapshots
- Spring Maven Snapshot Repository
- http://maven.springframework.org/snapshot/
-
-
- spring-ebr
- Spring Enterprise Bundle Repository
- http://repository.springsource.com/maven/bundles/release/
-
- false
-
-
-
- objectstyle
- ObjectStyle.org Repository
- http://objectstyle.org/maven2
-
- false
-
-
-
-
diff --git a/spring-batch-integration/pom.xml b/spring-batch-integration/pom.xml
index 4f2f2fa27..6dfa12aaa 100644
--- a/spring-batch-integration/pom.xml
+++ b/spring-batch-integration/pom.xml
@@ -2,29 +2,34 @@
4.0.0
spring-batch-integration
- Spring Batch Integration
+ Batch Integration
http://static.springframework.org/spring-batch/${project.artifactId}
org.springframework.batch
- spring-batch-admin-parent
- 2.0.0.BUILD-SNAPSHOT
- ../spring-batch-admin-parent
+ spring-batch-parent
+ 3.0.0.BUILD-SNAPSHOT
+ ../spring-batch-parent
+
+ 4.0.0.RELEASE
+ 4.0.0.M2
+
org.springframework.batch
spring-batch-core
compile
+ ${project.version}
-
- org.springframework.batch
- spring-batch-test
- test
-
+
+ org.springframework.batch
+ spring-batch-test
+ ${project.version}
+ test
+
org.springframework.retry
spring-retry
- ${spring.retry.version}
org.apache.geronimo.specs
@@ -41,17 +46,10 @@
junit
junit
-
- org.slf4j
- jcl-over-slf4j
-
-
- org.slf4j
- slf4j-api
-
org.slf4j
slf4j-log4j12
+ true
log4j
@@ -68,11 +66,6 @@
aspectjweaver
test
-
- commons-lang
- commons-lang
- test
-
cglib
cglib-nodep
@@ -88,9 +81,10 @@
h2
test
-
+
mysql
mysql-connector-java
+ 5.1.6
test
@@ -99,13 +93,14 @@
test
- hsqldb
+ org.hsqldb
hsqldb
test
org.springframework.integration
spring-integration-core
+ ${spring.integration.version}
compile
@@ -129,6 +124,7 @@
org.springframework.integration
spring-integration-jms
+ ${spring.integration.version}
true
@@ -138,6 +134,7 @@
org.springframework
spring-messaging
+ ${spring.framework.version}
org.springframework
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkRequestTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkRequestTests.java
index d7637cad8..898fd0cc5 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkRequestTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkRequestTests.java
@@ -20,13 +20,13 @@ import static org.junit.Assert.assertNotNull;
import java.util.Arrays;
-import org.apache.commons.lang.SerializationUtils;
import org.junit.Test;
import org.springframework.batch.test.MetaDataInstanceFactory;
+import org.springframework.util.SerializationUtils;
/**
* @author Dave Syer
- *
+ *
*/
public class ChunkRequestTests {
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkResponseTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkResponseTests.java
index 492466b6f..d7bdcd2dc 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkResponseTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkResponseTests.java
@@ -18,13 +18,13 @@ package org.springframework.batch.integration.chunk;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import org.apache.commons.lang.SerializationUtils;
import org.junit.Test;
import org.springframework.batch.test.MetaDataInstanceFactory;
+import org.springframework.util.SerializationUtils;
/**
* @author Dave Syer
- *
+ *
*/
public class ChunkResponseTests {
diff --git a/spring-batch-integration/src/test/resources/config-hsql.properties b/spring-batch-integration/src/test/resources/config-hsql.properties
index 15b89ddd7..ae9223598 100644
--- a/spring-batch-integration/src/test/resources/config-hsql.properties
+++ b/spring-batch-integration/src/test/resources/config-hsql.properties
@@ -1,7 +1,7 @@
# Default database platform is HSQLDB:
batch.jdbc.driver=org.hsqldb.jdbcDriver
-batch.jdbc.url=jdbc:hsqldb:mem:testdb;sql.enforce_strict_size=true
-# Override and use this one in for a separate server process so you can inspect
+batch.jdbc.url=jdbc:hsqldb:mem:testdb;sql.enforce_strict_size=true;hsqldb.tx=mvcc
+# Override and use this one in for a separate server process so you can inspect
# the results (or add it to system properties with -D to override at run time).
# batch.jdbc.url=jdbc:hsqldb:hsql://localhost:9005/samples
batch.jdbc.user=sa