Branch: refs/heads/wip/6.0 Home: https://github.com/hibernate/hibernate-orm Commit: df675814b611de2d897766cc292846d509a7016b https://github.com/hibernate/hibernate-orm/commit/df675814b611de2d897766c... Author: Vlad Mihalcea <mihalcea.vlad(a)gmail.com&gt; Date: 2019-02-15 (Fri, 15 Feb 2019) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java M hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java A hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/MappedSuperclassInheritanceTest.java M hibernate-core/src/test2/java/org/hibernate/test/inheritance/MappedSuperclassInheritanceTest.java Log Message: ----------- HHH-13217 - Don't throw exception if both @MappedSuperclass and @Inheritance are used