Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: adc6059a2158f0bdafc83b65763b4e1936bfa9fd https://github.com/hibernate/hibernate-orm/commit/adc6059a2158f0bdafc83b6... Author: ouzned <ouzned.alleykatze(a)gmail.com&gt; Date: 2013-06-07 (Fri, 07 Jun 2013) Changed paths: M hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java M hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/BasicCriteriaUsageTest.java Log Message: ----------- HHH-8283 JdbcSQLException with CompositeCustomType and java.util.Date Conflicts: hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/QueryImpl.java hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/basic/BasicCriteriaUsageTest.java Commit: 927a25ec210d403245715a2d9fc9a4e2628c9412 https://github.com/hibernate/hibernate-orm/commit/927a25ec210d403245715a2... Author: Brett Meyer <brmeyer(a)redhat.com&gt; Date: 2013-06-07 (Fri, 07 Jun 2013) Changed paths: M documentation/src/main/docbook/devguide/en-US/chapters/osgi/OSGi.xml Log Message: ----------- HHH-8112 Added additional caveats to OSGi devguide Compare: https://github.com/hibernate/hibernate-orm/compare/80dc1e6fd1d1...927a25e...