Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-orm Commit: f2e4e32558301f779023f27cb3d8abe4bfaae369 https://github.com/hibernate/hibernate-orm/commit/f2e4e32558301f779023f27... Author: Tim Ward <timothyjward(a)apache.org&gt; Date: 2013-03-27 (Wed, 27 Mar 2013) Changed paths: M libraries.gradle Log Message: ----------- HHH-8095 Update javax.transaction dependency so that it auto-generates a version range Conflicts: libraries.gradle Commit: e9e29a40be095445380794ec1993c7282efcb5a7 https://github.com/hibernate/hibernate-orm/commit/e9e29a40be095445380794e... Author: Brett Meyer <brett(a)3riverdev.com&gt; Date: 2013-03-27 (Wed, 27 Mar 2013) Changed paths: M hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistryBuilder.java M hibernate-entitymanager/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java R hibernate-osgi/src/main/java/org/hibernate/osgi/CachedBundle.java M hibernate-osgi/src/main/java/org/hibernate/osgi/HibernateBundleActivator.java M hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiClassLoader.java A hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiPersistenceProvider.java A hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiPersistenceProviderService.java A hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiSessionFactoryService.java Log Message: ----------- HHH-8096 Re-work the OSGi class loading concepts Conflicts: hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java hibernate-osgi/src/main/java/org/hibernate/osgi/HibernateBundleActivator.java Compare: https://github.com/hibernate/hibernate-orm/compare/7d99ca57f3da...e9e29a4...