From 5d1ddecba2126528f945b9e6d831941db59e17c3 Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Thu, 9 Apr 2009 12:07:16 +0000
Subject: [PATCH] Update version numbers in docos

---
 pom.xml                              | 76 ++++++++++++----------------
 src/site/apt/downloads.apt           | 10 ++--
 src/site/docbook/reference/index.xml |  2 +-
 3 files changed, 39 insertions(+), 49 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3ce105cd8..eb8dff91d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.batch</groupId>
 	<artifactId>org.springframework.batch</artifactId>
@@ -15,7 +15,7 @@
 		<module>spring-batch-infrastructure</module>
 		<module>spring-batch-core</module>
 		<module>spring-batch-test</module>
-	</modules>
+  </modules>
 	<url>http://static.springframework.org/spring-batch</url>
 	<organization>
 		<name>SpringSource</name>
@@ -108,22 +108,22 @@
 									<postProcess>
 										<move todir="${basedir}/target/site/reference/html-single">
 											<fileset dir="${basedir}/target/docbkx/html">
-												<include name="index.html" />
+												<include name="index.html"/>
 											</fileset>
 										</move>
 										<copy todir="${basedir}/target/site/reference/html-single">
 											<fileset dir="${basedir}/src/docbkx/resources">
-												<include name="**/*.css" />
-												<include name="**/*.png" />
-												<include name="**/*.gif" />
-												<include name="**/*.jpg" />
+												<include name="**/*.css"/>
+												<include name="**/*.png"/>
+												<include name="**/*.gif"/>
+												<include name="**/*.jpg"/>
 											</fileset>
 										</copy>
 										<copy todir="${basedir}/target/site/reference/html-single">
 											<fileset dir="${basedir}/src/site/docbook/reference">
-												<include name="**/*.png" />
-												<include name="**/*.gif" />
-												<include name="**/*.jpg" />
+												<include name="**/*.png"/>
+												<include name="**/*.gif"/>
+												<include name="**/*.jpg"/>
 											</fileset>
 										</copy>
 									</postProcess>
@@ -139,9 +139,7 @@
 									<imgSrcPath>src/site/docbook/reference/</imgSrcPath>
 									<admonGraphicsPath>src/docbkx/resources/images/</admonGraphicsPath>
 									<postProcess>
-										<copy file="${basedir}/target/docbkx/pdf/index.pdf"
-											tofile="${basedir}/target/site/reference/pdf/spring-batch-docs.pdf"
-											failonerror="false" />
+										<copy file="${basedir}/target/docbkx/pdf/index.pdf" tofile="${basedir}/target/site/reference/pdf/spring-batch-docs.pdf" failonerror="false"/>
 									</postProcess>
 								</configuration>
 								<phase>pre-site</phase>
@@ -158,22 +156,22 @@
 									<postProcess>
 										<move todir="${basedir}/target/site/reference">
 											<fileset dir="${basedir}/target/docbkx">
-												<include name="**/*.html" />
+												<include name="**/*.html"/>
 											</fileset>
 										</move>
 										<copy todir="${basedir}/target/site/reference/html">
 											<fileset dir="${basedir}/src/docbkx/resources">
-												<include name="**/*.css" />
-												<include name="**/*.png" />
-												<include name="**/*.gif" />
-												<include name="**/*.jpg" />
+												<include name="**/*.css"/>
+												<include name="**/*.png"/>
+												<include name="**/*.gif"/>
+												<include name="**/*.jpg"/>
 											</fileset>
 										</copy>
 										<copy todir="${basedir}/target/site/reference/html">
 											<fileset dir="${basedir}/src/site/docbook/reference">
-												<include name="**/*.png" />
-												<include name="**/*.gif" />
-												<include name="**/*.jpg" />
+												<include name="**/*.png"/>
+												<include name="**/*.gif"/>
+												<include name="**/*.jpg"/>
 											</fileset>
 										</copy>
 									</postProcess>
@@ -201,7 +199,7 @@
 						<configuration>
 							<includes>index.xml</includes>
 							<chunkedOutput>false</chunkedOutput>
-							<draftWatermarkImage />
+							<draftWatermarkImage/>
 							<htmlStylesheet>css/html.css</htmlStylesheet>
 							<sourceDirectory>${basedir}/src/site/docbook/reference</sourceDirectory>
 							<foCustomization>${basedir}/src/docbkx/resources/xsl/fopdf.xsl
@@ -224,7 +222,7 @@
 								<phase>generate-sources</phase>
 								<configuration>
 									<tasks>
-										<copy file="pom.xml" todir="target" />
+										<copy file="pom.xml" todir="target"/>
 									</tasks>
 								</configuration>
 								<goals>
@@ -257,47 +255,39 @@
 									<tasks>
 										<unzip dest="target/it/with-dep">
 											<fileset dir="target">
-												<include name="*with-dep*.zip" />
+												<include name="*with-dep*.zip"/>
 											</fileset>
-											<regexpmapper from="^[^/]*/(.*)$$" to="\1"
-												handledirsep="true" />
+											<regexpmapper from="^[^/]*/(.*)$$" to="\1" handledirsep="true"/>
 										</unzip>
 										<unzip dest="target/it/no-dep">
 											<fileset dir="target">
-												<include name="*no-dep*.zip" />
+												<include name="*no-dep*.zip"/>
 											</fileset>
-											<regexpmapper from="^[^/]*/(.*)$$" to="\1"
-												handledirsep="true" />
+											<regexpmapper from="^[^/]*/(.*)$$" to="\1" handledirsep="true"/>
 										</unzip>
-										<fail
-											message="Failed integration test of zip distro: Spring Batch jar files are missing.">
+										<fail message="Failed integration test of zip distro: Spring Batch jar files are missing.">
 											<condition>
 												<not>
 													<resourcecount count="9">
-														<fileset id="fs" dir="target/it/with-dep/dist"
-															includes="*.jar" />
+														<fileset id="fs" dir="target/it/with-dep/dist" includes="*.jar"/>
 													</resourcecount>
 												</not>
 											</condition>
 										</fail>
-										<fail
-											message="Failed integration test of zip distro: dependency jar files are missing.">
+										<fail message="Failed integration test of zip distro: dependency jar files are missing.">
 											<condition>
 												<not>
 													<resourcecount count="1">
-														<fileset id="fs" dir="target/it/with-dep/sources/lib"
-															includes="org.springframework.beans-*.jar" />
+														<fileset id="fs" dir="target/it/with-dep/sources/lib" includes="org.springframework.beans-*.jar"/>
 													</resourcecount>
 												</not>
 											</condition>
 										</fail>
-										<fail
-											message="Failed integration test of zip distro: test dependency jar files are missing.">
+										<fail message="Failed integration test of zip distro: test dependency jar files are missing.">
 											<condition>
 												<not>
 													<resourcecount count="1">
-														<fileset id="fs" dir="target/it/with-dep/sources/lib"
-															includes="com.springsource.org.junit-*.jar" />
+														<fileset id="fs" dir="target/it/with-dep/sources/lib" includes="com.springsource.org.junit-*.jar"/>
 													</resourcecount>
 												</not>
 											</condition>
@@ -627,4 +617,4 @@
 			</snapshots>
 		</pluginRepository>
 	</pluginRepositories>
-</project>
+</project>
\ No newline at end of file
diff --git a/src/site/apt/downloads.apt b/src/site/apt/downloads.apt
index d0241c5aa..d20441975 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 <<1.1.4.RELEASE>>, the latest snapshots are <<2.0.0.CI-SNAPSHOT>>.
+  The current GA release is <<2.0.0.RELEASE>>, the latest snapshots are <<2.0.1.CI-SNAPSHOT>>.  The version 1.1.x branch is now in maintenance (the last release was <<1.1.4.RELEASE>>).
 
 * Zip Downloads
 
@@ -48,7 +48,7 @@ Spring Batch Downloads
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>org.springframework.batch.core</artifactId>
-    <version>1.1.4.RELEASE</version>
+    <version>2.0.0.RELEASE</version>
 </dependency>
 +---------------
 
@@ -70,7 +70,7 @@ Spring Batch Downloads
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>spring-batch-core</artifactId>
-    <version>1.1.4.RELEASE</version>
+    <version>2.0.0.RELEASE</version>
 </dependency>
 +---------------
 
@@ -102,7 +102,7 @@ Spring Batch Downloads
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>org.springframework.batch.core</artifactId>
-    <version>2.0.0.RC1</version>
+    <version>2.0.0.RELEASE</version>
 </dependency>
 +---------------
 
@@ -122,7 +122,7 @@ Spring Batch Downloads
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>spring-batch-core</artifactId>
-    <version>2.0.0.RC1</version>
+    <version>2.0.0.RELEASE</version>
 </dependency>
 +---------------
 
diff --git a/src/site/docbook/reference/index.xml b/src/site/docbook/reference/index.xml
index 37cb60367..8667d9239 100644
--- a/src/site/docbook/reference/index.xml
+++ b/src/site/docbook/reference/index.xml
@@ -5,7 +5,7 @@
 	<bookinfo>
 		<title>Spring Batch - Reference Documentation</title>
 
-		<releaseinfo>Spring Batch 2.0.0.RC3</releaseinfo>
+		<releaseinfo>Spring Batch 2.0.0.RELEASE</releaseinfo>
 
 		<authorgroup>
 			<author>