diff --git a/src/site/apt/downloads.apt b/src/site/apt/downloads.apt
index ae30fa5d6..b7925a86a 100644
--- a/src/site/apt/downloads.apt
+++ b/src/site/apt/downloads.apt
@@ -7,7 +7,7 @@
Spring Batch Downloads
- The current GA release is <<2.0.4.RELEASE>>, the latest stable development version is <<2.1.0.RC1>> the latest snapshots are <<2.1.0.CI-SNAPSHOT>>. The version 2.0.x branch is still open for bugfixes. The version 1.1.x branch is now in maintenance (the last release was <<1.1.4.RELEASE>>).
+ The current GA release is <<2.1,1.RELEASE>>, the latest snapshots are <<2.1.2.CI-SNAPSHOT>>. The version 2.0.x and 1.1.x branches are now in maintenance (the last release was <<2.0.4.RELEASE>>).
* Zip Downloads
@@ -37,7 +37,7 @@ Spring Batch Downloads
org.springframework.batch
spring-batch-core
- 2.1.0.RC1
+ 2.1.1.RELEASE
+---------------
@@ -70,7 +70,7 @@ Spring Batch Downloads
org.springframework.batch
org.springframework.batch.core
- 2.1.0.RC1
+ 2.1.1.RELEASE
+---------------
@@ -96,7 +96,7 @@ Spring Batch Downloads
org.springframework.batch
spring-batch-core
- 2.1.0.RC1
+ 2.1.1.RELEASE
+---------------
@@ -120,7 +120,7 @@ Spring Batch Downloads
org.springframework.batch
org.springframework.batch.core
- 2.1.0.RC1
+ 2.1.1.RELEASE
+---------------
diff --git a/src/site/apt/getting-started.apt b/src/site/apt/getting-started.apt
index 8aa2cd2d4..0e74c216e 100644
--- a/src/site/apt/getting-started.apt
+++ b/src/site/apt/getting-started.apt
@@ -13,7 +13,7 @@ Spring Batch Getting Started
This is the quickest way to get started. It requires an internet connection for download, and access to a Maven repository (remote or local).
- * Download STS version 2.1.0.* from the {{{http://www.springsource.com/products/sts}SpringSource website}}. STS is a free Eclipse bundle with many features useful for Spring developers.
+ * Download STS version 2.3.2.* from the {{{http://www.springsource.com/products/sts}SpringSource website}}. STS is a free Eclipse bundle with many features useful for Spring developers.
* Go to <<Other...>>> and select <<Template Project>>> from the wizard chooser.
diff --git a/src/site/apt/migration/2.1.0-2.1.1.apt b/src/site/apt/migration/2.1.0-2.1.1.apt
new file mode 100644
index 000000000..25557db1a
--- /dev/null
+++ b/src/site/apt/migration/2.1.0-2.1.1.apt
@@ -0,0 +1,55 @@
+Spring Batch 2.1.1 Release Notes
+
+* Sub-task
+
+ * {{{http://jira.springsource.org/browse/BATCH-1520}[BATCH-1520]}} - Allow null ItemWriter as long as ItemProcessor is provided
+
+* Bug
+
+ * {{{http://jira.springsource.org/browse/BATCH-1503}[BATCH-1503]}} - JobExecution marked COMPLETE on failure to save step execution metadata
+ * {{{http://jira.springsource.org/browse/BATCH-1507}[BATCH-1507]}} - FlowJob.getStep() only looks at state names, not step names
+ * {{{http://jira.springsource.org/browse/BATCH-1510}[BATCH-1510]}} - List of stepnames incomplete for nested flow job
+ * {{{http://jira.springsource.org/browse/BATCH-1513}[BATCH-1513]}} - HibernateItemReaderHelper requires queryProvider field to be an instance of AbstractHibernateQueryProvider
+ * {{{http://jira.springsource.org/browse/BATCH-1522}[BATCH-1522]}} - Intermittent failure of FaultTolerantStepFactoryBean in multi-threaded test
+ * {{{http://jira.springsource.org/browse/BATCH-1525}[BATCH-1525]}} - ExitStatus description can be null when re-hyrated from Oracle
+ * {{{http://jira.springsource.org/browse/BATCH-1526}[BATCH-1526]}} - Memory leak in web deployments because ThreadLocal is not nulled out in ChunkMonitor
+ * {{{http://jira.springsource.org/browse/BATCH-1528}[BATCH-1528]}} - Namespace context partition element requires bean with name "transactionManager"
+ * {{{http://jira.springsource.org/browse/BATCH-1533}[BATCH-1533]}} - API change and is not reflected in API and documentation examples
+ * {{{http://jira.springsource.org/browse/BATCH-1540}[BATCH-1540]}} - Typo in the user guide: "directlory"
+ * {{{http://jira.springsource.org/browse/BATCH-1542}[BATCH-1542]}} - Thread safety in JobExecution and StepExecution collections
+ * {{{http://jira.springsource.org/browse/BATCH-1545}[BATCH-1545]}} - FlatFileItemWriter logs as JdbcBatchItemWriter
+ * {{{http://jira.springsource.org/browse/BATCH-1546}[BATCH-1546]}} - Some issues with pagination in Oracle
+ * {{{http://jira.springsource.org/browse/BATCH-1547}[BATCH-1547]}} - ExecutionContextPromotionListener strict flag misinterpreted in listener code
+ * {{{http://jira.springsource.org/browse/BATCH-1551}[BATCH-1551]}} - Db2PagingQueryProvider needs an alias in the jump to subquery
+ * {{{http://jira.springsource.org/browse/BATCH-1552}[BATCH-1552]}} - Typo on Use Case page of website
+
+* Defect
+
+ * {{{http://jira.springsource.org/browse/BATCH-1550}[BATCH-1550]}} - Section 5.2.1 references TaskletAdapter class, but it should be MethodInvokingTaskletAdapter
+
+* Improvement
+
+ * {{{http://jira.springsource.org/browse/BATCH-1530}[BATCH-1530]}} - Let job-repository assign id to itself by default.
+ * {{{http://jira.springsource.org/browse/BATCH-1531}[BATCH-1531]}} - Restart of a partitioned Step should not call Partitioner
+ * {{{http://jira.springsource.org/browse/BATCH-1535}[BATCH-1535]}} - Extend SQL scripts to provide exit code limit of 100 chars
+ * {{{http://jira.springsource.org/browse/BATCH-1536}[BATCH-1536]}} - Negative skip count in SkipPolicy
+ * {{{http://jira.springsource.org/browse/BATCH-1537}[BATCH-1537]}} - Modify JdbcPagingItemReader to use startAfterValue on restart
+ * {{{http://jira.springsource.org/browse/BATCH-1541}[BATCH-1541]}} - Make MapJobRepository work for multi-threaded steps and jobs
+ * {{{http://jira.springsource.org/browse/BATCH-1553}[BATCH-1553]}} - Restart of partitioned job should prevent starting multiple step execution instances for a partition
+
+* New Feature
+
+ * {{{http://jira.springsource.org/browse/BATCH-1307}[BATCH-1307]}} - MapJobRepository with multi-threaded parallel steps (split in job)
+ * {{{http://jira.springsource.org/browse/BATCH-1508}[BATCH-1508]}} - Make ApplicationContext ids unique and identifiable in ClasspathXmlApplicationContextsFactoryBean
+ * {{{http://jira.springsource.org/browse/BATCH-1527}[BATCH-1527]}} - Add "-stopAll" to CommandLineJobRunner
+ * {{{http://jira.springsource.org/browse/BATCH-1529}[BATCH-1529]}} - Explicit protection against exceptions in SkipPolicy to prevent infinite loop in RetryTemplate
+ * {{{http://jira.springsource.org/browse/BATCH-1559}[BATCH-1559]}} - Ability to promote FlowStep execution context to its constituent steps
+
+* Refactoring
+
+ * {{{http://jira.springsource.org/browse/BATCH-1534}[BATCH-1534]}} - JobLauncherTestUtils.setJob should take the interfacetype Job as argument rather than AbstractJob
+
+* Task
+
+ * {{{http://jira.springsource.org/browse/BATCH-1548}[BATCH-1548]}} - XMLStream Documentation Error
+
diff --git a/src/site/apt/migration/index.apt b/src/site/apt/migration/index.apt
index edb89408f..e59950e5d 100644
--- a/src/site/apt/migration/index.apt
+++ b/src/site/apt/migration/index.apt
@@ -13,6 +13,8 @@
Links:
+ * {{{2.1.0-2.1.1.html}2.1.0 to 2.1.1}}
+
* {{{2.1.0.RC1-2.1.0.html}2.1.0.RC1 to 2.1.0}}
* {{{2.1.0.M4-2.1.0.RC1.html}2.1.0.M4 to 2.1.0.RC1}}
diff --git a/src/site/apt/snapshots.apt b/src/site/apt/snapshots.apt
index 445e26918..33311cbc5 100644
--- a/src/site/apt/snapshots.apt
+++ b/src/site/apt/snapshots.apt
@@ -27,7 +27,7 @@ Snapshot Builds
org.springframework.batch
spring-batch-core
- 2.1.0.CI-SNAPSHOT
+ 2.1.2.CI-SNAPSHOT
+---------------
diff --git a/src/site/docbook/reference/index.xml b/src/site/docbook/reference/index.xml
index d90ab1aea..5e224230a 100644
--- a/src/site/docbook/reference/index.xml
+++ b/src/site/docbook/reference/index.xml
@@ -5,7 +5,7 @@
Spring Batch - Reference Documentation
- Spring Batch 2.1.0
+ Spring Batch 2.1.1