Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Hibernate 4.2.16 (and AspectJ 1.8.3)

Browse Source
This commit is contained in:
Juergen Hoeller
2014-11-01 13:00:39 +01:00
parent 4729483804
commit fde0713a94
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -19,11 +19,11 @@ configure(allprojects) { project ->
group = "org.springframework"
version = qualifyVersionIfNecessary(version)
ext.aspectjVersion = "1.8.2"
ext.aspectjVersion = "1.8.3"
ext.eclipseLinkVersion = "2.4.2"
ext.groovyVersion = "1.8.9"
ext.hibernate3Version = "3.6.10.Final"
ext.hibernate4Version = "4.2.15.Final"
ext.hibernate4Version = "4.2.16.Final"
ext.hibVal4Version = "4.3.2.Final"
ext.hsqldbVersion = "2.3.2"
ext.jackson1Version = "1.9.13"

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;
@@ -85,7 +84,8 @@ public class LocalSessionFactoryBean extends HibernateExceptionTranslator
private Interceptor entityInterceptor;
private NamingStrategy namingStrategy;
@SuppressWarnings("deprecation")
private org.hibernate.cfg.NamingStrategy namingStrategy;
private Object jtaTransactionManager;
@@ -219,7 +219,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;
}