diff --git a/spring-batch-integration/pom.xml b/spring-batch-integration/pom.xml
index aee24758a..696f04ce9 100644
--- a/spring-batch-integration/pom.xml
+++ b/spring-batch-integration/pom.xml
@@ -12,7 +12,6 @@
 		<relativePath>..</relativePath>
 	</parent>
 	<properties>
-		<spring.framework.version>2.5.4.A</spring.framework.version>
 		<spring.integration.version>1.0.0.M4</spring.integration.version>
 	</properties>
 	<profiles>
@@ -84,31 +83,31 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.context</artifactId>
+			<artifactId>spring-context</artifactId>
 			<version>${spring.framework.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.aop</artifactId>
+			<artifactId>spring-aop</artifactId>
 			<version>${spring.framework.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.jms</artifactId>
+			<artifactId>spring-jms</artifactId>
 			<version>${spring.framework.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.transaction</artifactId>
+			<artifactId>spring-tx</artifactId>
 			<version>${spring.framework.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.test</artifactId>
+			<artifactId>spring-test</artifactId>
 			<version>${spring.framework.version}</version>
 			<scope>test</scope>
 		</dependency>
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java
index b57bc00ca..18dab17fd 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java
@@ -153,10 +153,11 @@ public class ChunkMessageChannelItemWriter extends StepExecutionListenerSupport
 	private boolean waitForResults() {
 		// TODO: cumulative timeout, or throw an exception?
 		int count = 0;
-		while (localState.getExpecting() > 0 && count++ < 10) {
+		int maxCount = 10;
+		while (localState.getExpecting() > 0 && count++ < maxCount) {
 			getNextResult(100);
 		}
-		return count < 10;
+		return count < maxCount;
 	}
 
 	/**