diff --git a/dictionary.txt b/dictionary.txt
index a702477d9..0cfb115fb 100644
--- a/dictionary.txt
+++ b/dictionary.txt
@@ -83,3 +83,4 @@ fallback
idempotent
reconstitute
async
+submitter
diff --git a/docs/src/site/docbook/reference/readersAndWriters.xml b/docs/src/site/docbook/reference/readersAndWriters.xml
index aebae3723..5050f7b62 100644
--- a/docs/src/site/docbook/reference/readersAndWriters.xml
+++ b/docs/src/site/docbook/reference/readersAndWriters.xml
@@ -1687,7 +1687,7 @@
IbatisPagingItemReader
- If you use IBATIS for your data access ten you can use the
+ If you use IBATIS for your data access then you can use the
IbatisPagingItemReader which, as the name
indicates, is an implementation of a paging
ItemReader. IBATIS doesn't have direct support
@@ -2699,4 +2699,4 @@
-
\ No newline at end of file
+
diff --git a/pom.xml b/pom.xml
index 0d38ab6aa..b457a2443 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
-
+
4.0.0
org.springframework.batch
org.springframework.batch
@@ -18,7 +19,7 @@
spring-batch-samples
docs
-
+
http://www.springframework.org/spring-batch
SpringSource
@@ -197,12 +198,12 @@
Aggregating XSL reports
-
+
-
+
-
+
-
-
-
+
+
+
@@ -270,18 +272,19 @@
Creating JUnit reports
-
+
-
+
-
+
Creating Emma reports
-
-
-
-
+
+
+
+
@@ -505,21 +508,31 @@
org.apache.commons
com.springsource.org.apache.commons.lang
2.1.0
+ true
org.apache.commons
com.springsource.org.apache.commons.io
1.4.0
+ true
org.apache.commons
com.springsource.org.apache.commons.collections
3.2.0
+ true
org.apache.commons
com.springsource.org.apache.commons.dbcp
1.2.2.osgi
+ true
+
+
+ org.apache.log4j
+ com.springsource.org.apache.log4j
+ 1.2.15
+ true
org.hsqldb
@@ -566,24 +579,28 @@
com.springsource.org.objectweb.asm
2.2.3
runtime
+ true
org.objectweb.asm
com.springsource.org.objectweb.asm.attrs
2.2.3
runtime
+ true
org.objectweb.asm
com.springsource.org.objectweb.asm.commons
2.2.3
runtime
+ true
javax.servlet
com.springsource.javax.servlet
2.5.0
provided
+ true
@@ -657,13 +674,14 @@
org.springframework.ws
org.springframework.oxm
- 1.5.4.A
+ 1.5.5.A
true
org.springframework.osgi
org.springframework.osgi.core
1.1.2.A
+ true
@@ -805,4 +823,4 @@
-
+
\ No newline at end of file