Branch: refs/heads/5.0 Home: https://github.com/hibernate/hibernate-orm Commit: 2aa76b3ef946d4a26a24d187d7ff6f74689450b2 https://github.com/hibernate/hibernate-orm/commit/2aa76b3ef946d4a26a24d18... Author: barreiro <lbbbarreiro(a)gmail.com&gt; Date: 2016-07-01 (Fri, 01 Jul 2016) Changed paths: M hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/EntityEnhancer.java M hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/PersistentAttributesEnhancer.java M hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/PersistentAttributesHelper.java M hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTest.java A hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/mapped/MappedSuperclassTestTask.java Log Message: ----------- HHH-10646 - [enhancer] Add support for @MappedSuperclass (cherry picked from commit e615d76a261d1825d9c6581b03ede7e393a13428) Conflicts: hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTest.java Commit: 70bb620644daaf0da8441c9bbb81e16e8b3a3ead https://github.com/hibernate/hibernate-orm/commit/70bb620644daaf0da8441c9... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2016-07-01 (Fri, 01 Jul 2016) Changed paths: M hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/mapped/MappedSuperclassTestTask.java Log Message: ----------- HHH-10646 : Correct to backport Commit: e8cab909c061886cfb78b85da90648a7a9e1a95c https://github.com/hibernate/hibernate-orm/commit/e8cab909c061886cfb78b85... Author: barreiro <lbbbarreiro(a)gmail.com&gt; Date: 2016-07-01 (Fri, 01 Jul 2016) Changed paths: M hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/CompositeEnhancer.java M hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/EntityEnhancer.java A hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/MappedSuperclassEnhancer.java M hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/PersistentAttributesEnhancer.java M hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/DefaultEnhancementContext.java M hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContext.java M hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/Enhancer.java A hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedMappedSuperclass.java M hibernate-core/src/main/java/org/hibernate/tool/enhance/EnhancementTask.java M hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/mapped/MappedSuperclassTestTask.java M hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/enhance/EnhancingClassTransformerImpl.java M tooling/hibernate-enhance-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/MavenEnhancePlugin.java M tooling/hibernate-gradle-plugin/src/main/groovy/org/hibernate/orm/tooling/gradle/HibernatePlugin.java Log Message: ----------- HHH-10801 - Bytecode enhancement of @MappedSuperclass (cherry picked from commit cdc69a475bb9f37a61e571950072eaf777086cae) Conflicts: hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/mapped/MappedSuperclassTestTask.java Compare: https://github.com/hibernate/hibernate-orm/compare/4f3391a59249...e8cab90...