From c6cd1a528e8acc657c4419c1a4b68e632703b802 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@vmware.com>
Date: Fri, 25 Sep 2009 05:16:55 +0000
Subject: [PATCH] SPR-6119 - Add slf4j dependency back to orm's pom.xml but in
 test scope as it is needed to run tests that use Hibernate SPR-5956 - Remove
 commons-logging dependency definitions in pom.xml for all but spring-core so
 as to make exclusion rule easier for user who use slf4j

---
 org.springframework.aop/pom.xml             |  7 +------
 org.springframework.aspects/pom.xml         |  7 +------
 org.springframework.beans/pom.xml           |  7 +------
 org.springframework.context.support/pom.xml |  7 +------
 org.springframework.context/pom.xml         |  7 +------
 org.springframework.expression/pom.xml      |  7 +------
 org.springframework.jdbc/pom.xml            |  7 +------
 org.springframework.jms/pom.xml             |  7 +------
 org.springframework.orm/pom.xml             | 13 +++++++------
 org.springframework.oxm/pom.xml             |  7 +------
 org.springframework.test/pom.xml            |  7 +------
 org.springframework.transaction/pom.xml     |  7 +------
 org.springframework.web.portlet/pom.xml     |  7 +------
 org.springframework.web.servlet/pom.xml     | 13 +++++++------
 org.springframework.web/pom.xml             | 16 +---------------
 15 files changed, 27 insertions(+), 99 deletions(-)

diff --git a/org.springframework.aop/pom.xml b/org.springframework.aop/pom.xml
index 969be99c4ee..5433aef5765 100644
--- a/org.springframework.aop/pom.xml
+++ b/org.springframework.aop/pom.xml
@@ -31,12 +31,7 @@
       <version>1.0</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
+    <!-- common logging dependency is in spring-core -->
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
diff --git a/org.springframework.aspects/pom.xml b/org.springframework.aspects/pom.xml
index b48af20b29f..e4fd535b598 100644
--- a/org.springframework.aspects/pom.xml
+++ b/org.springframework.aspects/pom.xml
@@ -13,12 +13,7 @@
   </parent>
 
   <dependencies>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
+    <!-- common logging dependency is in spring-core -->
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjweaver</artifactId>
diff --git a/org.springframework.beans/pom.xml b/org.springframework.beans/pom.xml
index 2ac163a04eb..b969b59e0a7 100644
--- a/org.springframework.beans/pom.xml
+++ b/org.springframework.beans/pom.xml
@@ -31,12 +31,7 @@
       <version>2.2</version>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
+    <!-- common logging dependency is in spring-core -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
diff --git a/org.springframework.context.support/pom.xml b/org.springframework.context.support/pom.xml
index 88ae3a456da..715d9637911 100644
--- a/org.springframework.context.support/pom.xml
+++ b/org.springframework.context.support/pom.xml
@@ -62,12 +62,7 @@
       <version>3.2</version>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
+    <!-- common logging dependency is in spring-core -->
     <dependency>
       <groupId>velocity</groupId>
       <artifactId>velocity</artifactId>
diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml
index cf12bb0fa80..25b061d3863 100644
--- a/org.springframework.context/pom.xml
+++ b/org.springframework.context/pom.xml
@@ -84,12 +84,7 @@
       <version>1.0</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
+    <!-- common logging dependency is in spring-core -->
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjweaver</artifactId>
diff --git a/org.springframework.expression/pom.xml b/org.springframework.expression/pom.xml
index e90361613f4..e0a6ff64fcc 100644
--- a/org.springframework.expression/pom.xml
+++ b/org.springframework.expression/pom.xml
@@ -13,12 +13,7 @@
   </parent>
 
   <dependencies>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
+    <!-- common logging dependency is in spring-core -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
diff --git a/org.springframework.jdbc/pom.xml b/org.springframework.jdbc/pom.xml
index 947434308ce..aae259a0297 100644
--- a/org.springframework.jdbc/pom.xml
+++ b/org.springframework.jdbc/pom.xml
@@ -24,12 +24,7 @@
       <version>1.1</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
+    <!-- common logging dependency is in spring-core -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
diff --git a/org.springframework.jms/pom.xml b/org.springframework.jms/pom.xml
index df3e06d1c70..209bdedcc9e 100644
--- a/org.springframework.jms/pom.xml
+++ b/org.springframework.jms/pom.xml
@@ -37,12 +37,7 @@
       <version>1.0</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
+    <!-- common logging dependency is in spring-core -->
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
diff --git a/org.springframework.orm/pom.xml b/org.springframework.orm/pom.xml
index 9b7ac41bab6..2efd9c87d3e 100644
--- a/org.springframework.orm/pom.xml
+++ b/org.springframework.orm/pom.xml
@@ -24,12 +24,7 @@
       <version>1.0</version>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
+    <!-- common logging dependency is in spring-core -->
     <dependency>
       <groupId>org.apache.ibatis</groupId>
       <artifactId>ibatis-sqlmap</artifactId>
@@ -84,6 +79,12 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <version>1.5.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-annotations</artifactId>
diff --git a/org.springframework.oxm/pom.xml b/org.springframework.oxm/pom.xml
index 53aa34a69cd..ed19a01b8f7 100644
--- a/org.springframework.oxm/pom.xml
+++ b/org.springframework.oxm/pom.xml
@@ -33,12 +33,7 @@
 			<version>1.1.5</version>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-			<scope>compile</scope>
-		</dependency>
+		<!-- common logging dependency is in spring-core -->
 		<dependency>
 			<groupId>xerces</groupId>
 			<artifactId>xercesImpl</artifactId>
diff --git a/org.springframework.test/pom.xml b/org.springframework.test/pom.xml
index cfbd928794e..21e364a1b64 100644
--- a/org.springframework.test/pom.xml
+++ b/org.springframework.test/pom.xml
@@ -55,12 +55,7 @@
       <version>1.1</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
+    <!-- common logging dependency is in spring-core -->
     <dependency>
       <groupId>taglibs</groupId>
       <artifactId>standard</artifactId>
diff --git a/org.springframework.transaction/pom.xml b/org.springframework.transaction/pom.xml
index d17623405c1..e0f4cb80cfb 100644
--- a/org.springframework.transaction/pom.xml
+++ b/org.springframework.transaction/pom.xml
@@ -45,12 +45,7 @@
       <version>1.0</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
+    <!-- common logging dependency is in spring-core -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
diff --git a/org.springframework.web.portlet/pom.xml b/org.springframework.web.portlet/pom.xml
index 04b967105f0..dac389f9099 100644
--- a/org.springframework.web.portlet/pom.xml
+++ b/org.springframework.web.portlet/pom.xml
@@ -49,12 +49,7 @@
       <version>1.2</version>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
+    <!-- common logging dependency is in spring-core -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-asm</artifactId>
diff --git a/org.springframework.web.servlet/pom.xml b/org.springframework.web.servlet/pom.xml
index b360af6c08a..4a8942b00c2 100644
--- a/org.springframework.web.servlet/pom.xml
+++ b/org.springframework.web.servlet/pom.xml
@@ -89,12 +89,7 @@
 	</exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
+    <!-- common logging dependency is in spring-core -->
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi</artifactId>
@@ -269,6 +264,12 @@
       <version>3.3.1.GA</version>
       <scope>test</scope>
       <optional>true</optional>
+      <exclusions>
+	<exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+	</exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
diff --git a/org.springframework.web/pom.xml b/org.springframework.web/pom.xml
index ef79991da98..d80ad87e19d 100644
--- a/org.springframework.web/pom.xml
+++ b/org.springframework.web/pom.xml
@@ -19,15 +19,6 @@
       <version>3.2.1</version>
       <optional>true</optional>
     </dependency>
-    <!-- can't find hessian 3.2.1 in a public repo -->
-    <!--
-    <dependency>
-      <groupId>com.caucho</groupId>
-      <artifactId>hessian</artifactId>
-      <version>3.1.5</version>
-      <optional>true</optional>
-    </dependency>
-    -->
     <dependency>
       <groupId>javax.el</groupId>
       <artifactId>el-api</artifactId>
@@ -100,12 +91,7 @@
       <version>3.1</version>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
+    <!-- common logging dependency is in spring-core -->
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>