From 4d3594474dfc8eb0c67e04fad8f0321cec653a68 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Tue, 5 Feb 2013 15:06:36 +0000
Subject: [PATCH 1/3] Move gemstone repo declarations to samples

---
 spring-batch-parent/pom.xml  | 10 ----------
 spring-batch-samples/pom.xml | 37 +++++++++++++++++++++---------------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml
index bd711c645..3f34de108 100644
--- a/spring-batch-parent/pom.xml
+++ b/spring-batch-parent/pom.xml
@@ -139,11 +139,6 @@
 		<profile>
 			<id>bootstrap</id>
 			<repositories>
-				<repository>
-					<id>gemstone</id>
-					<name>Release bundles for SQLFire and GemFire</name>
-					<url>http://dist.gemstone.com.s3.amazonaws.com/maven/release</url>
-				</repository>
 				<repository>
 					<id>objectstyle</id>
 					<name>ObjectStyle.org Repository</name>
@@ -360,11 +355,6 @@
 	</reporting>
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>com.vmware.sqlfire</groupId>
-				<artifactId>sqlfireclient</artifactId>
-				<version>1.0.3</version>
-			</dependency>
 			<dependency>
 				<groupId>org.aspectj</groupId>
 				<artifactId>aspectjrt</artifactId>
diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index 86dda5c34..b61ad3d46 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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>
 	<artifactId>spring-batch-samples</artifactId>
 	<packaging>jar</packaging>
@@ -17,11 +18,12 @@
 		<environment>hsql</environment>
 	</properties>
 	<dependencies>
-			<dependency>
-				<groupId>com.vmware.sqlfire</groupId>
-				<artifactId>sqlfireclient</artifactId>
-				<optional>true</optional>
-			</dependency>
+		<dependency>
+			<groupId>com.vmware.sqlfire</groupId>
+			<artifactId>sqlfireclient</artifactId>
+			<optional>true</optional>
+			<version>1.0.3</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
 			<artifactId>spring-batch-core</artifactId>
@@ -239,15 +241,15 @@
 			<version>1.4.1</version>
 		</dependency>
 		<dependency>
-            <groupId>org.springframework.amqp</groupId>
-            <artifactId>spring-amqp</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.amqp</groupId>
-            <artifactId>spring-rabbit</artifactId>
-            <optional>true</optional>
-        </dependency>
+			<groupId>org.springframework.amqp</groupId>
+			<artifactId>spring-amqp</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.amqp</groupId>
+			<artifactId>spring-rabbit</artifactId>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -420,5 +422,10 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
+		<repository>
+			<id>gemstone</id>
+			<name>Release bundles for SQLFire and GemFire</name>
+			<url>http://dist.gemstone.com.s3.amazonaws.com/maven/release</url>
+		</repository>
 	</repositories>
 </project>

From bea04ce1860e07314d9c60fc89c04b9d3f336408 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Tue, 5 Feb 2013 15:33:00 +0000
Subject: [PATCH 2/3] More defensive StepScope schlepping in tests

---
 .../org/springframework/batch/core/scope/StepScopeTests.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeTests.java
index 0e97fe6f5..4bd8f8de7 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeTests.java
@@ -51,12 +51,13 @@ public class StepScopeTests {
 
 	@Before
 	public void setUp() throws Exception {
+		StepSynchronizationManager.release();
 		context = StepSynchronizationManager.register(stepExecution);
 	}
 
 	@After
 	public void tearDown() throws Exception {
-		StepSynchronizationManager.release();
+		StepSynchronizationManager.close();
 	}
 
 	@Test

From 47d07b0326f56225fedff760a22561abbf57073f Mon Sep 17 00:00:00 2001
From: Michael Minella <mminella@vmware.com>
Date: Tue, 5 Feb 2013 09:38:38 -0600
Subject: [PATCH 3/3] BATCH-1757: Fixed max calculation

---
 .../springframework/batch/core/partition/MinMaxPartitioner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/MinMaxPartitioner.java b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/MinMaxPartitioner.java
index c8c12aaa5..d52f20508 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/MinMaxPartitioner.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/MinMaxPartitioner.java
@@ -35,7 +35,7 @@ public class MinMaxPartitioner extends SimplePartitioner {
 		int i = 0;
 		for (ExecutionContext context : partition.values()) {
 			int min = (i++)*range;
-			int max = Math.min(total, (min+1)*range);
+			int max = Math.min(total, i * range);
 			context.putInt("min", min);
 			context.putInt("max", max);
 		}