Skip to content

Commit fde0713

Browse files
committed
Upgrade to Hibernate 4.2.16 (and AspectJ 1.8.3)
1 parent 4729483 commit fde0713

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
@@ -19,11 +19,11 @@ configure(allprojects) { project ->
1919
group = "org.springframework"
2020
version = qualifyVersionIfNecessary(version)
2121

22-
ext.aspectjVersion = "1.8.2"
22+
ext.aspectjVersion = "1.8.3"
2323
ext.eclipseLinkVersion = "2.4.2"
2424
ext.groovyVersion = "1.8.9"
2525
ext.hibernate3Version = "3.6.10.Final"
26-
ext.hibernate4Version = "4.2.15.Final"
26+
ext.hibernate4Version = "4.2.16.Final"
2727
ext.hibVal4Version = "4.3.2.Final"
2828
ext.hsqldbVersion = "2.3.2"
2929
ext.jackson1Version = "1.9.13"

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;
@@ -85,7 +84,8 @@ public class LocalSessionFactoryBean extends HibernateExceptionTranslator
8584

8685
private Interceptor entityInterceptor;
8786

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

9090
private Object jtaTransactionManager;
9191

@@ -219,7 +219,8 @@ public void setEntityInterceptor(Interceptor entityInterceptor) {
219219
* physical column and table names given the info in the mapping document.
220220
* @see org.hibernate.cfg.Configuration#setNamingStrategy
221221
*/
222-
public void setNamingStrategy(NamingStrategy namingStrategy) {
222+
@SuppressWarnings("deprecation")
223+
public void setNamingStrategy(org.hibernate.cfg.NamingStrategy namingStrategy) {
223224
this.namingStrategy = namingStrategy;
224225
}
225226

0 commit comments

Comments
 (0)