From 4b291c665c202e73f701d6bd978186635122467a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Thu, 29 May 2014 18:18:55 +0200
Subject: [PATCH] Upgrade spring-test tests to Hibernate 4

This commit upgrades Hibernate-based integration tests in the
spring-test module to use Hibernate 4 instead of 3 and Hibernate
Validator 5 instead of 4. This streamlines and simplifies our
dependency management at the same time.

Issue: SPR-11834
---
 build.gradle                                             | 9 +++------
 .../junit4/orm/HibernateSessionFlushingTests-context.xml | 6 +++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index cc0c43cf5d7..b9219d9b403 100644
--- a/build.gradle
+++ b/build.gradle
@@ -898,7 +898,6 @@ project("spring-test") {
 		}
 		optional("javax.portlet:portlet-api:2.0")
 		optional("javax.el:javax.el-api:2.2.5")
-		optional("org.eclipse.persistence:javax.persistence:2.0.0")
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 		optional("org.hamcrest:hamcrest-core:1.3")
 		optional("com.jayway.jsonpath:json-path:0.9.0")
@@ -908,11 +907,9 @@ project("spring-test") {
 		testCompile(project(":spring-webmvc-tiles3"))
 		testCompile("javax.mail:javax.mail-api:1.5.2")
 		testCompile("javax.ejb:ejb-api:3.0")
-		testCompile("org.hibernate:hibernate-core:${hibernate3Version}") {
-			exclude group: 'org.hibernate.javax.persistence', module: 'hibernate-jpa-2.0-api'
-		}
-		testCompile("org.hibernate:hibernate-entitymanager:${hibernate3Version}")
-		testCompile("org.hibernate:hibernate-validator:${hibVal4Version}")
+		testCompile("org.hibernate:hibernate-core:${hibernate4Version}")
+		testCompile("org.hibernate:hibernate-entitymanager:${hibernate4Version}")
+		testCompile("org.hibernate:hibernate-validator:${hibVal5Version}")
 		testCompile("com.thoughtworks.xstream:xstream:${xstreamVersion}")
 		testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 		testCompile("rome:rome:1.0")
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests-context.xml
index d1f5ca7849a..5f083e964a1 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests-context.xml
@@ -6,7 +6,7 @@
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
+		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
 
 	<context:component-scan base-package="org.springframework.test.context.junit4.orm" />
 
@@ -17,7 +17,7 @@
 		<jdbc:script location="classpath:/org/springframework/test/context/junit4/orm/db-test-data.sql" />
 	</jdbc:embedded-database>
 
-	<bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean"
+	<bean id="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean"
 		p:dataSource-ref="dataSource">
 		<property name="hibernateProperties">
 			<props>
@@ -33,7 +33,7 @@
 		</property>
 	</bean>
 
-	<bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager"
+	<bean id="transactionManager" class="org.springframework.orm.hibernate4.HibernateTransactionManager"
 		p:sessionFactory-ref="sessionFactory" />
 
 </beans>