From d1288fdb7c47c2f60cf4027ac32e73638be375c9 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 1 Nov 2014 13:00:39 +0100 Subject: [PATCH] Upgrade to Hibernate 4.3.7 (and Netty 4.0.24) --- build.gradle | 4 ++-- .../orm/hibernate4/LocalSessionFactoryBean.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index a22bf490724..df604d3cfc9 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ configure(allprojects) { project -> ext.ehcacheJCacheVersion = "1.0.0" ext.groovyVersion = "2.3.7" ext.hibernate3Version = "3.6.10.Final" - ext.hibernate4Version = "4.3.6.Final" + ext.hibernate4Version = "4.3.7.Final" ext.hibVal4Version = "4.3.2.Final" ext.hibVal5Version = "5.1.3.Final" ext.hsqldbVersion = "2.3.2" @@ -43,7 +43,7 @@ configure(allprojects) { project -> ext.jettyVersion = "9.2.3.v20140905" ext.jodaVersion = "2.5" ext.junitVersion = "4.11" - ext.nettyVersion = "4.0.23.Final" + ext.nettyVersion = "4.0.24.Final" ext.openJpaVersion = "2.2.2" // 2.3.0 not Java 8 compatible (based on ASM 4) ext.protobufVersion = "2.6.0" ext.reactorVersion = "1.1.5.RELEASE" diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java index 25cc4295fa9..7a42e295d6d 100644 --- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java +++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java @@ -25,7 +25,6 @@ import org.hibernate.Interceptor; import org.hibernate.SessionFactory; import org.hibernate.cache.spi.RegionFactory; import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.NamingStrategy; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; @@ -86,7 +85,8 @@ public class LocalSessionFactoryBean extends HibernateExceptionTranslator private Interceptor entityInterceptor; - private NamingStrategy namingStrategy; + @SuppressWarnings("deprecation") + private org.hibernate.cfg.NamingStrategy namingStrategy; private Object jtaTransactionManager; @@ -222,7 +222,8 @@ public class LocalSessionFactoryBean extends HibernateExceptionTranslator * physical column and table names given the info in the mapping document. * @see org.hibernate.cfg.Configuration#setNamingStrategy */ - public void setNamingStrategy(NamingStrategy namingStrategy) { + @SuppressWarnings("deprecation") + public void setNamingStrategy(org.hibernate.cfg.NamingStrategy namingStrategy) { this.namingStrategy = namingStrategy; }