Commit Graph

59 Commits

Author SHA1 Message Date
Strong Liu cda5d8e959 merge master 2013-06-17 22:47:03 +08:00
Steve Ebersole 9699ce41c2 4.3.0.Beta3 2013-05-29 12:48:01 -05:00
Strong Liu b9249e548a merge master 2013-05-06 22:55:00 +08:00
Brett Meyer 9a003f921b 4.3.0.Beta2 release 2013-05-02 15:12:41 -04:00
Strong Liu f29a670378 merge master 2013-04-15 18:33:46 +08:00
Steve Ebersole c259e157b0 HHH-8167 - Adding @NotNull to a @ManyToOne association with @JoinColumnsOrFormulas logs a ClassCastException 2013-04-11 14:30:32 -05:00
Strong Liu 68720548c8 merge master 2013-04-06 12:30:53 +08:00
Steve Ebersole 485a5314e9 4.3.0.Beta1 release 2013-04-03 11:39:14 -05:00
Steve Ebersole 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
Steve Ebersole 4ad49a02c9 HHH-7556 - Clean up packages 2012-08-28 14:12:15 -05:00
Steve Ebersole 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
Strong Liu a4d83a9025 4.1.5.SP1 release 2012-07-12 23:37:15 +08:00
Strong Liu 4eb85795d6 4.1.5 release 2012-07-12 15:20:35 +08:00
Steve Ebersole 986b66eb18 Initial merge from master to metamodel 2012-06-07 16:12:32 -05:00
Steve Ebersole 66aa329b1c 4.1.4 release 2012-05-30 23:18:58 -05:00
Gail Badner 9e1095cafa prep for 4.1.3.Final 2012-05-02 21:37:05 -07:00
Steve Ebersole a5b8203bc0 release 4.1.2 2012-04-04 11:41:02 -05:00
Steve Ebersole 8563fb8a8b release 4.1.1 2012-03-07 21:10:40 -06:00
Steve Ebersole 0e746d2723 HHH-7058 - Remove concept of org.hibernate.metamodel.spi.relational.Tuple 2012-02-13 13:06:34 -06:00
Steve Ebersole b2f447c0b9 4.1 release 2012-02-08 23:25:09 -06:00
Steve Ebersole da6005a7b6 4.1 release 2012-02-08 23:12:45 -06:00
Steve Ebersole 081b2c5a14 4.1 release 2012-02-08 22:29:52 -06:00
Steve Ebersole b6e6f4f628 4.0.1 2012-01-11 12:19:54 -06:00
Steve Ebersole 1a2da08aa3 release 4.0.0.Final 2011-12-14 23:18:36 -06:00
Strong Liu 7bdb5a449d prep 4.0.0.CR7 2011-12-01 13:35:49 +08:00
Steve Ebersole 3913b4d881 prep 4.0.0.CR6 2011-11-10 12:53:05 -06:00
Gail Badner 22f9c7a132 4.0.0.CR5 prep 2011-10-27 03:11:47 -07:00
Steve Ebersole fccd878f6e prep 4.0.0.CR4 2011-09-28 22:08:33 -05:00
Steve Ebersole 55da9dacdf prep 4.0.0.CR3 2011-09-14 21:24:56 -05:00
Steve Ebersole bb476c9610 prepare for 4.0.0.CR2 release 2011-08-31 23:50:09 -05:00
Steve Ebersole 41eb04fe81 release 4.0.0.CR1 2011-08-17 21:05:19 -05:00
Hardy Ferentschik b5ce077a09 Updating changelog for version 4.0.0.Beta5 2011-08-03 14:29:21 +02:00
Steve Ebersole 052ecb3652 release 4.0.0.Beta4 2011-07-21 00:00:22 -05:00
Strong Liu 87db46d430 Added fixes for 4.0.0.Beta3 to changelog.txt 2011-07-07 13:25:12 +08:00
Steve Ebersole 59f498dc93 prepare 4.0.0.Beta2 2011-06-22 16:41:35 -05:00
Steve Ebersole 4b9b4da041 prep 4.0.0.Beta1 release 2011-06-08 21:20:32 -05:00
Steve Ebersole 9c388815ff prepare 4.0.0.Alpha3 2011-05-05 15:46:37 -05:00
Steve Ebersole c930ebcd7d HHH-6191 - repackage org.hibernate.cache per api/spi/internal split 2011-05-04 14:43:04 -05:00
Steve Ebersole 691712fcbb prepare 4.0.0.Alpha2 release 2011-04-06 16:10:02 -05:00
Steve Ebersole 0fece2cf80 prepare 4.0.0.Alpha1 release 2011-03-09 18:22:34 -06:00
Gail Badner f3eb7978fd update changelog.txt for 3.6.0.CR2
git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@20754 1b8cb986-b30d-0410-93ca-fae66ebed9b2
2010-09-29 21:23:58 +00:00
Steve Ebersole f8fef6b6e6 prep 3.6.0.CR1
git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@20640 1b8cb986-b30d-0410-93ca-fae66ebed9b2
2010-09-15 17:34:49 +00:00
Steve Ebersole 80b6cf42af prepare 3.6.0.Beta4
git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@20299 1b8cb986-b30d-0410-93ca-fae66ebed9b2
2010-09-01 16:59:50 +00:00
Steve Ebersole aed4232969 changelog in prep for 3.6.0.Beta3
git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@20167 1b8cb986-b30d-0410-93ca-fae66ebed9b2
2010-08-18 18:42:16 +00:00
Steve Ebersole ddcc4abf47 prep 3.6.0.Beta2 release
git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@20111 1b8cb986-b30d-0410-93ca-fae66ebed9b2
2010-08-04 15:49:30 +00:00
Steve Ebersole 198956f3c9 prep 3.6.0.Beta1 release
git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@19998 1b8cb986-b30d-0410-93ca-fae66ebed9b2
2010-07-21 20:24:04 +00:00
Steve Ebersole 479f4ee4af prepare 3.5.1 release
git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@19235 1b8cb986-b30d-0410-93ca-fae66ebed9b2
2010-04-14 20:50:42 +00:00
Steve Ebersole adffa64173 Updating pom versions to 3.5.0-Final for release tagging
git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@19147 1b8cb986-b30d-0410-93ca-fae66ebed9b2
2010-03-31 17:38:40 +00:00
Steve Ebersole 9bba4e970b Updating pom versions to 3.5.0-CR-2 for release tagging
git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@18877 1b8cb986-b30d-0410-93ca-fae66ebed9b2
2010-02-25 03:49:36 +00:00
Steve Ebersole 1d13a978bb prep 3.5.0-CR-1 release
git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@18768 1b8cb986-b30d-0410-93ca-fae66ebed9b2
2010-02-10 19:08:50 +00:00