From 481c8455fdcde604667f3b1b4ffee30d91551d7a Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Fri, 9 Dec 2011 13:08:54 +0000
Subject: [PATCH] Upgrade to Hibernate Core 4.0.0.CR7

From earlier dependence on 4.0.0.CR4.

Spring 3.1.x will upgrade to Hibernate 4.0.0.Final as soon as possible
after its release.

Pom files have also been updated to 'recommend' use of Hibernate
3.6.0.Final or better (earlier value was 3.3.1.GA).
---
 org.springframework.orm/.classpath | 2 +-
 org.springframework.orm/ivy.xml    | 2 +-
 org.springframework.orm/orm.iml    | 4 ++--
 org.springframework.orm/pom.xml    | 2 +-
 org.springframework.test/pom.xml   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/org.springframework.orm/.classpath b/org.springframework.orm/.classpath
index 83c1bf8e2f..ab8290b578 100644
--- a/org.springframework.orm/.classpath
+++ b/org.springframework.orm/.classpath
@@ -36,7 +36,7 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.hibernate/com.springsource.org.hibernate.ejb/3.4.0.GA/com.springsource.org.hibernate.ejb-3.4.0.GA.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.hibernate/com.springsource.org.hibernate.annotations/3.4.0.GA/com.springsource.org.hibernate.annotations-3.4.0.GA.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.hibernate/com.springsource.org.hibernate.annotations.common/3.3.0.ga/com.springsource.org.hibernate.annotations.common-3.3.0.ga.jar" sourcepath="/IVY_CACHE/org.hibernate/com.springsource.org.hibernate.annotations.common/3.3.0.ga/com.springsource.org.hibernate.annotations-sources-3.3.0.common.ga.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.hibernate/com.springsource.org.hibernate.core/4.0.0.CR4/com.springsource.org.hibernate.core-4.0.0.CR4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.hibernate/com.springsource.org.hibernate.core/4.0.0.CR7/com.springsource.org.hibernate.core-4.0.0.CR7.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.hsqldb/com.springsource.org.hsqldb/1.8.0.9/com.springsource.org.hsqldb-1.8.0.9.jar" sourcepath="/IVY_CACHE/org.hsqldb/com.springsource.org.hsqldb/1.8.0.9/com.springsource.org.hsqldb-sources-1.8.0.9.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.jboss.javassist/com.springsource.javassist/3.3.0.ga/com.springsource.javassist-3.3.0.ga.jar" sourcepath="/IVY_CACHE/org.jboss.javassist/com.springsource.javassist/3.3.0.ga/com.springsource.javassist-sources-3.3.0.ga.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.9.0/com.springsource.org.junit-4.9.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.9.0/com.springsource.org.junit-sources-4.9.0.jar"/>
diff --git a/org.springframework.orm/ivy.xml b/org.springframework.orm/ivy.xml
index 22aa262d66..2b12a1f0c9 100644
--- a/org.springframework.orm/ivy.xml
+++ b/org.springframework.orm/ivy.xml
@@ -43,7 +43,7 @@
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.3.1.GA" conf="optional, hibernate->compile"/>
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations" rev="3.4.0.GA" conf="optional, hibernate-jpa->compile"/>
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.4.0.GA" conf="optional, hibernate-jpa->compile"/>
-		<dependency org="org.hibernate" name="com.springsource.org.hibernate.core" rev="4.0.0.CR4" conf="optional, hibernate->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.core" rev="4.0.0.CR7" conf="optional, hibernate->compile"/>
 		<dependency org="javax.jdo" name="com.springsource.javax.jdo" rev="2.1.0" conf="provided, jdo->compile"/>
 		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided, jpa->compile"/>
 		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided, web->compile"/>
diff --git a/org.springframework.orm/orm.iml b/org.springframework.orm/orm.iml
index 772f6cbaa9..27ab480268 100644
--- a/org.springframework.orm/orm.iml
+++ b/org.springframework.orm/orm.iml
@@ -221,11 +221,11 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate.core/4.0.0.CR4/com.springsource.org.hibernate.core-4.0.0.CR4.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate.core/4.0.0.CR7/com.springsource.org.hibernate.core-4.0.0.CR7.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate.core/4.0.0.CR4/com.springsource.org.hibernate.core-sources-4.0.0.CR4.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate.core/4.0.0.CR7/com.springsource.org.hibernate.core-sources-4.0.0.CR7.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
diff --git a/org.springframework.orm/pom.xml b/org.springframework.orm/pom.xml
index 542321ea17..55b89c9318 100644
--- a/org.springframework.orm/pom.xml
+++ b/org.springframework.orm/pom.xml
@@ -66,7 +66,7 @@
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
-			<version>3.3.1.GA</version>
+			<version>3.6.0.Final</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
diff --git a/org.springframework.test/pom.xml b/org.springframework.test/pom.xml
index 79787997ad..526c07ab44 100644
--- a/org.springframework.test/pom.xml
+++ b/org.springframework.test/pom.xml
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>3.3.1.GA</version>
+      <version>3.6.0.Final</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>