Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-orm Commit: f77b068e91106d2f52efb85d9b07a91dd10c9481 https://github.com/hibernate/hibernate-orm/commit/f77b068e91106d2f52efb85... Author: Brad Koehn <brad.koehn(a)thomsonreuters.com&gt; Date: 2013-03-29 (Fri, 29 Mar 2013) Changed paths: M hibernate-core/src/main/java/org/hibernate/type/EntityType.java M hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/CriteriaQueryImpl.java M hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/predicate/InPredicate.java M hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/metamodel/AbstractIdentifiableType.java M hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/metamodel/AbstractManagedType.java M hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/metamodel/AbstractType.java M hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/metamodel/AttributeFactory.java M hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/metamodel/EmbeddableTypeImpl.java M hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/metamodel/EntityTypeImpl.java A hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/metamodel/MapMember.java M hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/metamodel/MappedSuperclassTypeImpl.java M hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/metamodel/MetadataContext.java M hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/metamodel/MetamodelImpl.java Log Message: ----------- HHH-7714 Add support for EntityMode.MAP to JPA Criteria API (cherry picked from commit 2758b8b49400b3aae6fbbfc78226f1f622f1bae5) Conflicts: hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/predicate/InPredicate.java hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/metamodel/MetadataContext.java