SPR-5327: tidy up Maven dependencies (keeping commons-logging)

org.springframework.context/pom.xml

@@ -37,7 +37,7 @@
 			<groupId>javax.inject</groupId>
 			<artifactId>javax.inject</artifactId>
 			<version>1</version>
-			<scope>provided</scope>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.atinject</groupId>
@@ -61,7 +61,7 @@
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
 			<version>1.0.0.GA</version>
-			<scope>provided</scope>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>javax.xml.ws</groupId>
@@ -117,17 +117,11 @@
 			<version>1.6</version>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-asm</artifactId>
-			<version>${project.version}</version>
-			<scope>compile</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-aop</artifactId>
 			<version>${project.version}</version>
-			<scope>compile</scope>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -163,7 +157,7 @@
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jta_1.1_spec</artifactId>
 			<version>1.1</version>
-			<scope>test</scope>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>javax.xml</groupId>
@@ -206,8 +200,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-jcl</artifactId>
-			<version>1.5.3</version>
+			<artifactId>slf4j-log4j12</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

org.springframework.core/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework</groupId>
 	<artifactId>spring-core</artifactId>
@@ -34,6 +36,7 @@
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
+			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -45,6 +48,7 @@
 			<groupId>org.jboss.vfs</groupId>
 			<artifactId>com.springsource.org.jboss.virtual</artifactId>
 			<version>2.1.0.GA</version>
+			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>
 		<dependency>

org.springframework.orm/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework</groupId>
 	<artifactId>spring-orm</artifactId>
@@ -41,13 +43,13 @@
 			<groupId>org.eclipse.persistence</groupId>
 			<artifactId>org.eclipse.persistence.core</artifactId>
 			<version>1.0.1</version>
-      <scope>test</scope>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.persistence</groupId>
 			<artifactId>org.eclipse.persistence.jpa</artifactId>
 			<version>1.0.1</version>
-      <scope>test</scope>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.persistence</groupId>
@@ -81,9 +83,15 @@
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
-      <version>1.5.2</version>
+			<artifactId>slf4j-log4j12</artifactId>
 			<scope>test</scope>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<scope>test</scope>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
@@ -190,36 +198,31 @@
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jcl</artifactId>
-      <version>1.5.3</version>
-      <scope>test</scope>
-    </dependency>
 	</dependencies>
 	<build>
-    <testResources>
-      <testResource>
-        <directory>${pom.build.unitTestSourceDirectory}</directory>
-        <includes>
-          <include>**/*.xml</include>
-        </includes>
-      </testResource>
-      <testResource>
-        <directory>${pom.build.sourceDirectory}</directory>
+		<resources>
+			<resource>
+				<directory>src/main/java</directory>
 				<includes>
 					<include>**/*.xsd</include>
+					<include>**/*.xml</include>
 				</includes>
-      </testResource>
+			</resource>
+		</resources>
+		<testResources>
 			<testResource>
-        <directory>src/test/resources</directory>
+				<directory>src/test/java</directory>
 				<includes>
 					<include>**/*.xml</include>
+					<include>**/*.sql</include>
+					<include>**/*.jar</include>
+					<include>**/*.properties</include>
 				</includes>
 			</testResource>
 			<testResource>
 				<directory>src/test/resources</directory>
 				<includes>
+					<include>**/*.xml</include>
 					<include>*.jar</include>
 				</includes>
 			</testResource>

org.springframework.spring-parent/pom.xml

@@ -30,7 +30,7 @@
       <layout>legacy</layout>
       <snapshots><enabled>false</enabled></snapshots>
     </repository>
-    <!-- for use with jexcelapi 2.6.8, portlet 2.0, hibernate 3.3.1, javax.el/el-api 2.1 -->
+    <!-- for use with jexcelapi 2.6.8, portlet 2.0, javax.el/el-api 2.1 -->
     <repository>
       <id>jboss</id>
       <name>JBoss Repository</name>
@@ -100,6 +100,16 @@
 		<version>2.5.1</version>
 		<scope>test</scope>
       </dependency>
+      <dependency>
+		<groupId>org.slf4j</groupId>
+		<artifactId>slf4j-api</artifactId>
+		<version>1.5.8</version>
+      </dependency>
+      <dependency>
+		<groupId>org.slf4j</groupId>
+		<artifactId>slf4j-log4j12</artifactId>
+		<version>1.5.8</version>
+      </dependency>
       <dependency>
 		<groupId>log4j</groupId>
 		<artifactId>log4j</artifactId>
@@ -198,13 +208,20 @@
   </profiles>
 
   <build>
+	<extensions>
+	  <extension>
+		<groupId>org.springframework.build.aws</groupId>
+		<artifactId>org.springframework.build.aws.maven</artifactId>
+		<version>2.0.0.RELEASE</version>
+	  </extension>
+	</extensions>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
 		<configuration>
 		  <source>1.5</source>
-	  <target>1.5</target>
+		  <target>1.6</target>
         </configuration>
       </plugin>
       <plugin>

org.springframework.web.servlet/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework</groupId>
 	<artifactId>spring-webmvc</artifactId>
@@ -126,12 +128,11 @@
 			<version>1.1.2</version>
 			<optional>true</optional>
 		</dependency>
-	<!-- dependency>
-    	<groupId>org.apache.velocity</groupId>
-    	<artifactId>velocity</artifactId>
-    	<version>1.6.2</version>
-      	<optional>true</optional>
-	</dependency-->
+		<!--
+			dependency> <groupId>org.apache.velocity</groupId>
+			<artifactId>velocity</artifactId> <version>1.6.2</version>
+			<optional>true</optional> </dependency
+		-->
 		<dependency>
 			<groupId>velocity</groupId>
 			<artifactId>velocity</artifactId>
@@ -264,19 +265,6 @@
 			<version>1.7R1</version>
 			<scope>test</scope>
 		</dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-core</artifactId>
-      <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>
 			<artifactId>geronimo-jta_1.1_spec</artifactId>
@@ -290,6 +278,13 @@
 			<version>1.0.0.GA</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>3.3.1.GA</version>
+			<scope>test</scope>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
@@ -298,9 +293,15 @@
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jcl</artifactId>
-      <version>1.5.3</version>
+			<artifactId>slf4j-log4j12</artifactId>
+			<scope>test</scope>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
 			<scope>test</scope>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>joda-time</groupId>

org.springframework.web/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework</groupId>
 	<artifactId>spring-web</artifactId>
@@ -95,6 +97,7 @@
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
+			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>
 		<dependency>