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

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2001 50f2f4bb-b051-0410-bef5-90022cba6387

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>