Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-orm Commit: 5b11014c7caffd294fa671b257f8fbd41340a67b https://github.com/hibernate/hibernate-orm/commit/5b11014c7caffd294fa671b... Author: Vlad Mihalcea <mihalcea.vlad(a)gmail.com&gt; Date: 2019-03-06 (Wed, 06 Mar 2019) Changed paths: M hibernate-core/src/test/java/org/hibernate/test/inheritance/MappedSuperclassInheritanceTest.java Log Message: ----------- HHH-13217 - Don't throw exception if both @MappedSuperclass and @Inheritance are used Make sure the @Inheritance annotation is ignored when used along with @MappedSuperclass Commit: 59749984cb803eb3990fcd41f490a87cf578a045 https://github.com/hibernate/hibernate-orm/commit/59749984cb803eb3990fcd4... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2019-03-06 (Wed, 06 Mar 2019) Changed paths: M hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java M hibernate-core/src/test/java/org/hibernate/test/inheritance/MappedSuperclassInheritanceTest.java Log Message: ----------- HHH-13217 : Correct warning and update test to fail if the query succeeds Compare: https://github.com/hibernate/hibernate-orm/compare/f086821abd3b...5974998...