Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-orm Commit: 06fb9e70db2af2b39b8bb932c1b344718ff20944 https://github.com/hibernate/hibernate-orm/commit/06fb9e70db2af2b39b8bb93... Author: Steve Ebersole <steve(a)hibernate.org&gt; Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java A hibernate-core/src/main/java/org/hibernate/metamodel/spi/TypeContributions.java A hibernate-core/src/main/java/org/hibernate/metamodel/spi/TypeContributor.java Log Message: ----------- HHH-7998 - Add TypeContributions contract Conflicts: hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataImpl.java hibernate-core/src/main/java/org/hibernate/metamodel/spi/TypeContributor.java Commit: 04fe84994d848536d591b6d592c5cf80fb9386dd https://github.com/hibernate/hibernate-orm/commit/04fe84994d848536d591b6d... Author: Brett Meyer <brett(a)3riverdev.com&gt; Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java M hibernate-core/src/main/java/org/hibernate/metamodel/spi/TypeContributor.java M hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java A hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/TypeContributorImpl.java A hibernate-envers/src/main/resources/META-INF/services/org.hibernate.metamodel.spi.TypeContributor M hibernate-envers/src/main/resources/OSGI-INF/blueprint/blueprint.xml M hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiPersistenceProvider.java M hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiSessionFactoryService.java Log Message: ----------- HHH-7995 Added support for TypeContributors in OSGi. Integrated with envers Conflicts: hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiPersistenceProvider.java hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiSessionFactoryService.java Commit: fe9e2798decfac61dbfd24227288199446690145 https://github.com/hibernate/hibernate-orm/commit/fe9e2798decfac61dbfd242... Author: Brett Meyer <brett(a)3riverdev.com&gt; Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M hibernate-envers/src/main/java/org/hibernate/envers/configuration/spi/AuditConfiguration.java Log Message: ----------- HHH-7944 envers classloader issues Conflicts: hibernate-envers/src/main/java/org/hibernate/envers/configuration/spi/AuditConfiguration.java Compare: https://github.com/hibernate/hibernate-orm/compare/459c061eb623...fe9e279...