From 2397b8bfb57441b1b15fd3c2eb85443e4d4081c7 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Fri, 11 Mar 2011 13:37:34 +0000
Subject: [PATCH] Fix logging dependencies, and upgrade Spring Integration

---
 spring-batch-admin-parent/pom.xml | 8 ++++----
 spring-batch-integration/pom.xml  | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/spring-batch-admin-parent/pom.xml b/spring-batch-admin-parent/pom.xml
index 6f3432c8f..35c0960db 100755
--- a/spring-batch-admin-parent/pom.xml
+++ b/spring-batch-admin-parent/pom.xml
@@ -10,7 +10,7 @@
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<spring.batch.version>2.1.6.RELEASE</spring.batch.version>
 		<spring.framework.version>3.0.5.RELEASE</spring.framework.version>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.3.RELEASE</spring.integration.version>
 	</properties>
 	<profiles>
 		<profile>
@@ -344,18 +344,18 @@
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>jcl-over-slf4j</artifactId>
-				<version>1.6.1</version>
+				<version>1.5.8</version>
 			</dependency>
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>
-				<version>1.6.1</version>
+				<version>1.5.8</version>
 				<scope>runtime</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-log4j12</artifactId>
-				<version>1.6.1</version>
+				<version>1.5.8</version>
 				<scope>runtime</scope>
 			</dependency>
 			<dependency>
diff --git a/spring-batch-integration/pom.xml b/spring-batch-integration/pom.xml
index 32b063977..d13e807ca 100644
--- a/spring-batch-integration/pom.xml
+++ b/spring-batch-integration/pom.xml
@@ -38,6 +38,10 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>