From 3fa9117b4b54d222ebb6163e8b306f0a079e5158 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 23 Jul 2009 16:26:27 +0000
Subject: [PATCH] Upgrade Hibernate

git-svn-id: https://svn.argeo.org/slc/trunk@2740 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 pom.xml                                         | 14 +++++++++++---
 runtime/org.argeo.slc.specs/pom.xml             |  3 ++-
 runtime/org.argeo.slc.support.hibernate/pom.xml |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index a576c7aae..721a5dd20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -939,15 +939,23 @@ limitations under the License.
 			<dependency>
 				<groupId>org.hibernate</groupId>
 				<artifactId>com.springsource.org.hibernate</artifactId>
-				<version>3.2.6.ga</version>
-				<!-- <version>3.3.1.GA</version> TODO: fix issues with logging -->
+				<version>3.3.1.GA</version>
 				<exclusions>
 					<exclusion>
 						<groupId>org.apache.commons</groupId>
 						<artifactId>com.springsource.org.apache.commons.logging</artifactId>
 					</exclusion>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>com.springsource.slf4j.api</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
+			<dependency>
+				<groupId>org.jboss.javassist</groupId>
+				<artifactId>com.springsource.javassist</artifactId>
+				<version>3.9.0.GA</version>
+			</dependency>
 			<dependency>
 				<groupId>net.sourceforge.jexcelapi</groupId>
 				<artifactId>com.springsource.jxl</artifactId>
@@ -956,7 +964,7 @@ limitations under the License.
 			<dependency>
 				<groupId>net.sourceforge.ehcache</groupId>
 				<artifactId>com.springsource.net.sf.ehcache</artifactId>
-				<version>1.4.1</version>
+				<version>1.6.0</version>
 				<exclusions>
 					<exclusion>
 						<groupId>org.apache.commons</groupId>
diff --git a/runtime/org.argeo.slc.specs/pom.xml b/runtime/org.argeo.slc.specs/pom.xml
index d5d4ec78e..a1066503c 100644
--- a/runtime/org.argeo.slc.specs/pom.xml
+++ b/runtime/org.argeo.slc.specs/pom.xml
@@ -34,7 +34,8 @@
 							org.argeo.slc.*
 						</Export-Package>
 						<Import-Package>*,
-							org.hibernate.proxy;resolution:="optional"
+							org.hibernate.proxy;resolution:="optional",
+							javassist.util.proxy;resolution:="optional"
 						</Import-Package>
 					</instructions>
 				</configuration>
diff --git a/runtime/org.argeo.slc.support.hibernate/pom.xml b/runtime/org.argeo.slc.support.hibernate/pom.xml
index 165b20b22..ed93e07d8 100644
--- a/runtime/org.argeo.slc.support.hibernate/pom.xml
+++ b/runtime/org.argeo.slc.support.hibernate/pom.xml
@@ -34,7 +34,7 @@
 				<configuration>
 					<instructions>
 						<Fragment-Host>org.argeo.slc.core</Fragment-Host>
-						<Import-Package>*,org.hibernate.proxy</Import-Package>
+						<Import-Package>*,org.hibernate.proxy,javassist.util.proxy</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>
-- 
2.39.2