af115fe5a8
Merge branch 'master' into metamodel
...
Conflicts:
hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
hibernate-core/src/main/java/org/hibernate/cache/internal/NoCachingRegionFactory.java
hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java
hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java
hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationIntegrator.java
hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java
hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java
hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java
hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.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/internal/StoredProcedureCallImpl.java
hibernate-core/src/main/java/org/hibernate/jaxb/internal/JaxbConfigurationProcessor.java
hibernate-core/src/main/java/org/hibernate/jaxb/internal/JaxbMappingProcessor.java
hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataBuilderImpl.java
hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/AnnotationMetadataSourceProcessorImpl.java
hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/Helper.java
hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HibernateMappingProcessor.java
hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/IdentifierGeneratorResolver.java
hibernate-core/src/main/java/org/hibernate/service/ConfigLoader.java
hibernate-core/src/main/java/org/hibernate/service/ServiceRegistryBuilder.java
hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java
hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java
hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
hibernate-core/src/main/java/org/hibernate/type/EnumType.java
hibernate-core/src/test/java/org/hibernate/metamodel/binding/AbstractBasicBindingTests.java
hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/MetadataImplTest.java
hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/IdentifierGeneratorTest.java
hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/MapsIdTest.java
hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/FetchProfileBinderTest.java
hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/QueryBinderTest.java
hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/BaseAnnotationIndexTestCase.java
hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelperTest.java
hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/OrmXmlParserTests.java
hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/XmlHelper.java
hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/SimpleValueBindingTests.java
hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/UnidirectionalManyToManyBindingTests.java
hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/HibernateSequenceTest.java
hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
hibernate-core/src/test/java/org/hibernate/test/common/BasicTestingJdbcServiceImpl.java
hibernate-core/src/test/java/org/hibernate/test/common/JdbcConnectionAccessImpl.java
hibernate-core/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java
hibernate-core/src/test/java/org/hibernate/test/connections/ConnectionManagementTestCase.java
hibernate-core/src/test/java/org/hibernate/test/connections/ThreadLocalCurrentSessionTest.java
hibernate-core/src/test/java/org/hibernate/test/events/CallbackTest.java
hibernate-core/src/test/java/org/hibernate/test/flush/TestAutoFlushBeforeQueryExecution.java
hibernate-core/src/test/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java
hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorTest.java
hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java
hibernate-core/src/test/java/org/hibernate/test/propertyref/DoesNotWorkTest.java
hibernate-core/src/test/java/org/hibernate/test/propertyref/DoesNotWorkWithHbmTest.java
hibernate-core/src/test/java/org/hibernate/test/service/ClassLoaderServiceImplTest.java
hibernate-core/src/test/resources/org/hibernate/jmx/Entity.hbm.xml
hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/AbstractEhcacheRegionFactory.java
hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/PersistenceXmlParser.java
hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/CallbackProcessorImpl.java
hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/spi/JpaIntegrator.java
hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/tm/HibernateTransactionManagerLookup.java
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java
hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseAnnotationBindingTestCase.java
hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
2012-09-10 14:20:38 -05:00
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
110c3a4b92
HHH-7550 - Fix UP-TO-DATE checking for APT-based tasks
2012-08-24 20:39:53 -05:00
8e8d681c7e
Merge branch 'master' into metamodel
2012-08-23 22:54:33 +08:00
581f037dee
HHH-7514 - Upgrade to Jandex 1.1
2012-08-22 17:35:35 -05:00
fd8a45b2b2
HHH-7514 - Upgrade to Jandex 1.1
2012-08-22 13:41:16 -05:00
7a82349f75
HHH-7385 change to use gradle 1.1
2012-08-08 17:09:11 +08:00
0ad058f69f
HHH-6315 Removing slf4j dependency and upgrading Validator version
2012-08-03 16:20:16 +02:00
8de0f9e875
HHH-7468 Recreate toString value holder after deserialization
2012-08-02 13:30:21 +08:00
42a3061f3e
Merge branch 'master' into metamodel
...
Conflicts:
hibernate-core/src/main/java/org/hibernate/engine/spi/NamedQueryDefinition.java
hibernate-core/src/main/java/org/hibernate/internal/SQLQueryImpl.java
hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/AnnotationBindingContextImpl.java
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/QueryProcessor.java
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/CompositePluralAttributeElementSourceImpl.java
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/MappingDocument.java
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/TimestampAttributeSourceImpl.java
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/VersionAttributeSourceImpl.java
hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/EntityBindingContext.java
hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/ComponentAttributeSourceImpl.java
hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HibernateMappingProcessor.java
hibernate-core/src/main/java/org/hibernate/metamodel/spi/domain/Composite.java
hibernate-core/src/main/java/org/hibernate/metamodel/spi/source/BindingContext.java
hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
hibernate-core/src/main/resources/org/hibernate/hibernate-mapping-4.0.xsd
hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/SimpleValueBindingTests.java
hibernate-entitymanager/src/main/java/org/hibernate/ejb/AvailableSettings.java
hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/event/CallbackResolver.java
2012-07-19 15:50:50 -05:00
6f1423a8e3
update master build SNAPSHOT target to 4.2
2012-07-19 08:56:31 -05:00
f8d06216e5
HHH-7451 - Integrate Draft 7 of the JPA 2.1 spec : criterias
2012-07-18 17:48:59 -05:00
9ce3afd8da
HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : AttributeConverter + HEM boot cleanup (HHH-6159)
2012-07-18 17:03:09 -05:00
2adab60d15
HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : TREAT
2012-07-18 16:52:32 -05:00
00059fee2f
HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec
2012-07-18 16:48:45 -05:00
de1d647a62
HHH-7450 add simplify plugin
2012-07-16 17:21:59 +08:00
91a9e0f616
HHH-7450 add simplify plugin
2012-07-16 17:06:29 +08:00
ccc58c50ae
prepare for 4.1.6 development
2012-07-13 01:06:17 +08:00
a4d83a9025
4.1.5.SP1 release
2012-07-12 23:37:15 +08:00
e76830ade0
post 4.1.5 development
2012-07-12 22:33:52 +08:00
4eb85795d6
4.1.5 release
2012-07-12 15:20:35 +08:00
986b66eb18
Initial merge from master to metamodel
2012-06-07 16:12:32 -05:00
8509c08761
4.1.4 release
2012-05-30 23:48:19 -05:00
66aa329b1c
4.1.4 release
2012-05-30 23:18:58 -05:00
3791267442
pass all System properties passed to Gradle that happen to start with 'hibernate.' to the System properties of the tests it spawns
2012-05-16 11:59:22 -05:00
606752f867
Update version to 4.1.4-SNAPSHOT
2012-05-02 23:51:04 -07:00
9e1095cafa
prep for 4.1.3.Final
2012-05-02 21:37:05 -07:00
e46d799bbe
re-release 4.1.2 with 'Final' qualifier
2012-04-05 14:13:38 -05:00
2c9949fe5d
re-release 4.1.2 with 'Final' qualifier
2012-04-05 13:50:41 -05:00
a30a1adc3d
release 4.1.2
2012-04-04 12:12:16 -05:00
a5b8203bc0
release 4.1.2
2012-04-04 11:41:02 -05:00
e4a82a0b6b
HHH-7197 - update build scripts to not use deprecated gradle apis and change manual's xml declation to use doc namespace
2012-03-26 15:12:10 +08:00
d2852e3c4d
a little improvment on the build script
2012-03-23 16:02:45 +08:00
749f7c1eb5
HHH-6271 fixes build error when tools.jar is not on classpath (linux)
2012-03-20 13:13:23 +08:00
60c1b23c7b
HHH-6271 Introducing Byteman in order to really test that a certain log message gets never called.
2012-03-19 23:19:46 +08:00
3a5bb1f571
upgrade to junit 4.10
...
exclude xml-api which is part of JDK 6/7
change jboss-logging to make it JDK7 compatibile
2012-03-13 16:12:46 +08:00
ab80780cf1
release 4.1.1
2012-03-07 21:12:11 -06:00
8563fb8a8b
release 4.1.1
2012-03-07 21:10:40 -06:00
f31dd33b5f
HHH-7037 creating a new util package
2012-03-07 15:29:20 +01:00
b4659173a8
1. remove commons-collections dependency.
...
2. moved org.hibernate.internal.util.collections.ConcurrentReferenceHashMap from envers module to core, and change it to doesn't allow null key / value.
3. Using ConcurrentReferenceHashMap this to replace old ReferenceMap (from commons-collections) which used in StatefulPersistenceContext.
4. copied org.hibernate.internal.util.collections.BoundedConcurrentHashMap from infinispan code base.
5. deprecate properties QUERY_PLAN_CACHE_MAX_STRONG_REFERENCES and QUERY_PLAN_CACHE_MAX_SOFT_REFERENCES
6. add two new properties QUERY_PLAN_CACHE_PARAMETER_METADATA_MAX_SIZE and QUERY_PLAN_CACHE_MAX_SIZE
7. remove LRUMap, SimpleMRUCache and SoftLimitMRUCache
2012-03-06 23:28:22 +08:00
a12f50c870
upgrade to use gradle 1.0 M8a
2012-02-28 16:47:34 +08:00
13f4c830e1
change to use gradle-upload-auth-plugin v1.1.1 since v1.1.0 is not available in the jboss nexus
2012-02-20 16:45:48 +08:00
975141f27e
better idea support
2012-02-20 16:36:18 +08:00
4843d357df
HHH-7067 fix idea config issue and format
2012-02-17 10:52:26 +08:00
a21ba713ab
HHH-7067 - Update build to work with Gradle m8
2012-02-15 16:38:24 -06:00
7861fdee44
HHH-7067 - Update build to work with Gradle m8
2012-02-15 16:33:45 -06:00
8f223d199b
HHH-7062 upgrade to jboss-logging 3.1.0.GA
2012-02-14 15:58:01 +08:00
10a12295e3
4.1 release
2012-02-09 00:46:36 -06:00
081b2c5a14
4.1 release
2012-02-08 22:29:52 -06:00
23891ff11a
4.0.1
2012-01-11 14:05:37 -06:00
Steve Ebersole
Hardy Ferentschik
Strong Liu
Eric Dalquist
Gail Badner