root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Upgrade to Hibernate 4.3.7 (and Netty 4.0.24)

This commit is contained in:
Juergen Hoeller 2014-11-01 13:00:39 +01:00
parent 965bea7b3e
commit d1288fdb7c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -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"

7
spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java
View File

@ -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;
}