From c17f4b9d85e72902176b10b50ad1b5c82ef79b4f Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Mon, 28 Mar 2011 08:30:53 +0100
Subject: [PATCH] AMQP-134: revert to vanilla logging

---
 helloworld/pom.xml | 23 +++++++++++++++++++++++
 stocks/pom.xml     | 12 ------------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/helloworld/pom.xml b/helloworld/pom.xml
index 8204c9e..3d97adf 100644
--- a/helloworld/pom.xml
+++ b/helloworld/pom.xml
@@ -41,6 +41,18 @@
   			<version>${spring.amqp.version}</version>
 		</dependency>	
 
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${spring.framework.version}</version>
+			<exclusions>
+				<!-- Exclude Commons Logging in favor of SLF4j -->
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
@@ -67,6 +79,17 @@
 			<scope>test</scope>
 		</dependency>
 		
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.5.10</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<version>1.5.10</version>
+			<scope>runtime</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
diff --git a/stocks/pom.xml b/stocks/pom.xml
index 7cfa6b7..97e78d6 100644
--- a/stocks/pom.xml
+++ b/stocks/pom.xml
@@ -116,18 +116,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<version>1.5.10</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.5.10</version>
-			<scope>runtime</scope>
-		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>