From dd6e56d0138902e32af9aad25f0ed2b0878c2e49 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Thu, 10 Mar 2011 18:18:07 +0100
Subject: [PATCH] DATACMNS-14 - Fixed various issues in the poms.

Added Milestone repository to aspects module to find AspectJ 1.6.11.M2. Reduced logging dependencies to test scope, altered two classes to use SLF4J instead of Commons logging. Use Log4J 1.2.16 as this does not require explicit excludes for mail, JMS and JMX anymore.
---
 spring-data-commons-aspects/pom.xml           |  7 ++++++
 spring-data-commons-core/pom.xml              | 24 +++----------------
 ...geSetBackedTransactionSynchronization.java |  7 +++---
 ...AbstractConstructorEntityInstantiator.java |  6 ++---
 spring-data-commons-parent/pom.xml            |  2 +-
 5 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/spring-data-commons-aspects/pom.xml b/spring-data-commons-aspects/pom.xml
index 54152dc05..eeaf7681c 100644
--- a/spring-data-commons-aspects/pom.xml
+++ b/spring-data-commons-aspects/pom.xml
@@ -132,6 +132,13 @@
 			<url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>
 		</repository>
 	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>spring-maven-milestone</id>
+			<name>Springframework Maven Milestone Repository</name>
+			<url>http://maven.springframework.org/milestone</url>
+        </pluginRepository>
+	</pluginRepositories>
 	<build>
 		<plugins>
 			<plugin>
diff --git a/spring-data-commons-core/pom.xml b/spring-data-commons-core/pom.xml
index 5e825ae0c..aff94706e 100644
--- a/spring-data-commons-core/pom.xml
+++ b/spring-data-commons-core/pom.xml
@@ -30,35 +30,17 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
-			<scope>compile</scope>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<scope>runtime</scope>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.mail</groupId>
-					<artifactId>mail</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.jms</groupId>
-					<artifactId>jms</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jdmk</groupId>
-					<artifactId>jmxtools</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jmx</groupId>
-					<artifactId>jmxri</artifactId>
-				</exclusion>
-			</exclusions>
-			<scope>runtime</scope>
+			<scope>test</scope>
 		</dependency>
 		
 		<dependency>
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/transaction/ChangeSetBackedTransactionSynchronization.java b/spring-data-commons-core/src/main/java/org/springframework/data/transaction/ChangeSetBackedTransactionSynchronization.java
index e2e53ec2b..1a21f9f71 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/transaction/ChangeSetBackedTransactionSynchronization.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/transaction/ChangeSetBackedTransactionSynchronization.java
@@ -1,15 +1,14 @@
 package org.springframework.data.transaction;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.data.support.ChangeSetBacked;
 import org.springframework.data.support.ChangeSetPersister;
 import org.springframework.transaction.support.TransactionSynchronization;
 
 public class ChangeSetBackedTransactionSynchronization implements TransactionSynchronization {
 
-	protected final Log log = LogFactory.getLog(getClass());
+	protected final Logger log = LoggerFactory.getLogger(getClass());
 
 	private ChangeSetPersister<Object> changeSetPersister;
 
diff --git a/spring-data-commons-core/src/main/java/org/springframework/persistence/support/AbstractConstructorEntityInstantiator.java b/spring-data-commons-core/src/main/java/org/springframework/persistence/support/AbstractConstructorEntityInstantiator.java
index 795d7c059..ff8f060cd 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/persistence/support/AbstractConstructorEntityInstantiator.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/persistence/support/AbstractConstructorEntityInstantiator.java
@@ -3,8 +3,8 @@ package org.springframework.persistence.support;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.util.ClassUtils;
 
 /**
@@ -15,7 +15,7 @@ import org.springframework.util.ClassUtils;
  */
 public abstract class AbstractConstructorEntityInstantiator<BACKING_INTERFACE, STATE> implements EntityInstantiator<BACKING_INTERFACE, STATE> {
 	
-	private final Log log = LogFactory.getLog(getClass());
+	private final Logger log = LoggerFactory.getLogger(getClass());
 	
 	final public <T extends BACKING_INTERFACE> T createEntityFromState(STATE n, Class<T> c) {
 		try {
diff --git a/spring-data-commons-parent/pom.xml b/spring-data-commons-parent/pom.xml
index af749539a..d36be31c8 100644
--- a/spring-data-commons-parent/pom.xml
+++ b/spring-data-commons-parent/pom.xml
@@ -12,7 +12,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<!-- versions for commonly-used dependencies -->
 		<junit.version>4.8.1</junit.version>
-		<log4j.version>1.2.15</log4j.version>
+		<log4j.version>1.2.16</log4j.version>
 		<org.mockito.version>1.8.4</org.mockito.version>
 		<org.slf4j.version>1.5.10</org.slf4j.version>
 		<org.springframework.version>3.0.5.RELEASE</org.springframework.version>