Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-orm Commit: 5a2f12a9a8c86f12a7ee129ba1d6cd374bffd6ab https://github.com/hibernate/hibernate-orm/commit/5a2f12a9a8c86f12a7ee129... Author: Vlad Mihalcea <mihalcea.vlad(a)gmail.com&gt; Date: 2018-09-24 (Mon, 24 Sep 2018) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java A hibernate-core/src/test/java/org/hibernate/test/inheritance/MappedSuperclassInheritanceTest.java Log Message: ----------- HHH-12653 - Throw MappingException if both @MappedSuperclass and @Inheritance are used **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.