diff --git a/pom.xml b/pom.xml
index 60b5c00..899bae2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,9 +31,9 @@
 			</activation>
 
 			<properties>
-				<sd.jpa.version>1.2.0.BUILD-SNAPSHOT</sd.jpa.version>
-				<sd.mongodb.version>1.1.0.BUILD-SNAPSHOT</sd.mongodb.version>
-				<sd.neo4j.version>2.1.0.BUILD-SNAPSHOT</sd.neo4j.version>
+				<sd.jpa.version>1.4.0.BUILD-SNAPSHOT</sd.jpa.version>
+				<sd.mongodb.version>1.3.0.BUILD-SNAPSHOT</sd.mongodb.version>
+				<sd.neo4j.version>2.3.0.BUILD-SNAPSHOT</sd.neo4j.version>
 			</properties>
 
 			<repositories>
@@ -53,9 +53,9 @@
 			<id>bugfix-snapshots</id>
 
 			<properties>
-				<sd.jpa.version>1.1.3.BUILD-SNAPSHOT</sd.jpa.version>
-				<sd.mongodb.version>1.0.5.BUILD-SNAPSHOT</sd.mongodb.version>
-				<sd.neo4j.version>2.0.2.BUILD-SNAPSHOT</sd.neo4j.version>
+				<sd.jpa.version>1.3.1.BUILD-SNAPSHOT</sd.jpa.version>
+				<sd.mongodb.version>1.2.1.BUILD-SNAPSHOT</sd.mongodb.version>
+				<sd.neo4j.version>2.2.1.BUILD-SNAPSHOT</sd.neo4j.version>
 			</properties>
 
 			<repositories>
@@ -96,10 +96,10 @@
 			<id>releases</id>
 
 			<properties>
-				<sd.jpa.version>1.1.2.RELEASE</sd.jpa.version>
-				<sd.mongodb.version>1.0.4.RELEASE</sd.mongodb.version>
-				<sd.neo4j.version>2.0.1.RELEASE</sd.neo4j.version>
-				<sd.commons.version>1.3.2.RELEASE</sd.commons.version>
+				<sd.jpa.version>1.3.0.RELEASE</sd.jpa.version>
+				<sd.mongodb.version>1.2.0.RELEASE</sd.mongodb.version>
+				<sd.neo4j.version>2.2.0.RELEASE</sd.neo4j.version>
+				<sd.commons.version>1.5.0.RELEASE</sd.commons.version>
 			</properties>
 
 			<!-- Force latest SD Commons -->
@@ -107,7 +107,7 @@
 			<dependencies>
 				<dependency>
 					<groupId>org.springframework.data</groupId>
-					<artifactId>spring-data-commons-core</artifactId>
+					<artifactId>spring-data-commons</artifactId>
 					<version>${sd.commons.version}</version>
 				</dependency>
 			</dependencies>
@@ -128,16 +128,16 @@
 			<id>latest-releases</id>
 
 			<properties>
-				<sd.jpa.version>1.2.0.RC1</sd.jpa.version>
-				<sd.mongodb.version>1.1.0.RC1</sd.mongodb.version>
-				<sd.neo4j.version>2.1.0.RC3</sd.neo4j.version>
-				<sd.commons.version>1.4.0.RC1</sd.commons.version>
+				<sd.jpa.version>1.3.0.RELEASE</sd.jpa.version>
+				<sd.mongodb.version>1.2.0.RELEASE</sd.mongodb.version>
+				<sd.neo4j.version>2.2.0.RELEASE</sd.neo4j.version>
+				<sd.commons.version>1.5.0.RELEASE</sd.commons.version>
 			</properties>
 			
 			<dependencies>
 				<dependency>
 					<groupId>org.springframework.data</groupId>
-					<artifactId>spring-data-commons-core</artifactId>
+					<artifactId>spring-data-commons</artifactId>
 					<version>${sd.commons.version}</version>
 				</dependency>
 			</dependencies>
@@ -166,9 +166,20 @@
 
 		<profile>
 			<id>3.1</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
 			<properties>
-				<spring.version>3.1.2.RELEASE</spring.version>
+				<spring.version>3.1.4.RELEASE</spring.version>
 			</properties>
+			<dependencies>
+				<dependency>
+					<groupId>cglib</groupId>
+					<artifactId>cglib</artifactId>
+					<version>2.2.2</version>
+					<scope>runtime</scope>
+				</dependency>
+			</dependencies>
 		</profile>
 
 		<!-- Use latest Spring 3.0 version, requires fix-spring -->
@@ -178,19 +189,27 @@
 			<properties>
 				<spring.version>3.0.7.RELEASE</spring.version>
 			</properties>
+			<dependencies>
+				<dependency>
+					<groupId>cglib</groupId>
+					<artifactId>cglib</artifactId>
+					<version>2.2.2</version>
+					<scope>runtime</scope>
+				</dependency>
+			</dependencies>
 		</profile>
 		
 		<profile>
 			<id>3.2</id>
 			<properties>
-				<spring.version>3.2.0.M1</spring.version>
+				<spring.version>3.2.1.RELEASE</spring.version>
 			</properties>
 		</profile>
 
 		<profile>
 			<id>spring-snapshots</id>
 			<properties>
-				<spring.version>3.2.0.BUILD-SNAPSHOT</spring.version>
+				<spring.version>4.0.0.BUILD-SNAPSHOT</spring.version>
 			</properties>
 		</profile>
 		
@@ -202,6 +221,12 @@
 			<id>fix-spring</id>
 			<dependencies>
 
+				<dependency>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-aop</artifactId>
+					<version>${spring.version}</version>
+				</dependency>
+
 				<dependency>
 					<groupId>org.springframework</groupId>
 					<artifactId>spring-aspects</artifactId>
@@ -237,6 +262,12 @@
 					<artifactId>spring-orm</artifactId>
 					<version>${spring.version}</version>
 				</dependency>
+				
+				<dependency>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-jdbc</artifactId>
+					<version>${spring.version}</version>
+				</dependency>
 
 				<dependency>
 					<groupId>org.springframework</groupId>
@@ -319,27 +350,19 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-validator</artifactId>
-			<version>4.1.0.Final</version>
-			<scope>test</scope>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>1.0.0.GA</version>
+			<scope>runtime</scope>
 		</dependency>
 
-
 		<!-- Logging -->
 
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.16</version>
-			<scope>runtime</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>${slf4j.version}</version>
-			<scope>runtime</scope>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>1.0.6</version>
+			<scope>test</scope>
 		</dependency>
 
 	</dependencies>
@@ -349,7 +372,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>3.0</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
diff --git a/src/main/resources/META-INF/spring/application-context.xml b/src/main/resources/META-INF/spring/application-context.xml
index 57a74d3..0f0b1d1 100644
--- a/src/main/resources/META-INF/spring/application-context.xml
+++ b/src/main/resources/META-INF/spring/application-context.xml
@@ -26,6 +26,11 @@
 				<property name="generateDdl" value="true" /> 
 			</bean>
 		</property>
+		<property name="jpaProperties">
+			<props>
+				<prop key="javax.persistence.validation.mode">none</prop>
+			</props>
+		</property>
 	</bean>
 	
 	<bean id="jpaTransactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
deleted file mode 100644
index 8e9ae4d..0000000
--- a/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# Direct log messages to stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %40.40c:%4L - %m%n
-
-# Root logger option
-log4j.rootLogger=WARN, stdout
-
-#log4j.logger.org.springframework=INFO
-#log4j.logger.org.springframework.data=INFO
\ No newline at end of file
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
new file mode 100644
index 0000000..fc4931c
--- /dev/null
+++ b/src/test/resources/logback.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<logger name="org.springframework.data.mapping" level="debug" />
+
+	<root level="warn">
+		<appender-ref ref="console" />
+	</root>
+
+</configuration>
\ No newline at end of file