Commit Graph

227 Commits

Author SHA1 Message Date
Brett Meyer 779b86055a HHH-6315 removed slf4j dependencies 2013-08-22 23:12:03 -04:00
Strong Liu cda5d8e959 merge master 2013-06-17 22:47:03 +08:00
Brett Meyer b4ab20a97b HHH-8117 Add package export versions in OSGi manifests 2013-06-07 14:29:35 -04:00
Steve Ebersole d874bc4737 4.3.0.Beta3 2013-05-29 13:42:26 -05:00
Steve Ebersole 9699ce41c2 4.3.0.Beta3 2013-05-29 12:48:01 -05:00
Strong Liu a3184e16cb merge master 2013-05-20 11:23:00 -07:00
Steve Ebersole 7bd9ba2adf HHH-8144 - Create a 'release' task that performs all tasks needed for doing a release 2013-05-16 18:52:27 -05:00
Strong Liu 96ce0d2742 merge master 2013-05-13 18:55:37 +08:00
Steve Ebersole 1337d36a79 HHH-8235 - Drop database profiles upstream 2013-05-10 15:59:02 -05:00
Steve Ebersole 5373be01df HHH-8232 - Upgrade to Gradle 1.6 2013-05-10 11:10:29 -05:00
Steve Ebersole e9a54405c2 HHH-8232 - Upgrade to Gradle 1.6 2013-05-09 20:33:19 -05:00
Steve Ebersole 40373412e0 HHH-8220 - pom dependencies scope changed from compile to runtime 2013-05-07 21:19:15 -05:00
Steve Ebersole 2bc63badea HHH-8220 - pom dependencies scope changed from compile to runtime 2013-05-07 08:02:33 -05:00
Strong Liu 7004914ec0 HHH-8159 - Apply fixups indicated by analysis tools 2013-05-07 13:30:29 +08:00
Gunnar Morling 77a4c3e52e HHH-8219 - Adding Animal Sniffer plug-in to make sure only Java 6 APIs are used 2013-05-06 22:16:57 +02:00
Strong Liu b9249e548a merge master 2013-05-06 22:55:00 +08:00
Brett Meyer f40f814b00 4.3.0.Beta2 post release 2013-05-02 15:44:41 -04:00
Brett Meyer 9a003f921b 4.3.0.Beta2 release 2013-05-02 15:12:41 -04:00
Steve Ebersole 07a6abfab9 HHH-8159 - Apply fixups indicated by analysis tools 2013-05-01 13:46:23 -05:00
Steve Ebersole d2ec514894 HHH-8159 - Apply fixups indicated by analysis tools 2013-04-30 08:07:24 -05:00
Strong Liu a0ccbb425b merge master 2013-04-22 15:19:35 +08:00
Steve Ebersole 6a388b754c HHH-8159 - Apply fixups indicated by analysis tools 2013-04-19 14:35:39 -05:00
Steve Ebersole 0416d3f24a HHH-8146 - Update to use maven-publishing plugin 2013-04-18 13:40:56 -05:00
Steve Ebersole 8eeef7af3b HHH-8146 - Update to use maven-publishing plugin 2013-04-16 18:26:02 -05:00
Brett Meyer 079fd4ac01 HHH-8160 Corrected Import-Package in module manifests 2013-04-16 10:29:44 -04:00
Strong Liu f29a670378 merge master 2013-04-15 18:33:46 +08:00
Steve Ebersole b8ebe0ef4d HHH-8159 - Apply fixups indicated by analysis tools 2013-04-09 19:40:58 -05:00
Steve Ebersole 34e7512c76 HHH-8159 - Apply fixups indicated by analysis tools 2013-04-09 19:38:40 -05:00
Brett Meyer 9ace3a6a08 HHH-7617 Gradle eclipse task missing src paths and test source generation 2013-04-09 15:30:20 -04:00
Brett Meyer cc4ef44670 HHH-8160 Updated for Gradle 1.5 OSGi plugin changes and package
versioning issues
2013-04-09 09:57:36 -04:00
Steve Ebersole 826aa6301f HHH-8156 - Apply new Gradle plugins 2013-04-08 21:24:09 -05:00
Strong Liu 68720548c8 merge master 2013-04-06 12:30:53 +08:00
Steve Ebersole e037fcb55f HHH-8145 - Add MaxPermSize to test configuration 2013-04-05 14:40:43 -05:00
Steve Ebersole 64cbd2fdd0 HHH-8151 - Consolidate defining "java language level" in one place 2013-04-05 14:38:23 -05:00
Steve Ebersole 0c72623038 HHH-8152 - General cleanup 2013-04-05 14:31:43 -05:00
Steve Ebersole 378fc1378a HHH-8143 - Create a 'generateSources' task that performs all generation tasks 2013-04-04 14:45:49 -05:00
Steve Ebersole d6fe409a48 HHH-8142 - Create a 'compile' task that performs all copmpilations 2013-04-04 13:42:17 -05:00
Steve Ebersole 26868ad314 HHH-8141 - Upgrade to Gradle 1.5 2013-04-04 13:01:39 -05:00
Steve Ebersole 2c5cb697e1 4.3.0.Beta1 release 2013-04-03 12:17:58 -05:00
Steve Ebersole 485a5314e9 4.3.0.Beta1 release 2013-04-03 11:39:14 -05:00
Strong Liu 7881b4d6b6 resolve merge confilts 2013-03-18 20:12:26 +08:00
Brett Meyer 56867417e2 HHH-7527 Enterprise OSGi JPA support 2013-02-14 10:44:35 -05:00
Brett Meyer 470c7432c4 Updated master version to 4.3.0-SNAPSHOT 2013-01-30 13:57:30 -05:00
Brett Meyer 18e44d1739 Merge branch master into metamodel 2012-11-15 15:01:13 -05:00
Steve Ebersole d11165d4d2 HHH-7749 - Allow setting system properties for tests on gradle command line 2012-11-02 13:54:20 -05:00
brmeyer d41545e13b HHH-7725 reverting build.gradle change 2012-11-01 02:08:52 -04:00
brmeyer 628145bb01 4.1.8.Final release 2012-11-01 02:08:46 -04:00
Steve Ebersole 0ab36bed8c HHH-7725 - Make handling multi-table bulk HQL operations more pluggable 2012-10-31 11:22:33 -05:00
Strong Liu b11cea4368 HHH-7607 change metamodel branch version to 5.0.0-SNAPSHOT 2012-09-17 12:03:09 +02: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