Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: e38cb21ef28f04402b51ef8ab67d2e9a8afa127f https://github.com/hibernate/hibernate-orm/commit/e38cb21ef28f04402b51ef8... Author: Brett Meyer <brett(a)3riverdev.com&gt; Date: 2013-11-26 (Tue, 26 Nov 2013) Changed paths: M hibernate-core/src/main/java/org/hibernate/bytecode/internal/javassist/ProxyFactoryFactoryImpl.java M hibernate-core/src/main/java/org/hibernate/proxy/pojo/javassist/JavassistLazyInitializer.java Log Message: ----------- HHH-8748 replace Javassist's ProxyObject with Proxy Conflicts: hibernate-core/src/main/java/org/hibernate/bytecode/internal/javassist/ProxyFactoryFactoryImpl.java hibernate-core/src/main/java/org/hibernate/proxy/pojo/javassist/JavassistLazyInitializer.java