diff --git a/build.gradle b/build.gradle index c3687534faa..4f8a4686105 100644 --- a/build.gradle +++ b/build.gradle @@ -417,7 +417,7 @@ project('spring-orm') { // compiling against both hibernate 3 and 4 here in order to support // our respective orm.hibernate3 and orm.hibernate4 packages compile("aopalliance:aopalliance:1.0") - compile("org.hibernate:com.springsource.org.hibernate:3.3.1.GA", optional) + compile("org.hibernate:hibernate-core:3.3.2.GA", optional) compile("org.hibernate:hibernate-cglib-repack:2.1_3", optional) compile("org.hibernate:hibernate-annotations:3.4.0.GA", optional) compile("org.hibernate:hibernate-entitymanager:3.4.0.GA", optional) @@ -428,7 +428,7 @@ project('spring-orm') { compile("javax.jdo:jdo-api:3.0", optional) compile("org.apache.ibatis:ibatis-sqlmap:2.3.4.726", optional) testCompile "javax.servlet:servlet-api:2.5" - testCompile "org.slf4j:slf4j-jcl:1.5.3" + testCompile "org.slf4j:slf4j-jcl:1.6.1" testCompile "commons-dbcp:commons-dbcp:1.2.2" testCompile "org.eclipse.persistence:org.eclipse.persistence.asm:1.0.1" testCompile "org.eclipse.persistence:org.eclipse.persistence.antlr:1.0.1" diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/CglibProxyBridgeMethodTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/CglibProxyBridgeMethodTests.java deleted file mode 100644 index 4a6c4e00a2e..00000000000 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/CglibProxyBridgeMethodTests.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright 2002-2009 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.orm.hibernate3; - -import java.io.Serializable; - -import org.hibernate.proxy.HibernateProxy; -import org.hibernate.proxy.pojo.cglib.CGLIBLazyInitializer; -import org.junit.Test; - -import org.springframework.beans.BeanUtils; - -/** - * Test for compatibility of Spring's BeanUtils and its BridgeMethodResolver use - * when operating on a Hibernate-generated CGLIB proxy class. - * - * @author Arnout Engelen - * @author Juergen Hoeller - */ -public class CglibProxyBridgeMethodTests { - - @Test - public void introspectHibernateProxyForGenericClass() { - BeanUtils.getPropertyDescriptor(CglibInstantieMedewerker.class, "organisatie"); - Class clazz = CGLIBLazyInitializer.getProxyFactory( - CglibInstantieMedewerker.class, new Class[] {HibernateProxy.class}); - BeanUtils.getPropertyDescriptor(clazz, "organisatie"); - } - - - public interface CglibIOrganisatie { - } - - - public class CglibOrganisatie implements CglibIOrganisatie { - } - - - public class CglibInstantie extends CglibOrganisatie { - } - - - public interface CglibIOrganisatieMedewerker { - - void setOrganisatie(T organisatie); - } - - - public class CglibOrganisatieMedewerker implements CglibIOrganisatieMedewerker { - - public void setOrganisatie(CglibOrganisatie organisatie) { - } - } - - - public class CglibInstantieMedewerker extends CglibOrganisatieMedewerker implements Serializable { - } - -}