Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,003 Commits 28 Branches 362 Tags 356 MiB
Commit Graph

17 Commits

Author SHA1 Message Date
Strong Liu 7881b4d6b6 resolve merge confilts 2013-03-18 20:12:26 +08:00
Steve Ebersole 2c5098b9c6 HHH-7997 - Integrate changes to EntityGraphs 2013-03-13 12:11:12 -05:00
Brett Meyer ccb81b9c25 HHH-7519 Upgrade byteman version 2013-02-20 16:54:00 -05:00
Brett Meyer 56867417e2 HHH-7527 Enterprise OSGi JPA support 2013-02-14 10:44:35 -05:00
Steve Ebersole 5c453fee8d HHH-7957 - Integrate Public Review Draft of the JPA 2.1 spec : entity graph support - phase 1 2013-02-03 14:23:59 -06:00
Brett Meyer 42bdb1b26d HHH-7923 Revert to Javassist 3.15 2013-01-14 20:37:16 -05:00
Brett Meyer c33fdae563 Merge remote-tracking branch 'origin/master' into metamodel 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/LockOptions.java
	hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java
	hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCollectionCacheEntry.java
	hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredMapCacheEntry.java
	hibernate-core/src/main/java/org/hibernate/cache/spi/entry/UnstructuredCacheEntry.java
	hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java
	hibernate-core/src/main/java/org/hibernate/id/TableGenerator.java
	hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
	hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/relational/Database.java
	hibernate-core/src/main/java/org/hibernate/metamodel/relational/Table.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/HibernateTypeResolver.java
	hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/Index.java
	hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/UniqueKey.java
	hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
	hibernate-core/src/main/java/org/hibernate/type/ArrayType.java
	hibernate-core/src/main/java/org/hibernate/type/Type.java
	hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintTest.java
	hibernate-core/src/test/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java
	hibernate-core/src/test/java/org/hibernate/test/criterion/CriterionTest.java
	hibernate-core/src/test/resources/org/hibernate/test/propertyref/inheritence/union/Person.hbm.xml
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java
 2012-12-20 00:09:45 -05:00
brmeyer c8aa47ba22 HHH-7435 Performance bottleneck on Javassist 2012-12-11 18:03:06 -05:00
Brett Meyer 18e44d1739 Merge branch master into metamodel 2012-11-15 15:01:13 -05:00
Galder Zamarreño 9ec6eedca8 HHH-7553 Upgrade to Infinispan 5.2.0.Beta3 2012-11-08 10:16:37 +01:00
Galder Zamarreño cf9ef94f8e HHH-7553 Upgrade to Infinispan 5.2.0.Beta2 and fix testsuite 2012-10-26 17:46:03 +02:00
Hardy Ferentschik d7fdf278df HHH-7322 Refactoring of unidirectional one to many test to cater for hbm and annotations 
Adding some error handling in Binder for the case that not all configuration sources are added
Upgrading JBoss logging
 2012-08-31 20:36:48 +02:00
Strong Liu 8e8d681c7e Merge branch 'master' into metamodel 2012-08-23 22:54:33 +08:00
Steve Ebersole fd8a45b2b2 HHH-7514 - Upgrade to Jandex 1.1 2012-08-22 13:41:16 -05:00
Sanne Grinovero 94aa561e19 HHH-7367 Upgrade to Infinispan 5.1.6.FINAL 2012-08-14 10:43:07 +08:00
Strong Liu 851da741a3 HHH-7385 change to use gradle 1.1 2012-08-08 19:08:38 +08:00
Strong Liu 7a82349f75 HHH-7385 change to use gradle 1.1 2012-08-08 17:09:11 +08:00