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 @@ http://repository.jboss.org/nexus/content/groups/public-jboss + + + spring-maven-milestone + Springframework Maven Milestone Repository + http://maven.springframework.org/milestone + + 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 @@ org.slf4j jcl-over-slf4j - compile + test org.slf4j slf4j-log4j12 - runtime + test log4j log4j - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - runtime + test 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 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 implements EntityInstantiator { - private final Log log = LogFactory.getLog(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); final public T createEntityFromState(STATE n, Class 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 @@ UTF-8 4.8.1 - 1.2.15 + 1.2.16 1.8.4 1.5.10 3.0.5.RELEASE