Upgrade Hibernate

git-svn-id: https://svn.argeo.org/slc/trunk@2740 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/pom.xml b/pom.xml
index a576c7aae831b460a213390997281606c503fda7..721a5dd20b0ad600f61d871c5e495d498e8695f3 100644 (file)
--- 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 d5d4ec78e1f4c0d949ee9dca9344681327956ec8..a1066503cc669b6b1fb1333df73580a3e16b3ef5 100644 (file)
--- 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 165b20b22cd387bf3400fccef4ce613d0f224f54..ed93e07d8306058ef5217c952dc9a8147f7fe91d 100644 (file)
--- 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>