Skip to content

Commit d1288fd

Browse files
committed
Upgrade to Hibernate 4.3.7 (and Netty 4.0.24)
1 parent 965bea7 commit d1288fd

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ configure(allprojects) { project ->
3333
ext.ehcacheJCacheVersion = "1.0.0"
3434
ext.groovyVersion = "2.3.7"
3535
ext.hibernate3Version = "3.6.10.Final"
36-
ext.hibernate4Version = "4.3.6.Final"
36+
ext.hibernate4Version = "4.3.7.Final"
3737
ext.hibVal4Version = "4.3.2.Final"
3838
ext.hibVal5Version = "5.1.3.Final"
3939
ext.hsqldbVersion = "2.3.2"
@@ -43,7 +43,7 @@ configure(allprojects) { project ->
4343
ext.jettyVersion = "9.2.3.v20140905"
4444
ext.jodaVersion = "2.5"
4545
ext.junitVersion = "4.11"
46-
ext.nettyVersion = "4.0.23.Final"
46+
ext.nettyVersion = "4.0.24.Final"
4747
ext.openJpaVersion = "2.2.2" // 2.3.0 not Java 8 compatible (based on ASM 4)
4848
ext.protobufVersion = "2.6.0"
4949
ext.reactorVersion = "1.1.5.RELEASE"

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.hibernate.SessionFactory;
2626
import org.hibernate.cache.spi.RegionFactory;
2727
import org.hibernate.cfg.Configuration;
28-
import org.hibernate.cfg.NamingStrategy;
2928

3029
import org.springframework.beans.factory.DisposableBean;
3130
import org.springframework.beans.factory.FactoryBean;
@@ -86,7 +85,8 @@ public class LocalSessionFactoryBean extends HibernateExceptionTranslator
8685

8786
private Interceptor entityInterceptor;
8887

89-
private NamingStrategy namingStrategy;
88+
@SuppressWarnings("deprecation")
89+
private org.hibernate.cfg.NamingStrategy namingStrategy;
9090

9191
private Object jtaTransactionManager;
9292

@@ -222,7 +222,8 @@ public void setEntityInterceptor(Interceptor entityInterceptor) {
222222
* physical column and table names given the info in the mapping document.
223223
* @see org.hibernate.cfg.Configuration#setNamingStrategy
224224
*/
225-
public void setNamingStrategy(NamingStrategy namingStrategy) {
225+
@SuppressWarnings("deprecation")
226+
public void setNamingStrategy(org.hibernate.cfg.NamingStrategy namingStrategy) {
226227
this.namingStrategy = namingStrategy;
227228
}
228229

0 commit comments

Comments
 (0)