From f9795c7eb78628ee79b5cbb20c331e5855d0cb8c Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Mon, 10 Jun 2024 02:18:43 +0800 Subject: [PATCH] BREAKING CHANGES Rename plugin `hibernate5` to `hibernate` Rename project `grace-datastore-gorm-hibernate5` to `grace-datastore-gorm-hibernate` Remove project `gorm-hibernate5-spring-boot` --- build.gradle | 2 +- .../build.gradle | 0 .../main/groovy/grails/orm/HibernateCriteriaBuilder.java | 0 .../src/main/groovy/grails/orm/PagedResultList.java | 0 .../src/main/groovy/grails/orm/RlikeExpression.java | 0 .../groovy/grails/orm/hibernate/HibernateEntity.groovy | 0 .../grails/orm/hibernate/annotation/ManagedEntity.java | 0 .../grails/orm/hibernate/mapping/MappingBuilder.groovy | 0 .../grails/orm/hibernate/AbstractHibernateDatastore.java | 0 .../orm/hibernate/AbstractHibernateGormInstanceApi.groovy | 0 .../orm/hibernate/AbstractHibernateGormStaticApi.groovy | 0 .../hibernate/AbstractHibernateGormValidationApi.groovy | 0 .../grails/orm/hibernate/AbstractHibernateSession.java | 0 .../org/grails/orm/hibernate/EventListenerIntegrator.java | 0 .../org/grails/orm/hibernate/GrailsHibernateTemplate.java | 0 .../hibernate/GrailsHibernateTransactionManager.groovy | 0 .../org/grails/orm/hibernate/GrailsSessionContext.java | 0 .../org/grails/orm/hibernate/HibernateDatastore.java | 0 .../org/grails/orm/hibernate/HibernateEventListeners.java | 0 .../org/grails/orm/hibernate/HibernateGormEnhancer.groovy | 0 .../grails/orm/hibernate/HibernateGormInstanceApi.groovy | 0 .../grails/orm/hibernate/HibernateGormStaticApi.groovy | 0 .../orm/hibernate/HibernateGormValidationApi.groovy | 0 .../HibernateMappingContextSessionFactoryBean.java | 0 .../groovy/org/grails/orm/hibernate/HibernateSession.java | 0 .../org/grails/orm/hibernate/IHibernateTemplate.java | 0 .../org/grails/orm/hibernate/InstanceApiHelper.java | 0 .../org/grails/orm/hibernate/MetadataIntegrator.groovy | 0 .../org/grails/orm/hibernate/SessionFactoryHolder.java | 0 .../orm/hibernate/access/TraitPropertyAccessStrategy.java | 0 .../orm/hibernate/cfg/AbstractGrailsDomainBinder.java | 0 .../org/grails/orm/hibernate/cfg/CacheConfig.groovy | 0 .../org/grails/orm/hibernate/cfg/ColumnConfig.groovy | 0 .../org/grails/orm/hibernate/cfg/CompositeIdentity.groovy | 0 .../grails/orm/hibernate/cfg/DiscriminatorConfig.groovy | 0 .../org/grails/orm/hibernate/cfg/GrailsDomainBinder.java | 0 .../org/grails/orm/hibernate/cfg/GrailsHibernateUtil.java | 0 .../hibernate/cfg/GrailsIdentifierGeneratorFactory.java | 0 .../orm/hibernate/cfg/HibernateMappingBuilder.groovy | 0 .../grails/orm/hibernate/cfg/HibernateMappingContext.java | 0 .../cfg/HibernateMappingContextConfiguration.java | 0 .../orm/hibernate/cfg/HibernatePersistentEntity.java | 0 .../groovy/org/grails/orm/hibernate/cfg/Identity.groovy | 0 .../org/grails/orm/hibernate/cfg/IdentityEnumType.java | 0 .../org/grails/orm/hibernate/cfg/InstanceProxy.groovy | 0 .../groovy/org/grails/orm/hibernate/cfg/JoinTable.groovy | 0 .../groovy/org/grails/orm/hibernate/cfg/Mapping.groovy | 0 .../groovy/org/grails/orm/hibernate/cfg/NaturalId.groovy | 0 .../orm/hibernate/cfg/PersistentEntityNamingStrategy.java | 0 .../org/grails/orm/hibernate/cfg/PropertyConfig.groovy | 0 .../orm/hibernate/cfg/PropertyDefinitionDelegate.groovy | 0 .../groovy/org/grails/orm/hibernate/cfg/Settings.java | 0 .../groovy/org/grails/orm/hibernate/cfg/SortConfig.groovy | 0 .../main/groovy/org/grails/orm/hibernate/cfg/Table.groovy | 0 .../compiler/HibernateEntityTransformation.groovy | 0 .../AbstractHibernateConnectionSourceFactory.java | 0 .../hibernate/connections/HibernateConnectionSource.java | 0 .../connections/HibernateConnectionSourceFactory.java | 0 .../connections/HibernateConnectionSourceSettings.groovy | 0 .../HibernateConnectionSourceSettingsBuilder.groovy | 0 .../hibernate/datasource/MultipleDataSourceSupport.java | 0 .../hibernate/dirty/GrailsEntityDirtinessStrategy.groovy | 0 .../event/listener/AbstractHibernateEventListener.java | 0 .../hibernate/event/listener/HibernateEventListener.java | 0 .../CouldNotDetermineHibernateDialectException.java | 0 .../exceptions/GrailsHibernateConfigurationException.java | 0 .../hibernate/exceptions/GrailsHibernateException.java | 0 .../orm/hibernate/exceptions/GrailsQueryException.java | 0 .../hibernate/multitenancy/MultiTenantEventListener.java | 0 .../grails/orm/hibernate/proxy/HibernateProxyHandler.java | 0 .../orm/hibernate/proxy/SimpleHibernateProxyHandler.java | 0 .../hibernate/query/AbstractHibernateCriteriaBuilder.java | 0 .../query/AbstractHibernateCriterionAdapter.java | 0 .../orm/hibernate/query/AbstractHibernateQuery.java | 0 .../orm/hibernate/query/GrailsHibernateQueryUtils.java | 0 .../orm/hibernate/query/HibernateCriterionAdapter.java | 0 .../org/grails/orm/hibernate/query/HibernateHqlQuery.java | 0 .../orm/hibernate/query/HibernateProjectionAdapter.java | 0 .../org/grails/orm/hibernate/query/HibernateQuery.java | 0 .../orm/hibernate/query/HibernateQueryConstants.java | 0 .../org/grails/orm/hibernate/query/PagedResultList.java | 0 .../AbstractClosureEventTriggeringInterceptor.java | 0 .../orm/hibernate/support/ClosureEventListener.java | 0 .../support/ClosureEventTriggeringInterceptor.java | 0 .../orm/hibernate/support/DataSourceFactoryBean.groovy | 0 .../HibernateDatastoreConnectionSourcesRegistrar.groovy | 0 .../support/HibernateDatastoreFactoryBean.groovy | 0 .../support/HibernateDialectDetectorFactoryBean.java | 0 .../orm/hibernate/support/HibernateRuntimeUtils.groovy | 0 .../orm/hibernate/support/HibernateVersionSupport.java | 0 .../groovy/org/grails/orm/hibernate/support/SoftKey.java | 0 .../HibernateJtaTransactionManagerAdapter.java | 0 .../transaction/PlatformTransactionManagerProxy.java | 0 .../META-INF/org.hibernate.integrator.spi.Integrator | 0 .../hibernate/mapping/HibernateMappingBuilderTests.groovy | 0 .../HibernateOptimisticLockingStyleMappingSpec.groovy | 0 .../gorm/hibernate/mapping/MappingBuilderSpec.groovy | 0 .../groovy/grails/gorm/tests/AutoTimestampSpec.groovy | 0 .../tests/CascadeToBidirectionalAsssociationSpec.groovy | 0 .../src/test/groovy/grails/gorm/tests/Club.groovy | 0 .../grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy | 0 .../tests/CompositeIdWithManyToOneAndSequenceSpec.groovy | 0 .../src/test/groovy/grails/gorm/tests/Contract.groovy | 0 .../grails/gorm/tests/CountByWithEmbeddedSpec.groovy | 0 .../groovy/grails/gorm/tests/DeleteAllWhereSpec.groovy | 0 .../grails/gorm/tests/DetachCriteriaSubquerySpec.groovy | 0 .../grails/gorm/tests/DetachedCriteriaJoinSpec.groovy | 0 .../gorm/tests/DetachedCriteriaProjectionSpec.groovy | 0 .../test/groovy/grails/gorm/tests/DomainGetterSpec.groovy | 0 .../test/groovy/grails/gorm/tests/EnumMappingSpec.groovy | 0 .../gorm/tests/ExecuteQueryWithinValidatorSpec.groovy | 0 .../test/groovy/grails/gorm/tests/GroovyProxySpec.groovy | 0 .../test/groovy/grails/gorm/tests/HibernateSuite.groovy | 0 .../groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy | 0 .../grails/gorm/tests/ImportFromConstraintSpec.groovy | 0 .../gorm/tests/LastUpdateWithDynamicUpdateSpec.groovy | 0 .../test/groovy/grails/gorm/tests/ManyToOneSpec.groovy | 0 .../gorm/tests/MultiColumnUniqueConstraintSpec.groovy | 0 .../groovy/grails/gorm/tests/NullValueEqualSpec.groovy | 0 .../groovy/grails/gorm/tests/NullableAndLengthSpec.groovy | 0 .../groovy/grails/gorm/tests/OptimisticLockingSpec.groovy | 0 .../src/test/groovy/grails/gorm/tests/Player.groovy | 0 .../src/test/groovy/grails/gorm/tests/RLikeSpec.groovy | 0 .../groovy/grails/gorm/tests/ReadOperationSpec.groovy | 0 .../gorm/tests/SaveWithExistingValidationErrorSpec.groovy | 0 .../test/groovy/grails/gorm/tests/SchemaNameSpec.groovy | 0 .../test/groovy/grails/gorm/tests/SequenceIdSpec.groovy | 0 .../groovy/grails/gorm/tests/SizeConstraintSpec.groovy | 0 .../src/test/groovy/grails/gorm/tests/SqlQuerySpec.groovy | 0 .../gorm/tests/SubclassMultipleListCollectionSpec.groovy | 0 .../groovy/grails/gorm/tests/SubqueryAliasSpec.groovy | 0 .../gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy | 0 .../src/test/groovy/grails/gorm/tests/Team.groovy | 0 .../test/groovy/grails/gorm/tests/ToOneProxySpec.groovy | 0 .../gorm/tests/TwoBidirectionalOneToManySpec.groovy | 0 .../gorm/tests/UniqueConstraintHibernateSpec.groovy | 0 .../gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy | 0 .../test/groovy/grails/gorm/tests/ValidationSpec.groovy | 0 .../gorm/tests/WhereQueryWithAssociationSortSpec.groovy | 0 .../tests/WithNewSessionAndExistingTransactionSpec.groovy | 0 .../grails/gorm/tests/autoimport/AutoImportSpec.groovy | 0 .../groovy/grails/gorm/tests/autoimport/other/A.groovy | 0 .../belongsto/BidirectionalOneToOneWithUniqueSpec.groovy | 0 .../test/groovy/grails/gorm/tests/belongsto/Face.groovy | 0 .../test/groovy/grails/gorm/tests/belongsto/Nose.groovy | 0 .../gorm/tests/compositeid/CompositeIdCriteria.groovy | 0 .../CompositeIdWithDeepOneToManyMappingSpec.groovy | 0 .../GlobalConstraintWithCompositeIdSpec.groovy | 0 .../tests/dirtychecking/HibernateDirtyCheckingSpec.groovy | 0 .../dirtychecking/HibernateUpdateFromListenerSpec.groovy | 0 .../gorm/tests/dirtychecking/PropertyFieldSpec.groovy | 0 .../tests/events/UpdatePropertyInEventListenerSpec.groovy | 0 .../gorm/tests/hasmany/HasManyWithInQuerySpec.groovy | 0 .../grails/gorm/tests/hasmany/ListCollectionSpec.groovy | 0 .../tests/hasmany/TwoUnidirectionalHasManySpec.groovy | 0 .../gorm/tests/inheritance/SubclassToOneProxySpec.groovy | 0 .../TablePerConcreteClassAndDateCreatedSpec.groovy | 0 .../inheritance/TablePerConcreteClassImportedSpec.groovy | 0 .../grails/gorm/tests/jpa/SimpleJpaEntitySpec.groovy | 0 .../gorm/tests/mappedby/MultipleOneToOneSpec.groovy | 0 .../MultiTenancyBidirectionalManyToManySpec.groovy | 0 .../MultiTenancyUnidirectionalOneToManySpec.groovy | 0 .../groovy/grails/gorm/tests/perf/JoinPerfSpec.groovy | 0 .../grails/gorm/tests/services/DataServiceSpec.groovy | 0 .../grails/gorm/tests/softdelete/SoftDeleteSpec.groovy | 0 .../grails/gorm/tests/traits/InterfacePropertySpec.groovy | 0 .../grails/gorm/tests/traits/TraitPropertySpec.groovy | 0 .../grails/gorm/tests/txs/CustomIsolationLevelSpec.groovy | 0 .../gorm/tests/txs/TransactionPropagationSpec.groovy | 0 .../gorm/tests/txs/TransactionalWithinReadOnlySpec.groovy | 0 .../groovy/grails/gorm/tests/uuid/UuidInsertSpec.groovy | 0 .../gorm/tests/validation/BeanValidationSpec.groovy | 0 .../gorm/tests/validation/CascadeValidationSpec.groovy | 0 .../gorm/tests/validation/DeepValidationSpec.groovy | 0 .../tests/validation/SaveWithInvalidEntitySpec.groovy | 0 .../tests/validation/UniqueFalseConstraintSpec.groovy | 0 .../gorm/tests/validation/UniqueInheritanceSpec.groovy | 0 .../gorm/tests/validation/UniqueWithHasOneSpec.groovy | 0 .../gorm/tests/validation/UniqueWithinGroupSpec.groovy | 0 .../test/groovy/org/grails/datastore/gorm/Setup.groovy | 0 .../grails/orm/hibernate/DefaultConstraintsSpec.groovy | 0 .../test/groovy/org/grails/orm/hibernate/GormSpec.groovy | 0 .../grails/orm/hibernate/HibernateDatastoreSpec.groovy | 0 .../orm/hibernate/cfg/HibernateMappingContextSpec.groovy | 0 .../compiler/HibernateEntityTransformationSpec.groovy | 0 .../DataSourceConnectionSourceFactorySpec.groovy | 0 .../HibernateConnectionSourceFactorySpec.groovy | 0 .../HibernateConnectionSourceSettingsSpec.groovy | 0 .../connections/MultipleDataSourceConnectionsSpec.groovy | 0 .../connections/MultipleDataSourceMetadataSpec.groovy | 0 .../connections/MultipleDataSourcesWithCachingSpec.groovy | 0 .../connections/MultipleDataSourcesWithEventsSpec.groovy | 0 .../connections/PartitionedMultiTenancySpec.groovy | 0 .../hibernate/connections/SchemaMultiTenantSpec.groovy | 0 .../orm/hibernate/connections/SecondLevelCacheSpec.groovy | 0 .../orm/hibernate/connections/SingleTenantSpec.groovy | 0 .../proxy/SimpleHibernateProxyHandlerSpec.groovy | 0 .../hibernate/support/HibernateVersionSupportSpec.groovy | 0 .../src/test/resources/simplelogger.properties | 0 grace-plugin/build.gradle | 8 +++++++- settings.gradle | 8 ++++---- 201 files changed, 12 insertions(+), 6 deletions(-) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/build.gradle (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/grails/orm/PagedResultList.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/grails/orm/RlikeExpression.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/grails/orm/hibernate/annotation/ManagedEntity.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/grails/orm/hibernate/mapping/MappingBuilder.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormInstanceApi.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormValidationApi.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/EventListenerIntegrator.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTemplate.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTransactionManager.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/GrailsSessionContext.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/HibernateEventListeners.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/HibernateGormEnhancer.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/HibernateGormInstanceApi.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/HibernateGormValidationApi.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/HibernateMappingContextSessionFactoryBean.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/HibernateSession.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/IHibernateTemplate.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/InstanceApiHelper.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/MetadataIntegrator.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/SessionFactoryHolder.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/access/TraitPropertyAccessStrategy.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/AbstractGrailsDomainBinder.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/CacheConfig.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/ColumnConfig.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/DiscriminatorConfig.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtil.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsIdentifierGeneratorFactory.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingBuilder.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContext.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/HibernatePersistentEntity.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/Identity.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/IdentityEnumType.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/InstanceProxy.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/JoinTable.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/Mapping.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/NaturalId.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyDefinitionDelegate.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/Settings.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/SortConfig.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/cfg/Table.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformation.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/connections/AbstractHibernateConnectionSourceFactory.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSource.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsBuilder.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/datasource/MultipleDataSourceSupport.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/event/listener/HibernateEventListener.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/exceptions/CouldNotDetermineHibernateDialectException.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateConfigurationException.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateException.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsQueryException.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/multitenancy/MultiTenantEventListener.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandler.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriterionAdapter.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateQuery.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/query/HibernateCriterionAdapter.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/query/HibernateProjectionAdapter.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryConstants.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/query/PagedResultList.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/support/DataSourceFactoryBean.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreConnectionSourcesRegistrar.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreFactoryBean.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/support/HibernateDialectDetectorFactoryBean.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/support/HibernateRuntimeUtils.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/support/HibernateVersionSupport.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/support/SoftKey.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/groovy/org/grails/orm/hibernate/transaction/PlatformTransactionManagerProxy.java (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/main/resources/META-INF/org.hibernate.integrator.spi.Integrator (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderTests.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/hibernate/mapping/HibernateOptimisticLockingStyleMappingSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/hibernate/mapping/MappingBuilderSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/AutoTimestampSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/CascadeToBidirectionalAsssociationSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/Club.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/Contract.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/CountByWithEmbeddedSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/DeleteAllWhereSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/DetachCriteriaSubquerySpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/DetachedCriteriaJoinSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/DetachedCriteriaProjectionSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/DomainGetterSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/EnumMappingSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/ExecuteQueryWithinValidatorSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/GroovyProxySpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/HibernateSuite.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/ImportFromConstraintSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/LastUpdateWithDynamicUpdateSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/ManyToOneSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/MultiColumnUniqueConstraintSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/NullValueEqualSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/NullableAndLengthSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/OptimisticLockingSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/Player.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/RLikeSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/ReadOperationSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/SaveWithExistingValidationErrorSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/SchemaNameSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/SequenceIdSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/SizeConstraintSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/SqlQuerySpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/SubclassMultipleListCollectionSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/SubqueryAliasSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/Team.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/ToOneProxySpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/TwoBidirectionalOneToManySpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/UniqueConstraintHibernateSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/ValidationSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/WhereQueryWithAssociationSortSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/WithNewSessionAndExistingTransactionSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/autoimport/AutoImportSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/autoimport/other/A.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/belongsto/BidirectionalOneToOneWithUniqueSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/belongsto/Face.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/belongsto/Nose.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdCriteria.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateDirtyCheckingSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateUpdateFromListenerSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/dirtychecking/PropertyFieldSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/events/UpdatePropertyInEventListenerSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/hasmany/HasManyWithInQuerySpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/hasmany/ListCollectionSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/hasmany/TwoUnidirectionalHasManySpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassImportedSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/jpa/SimpleJpaEntitySpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/mappedby/MultipleOneToOneSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/perf/JoinPerfSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/services/DataServiceSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/softdelete/SoftDeleteSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/traits/InterfacePropertySpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/traits/TraitPropertySpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/txs/CustomIsolationLevelSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/txs/TransactionPropagationSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/txs/TransactionalWithinReadOnlySpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/uuid/UuidInsertSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/validation/BeanValidationSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/validation/DeepValidationSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/validation/SaveWithInvalidEntitySpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/validation/UniqueFalseConstraintSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/validation/UniqueWithHasOneSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/grails/gorm/tests/validation/UniqueWithinGroupSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/org/grails/datastore/gorm/Setup.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/org/grails/orm/hibernate/DefaultConstraintsSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/org/grails/orm/hibernate/GormSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformationSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/org/grails/orm/hibernate/connections/DataSourceConnectionSourceFactorySpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceConnectionsSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceMetadataSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/org/grails/orm/hibernate/connections/SecondLevelCacheSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandlerSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/groovy/org/grails/orm/hibernate/support/HibernateVersionSupportSpec.groovy (100%) rename {grace-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate}/src/test/resources/simplelogger.properties (100%) diff --git a/build.gradle b/build.gradle index fc2e2133..c1e2db6b 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ subprojects { Project subproject -> ext { projectArtifactId = subproject.name isExample = subproject.name.startsWith('example') - isPluginProject = subproject.name == 'hibernate5' + isPluginProject = subproject.name == 'hibernate' } if (isPluginProject) { diff --git a/grace-datastore-gorm-hibernate5/build.gradle b/grace-datastore-gorm-hibernate/build.gradle similarity index 100% rename from grace-datastore-gorm-hibernate5/build.gradle rename to grace-datastore-gorm-hibernate/build.gradle diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java b/grace-datastore-gorm-hibernate/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java rename to grace-datastore-gorm-hibernate/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/PagedResultList.java b/grace-datastore-gorm-hibernate/src/main/groovy/grails/orm/PagedResultList.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/PagedResultList.java rename to grace-datastore-gorm-hibernate/src/main/groovy/grails/orm/PagedResultList.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/RlikeExpression.java b/grace-datastore-gorm-hibernate/src/main/groovy/grails/orm/RlikeExpression.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/RlikeExpression.java rename to grace-datastore-gorm-hibernate/src/main/groovy/grails/orm/RlikeExpression.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/hibernate/annotation/ManagedEntity.java b/grace-datastore-gorm-hibernate/src/main/groovy/grails/orm/hibernate/annotation/ManagedEntity.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/hibernate/annotation/ManagedEntity.java rename to grace-datastore-gorm-hibernate/src/main/groovy/grails/orm/hibernate/annotation/ManagedEntity.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/hibernate/mapping/MappingBuilder.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/grails/orm/hibernate/mapping/MappingBuilder.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/hibernate/mapping/MappingBuilder.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/grails/orm/hibernate/mapping/MappingBuilder.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormInstanceApi.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormInstanceApi.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormInstanceApi.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormInstanceApi.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormValidationApi.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormValidationApi.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormValidationApi.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormValidationApi.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/EventListenerIntegrator.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/EventListenerIntegrator.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/EventListenerIntegrator.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/EventListenerIntegrator.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTemplate.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTemplate.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTemplate.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTemplate.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTransactionManager.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTransactionManager.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTransactionManager.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTransactionManager.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/GrailsSessionContext.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/GrailsSessionContext.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/GrailsSessionContext.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/GrailsSessionContext.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateEventListeners.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/HibernateEventListeners.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateEventListeners.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/HibernateEventListeners.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormEnhancer.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/HibernateGormEnhancer.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormEnhancer.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/HibernateGormEnhancer.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormInstanceApi.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/HibernateGormInstanceApi.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormInstanceApi.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/HibernateGormInstanceApi.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormValidationApi.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/HibernateGormValidationApi.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormValidationApi.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/HibernateGormValidationApi.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateMappingContextSessionFactoryBean.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/HibernateMappingContextSessionFactoryBean.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateMappingContextSessionFactoryBean.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/HibernateMappingContextSessionFactoryBean.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateSession.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/HibernateSession.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateSession.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/HibernateSession.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/IHibernateTemplate.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/IHibernateTemplate.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/IHibernateTemplate.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/IHibernateTemplate.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/InstanceApiHelper.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/InstanceApiHelper.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/InstanceApiHelper.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/InstanceApiHelper.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/MetadataIntegrator.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/MetadataIntegrator.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/MetadataIntegrator.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/MetadataIntegrator.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/SessionFactoryHolder.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/SessionFactoryHolder.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/SessionFactoryHolder.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/SessionFactoryHolder.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/access/TraitPropertyAccessStrategy.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/access/TraitPropertyAccessStrategy.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/access/TraitPropertyAccessStrategy.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/access/TraitPropertyAccessStrategy.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/AbstractGrailsDomainBinder.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/AbstractGrailsDomainBinder.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/AbstractGrailsDomainBinder.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/AbstractGrailsDomainBinder.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/CacheConfig.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/CacheConfig.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/CacheConfig.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/CacheConfig.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/ColumnConfig.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/ColumnConfig.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/ColumnConfig.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/ColumnConfig.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/DiscriminatorConfig.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/DiscriminatorConfig.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/DiscriminatorConfig.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/DiscriminatorConfig.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtil.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtil.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtil.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtil.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsIdentifierGeneratorFactory.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsIdentifierGeneratorFactory.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsIdentifierGeneratorFactory.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsIdentifierGeneratorFactory.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingBuilder.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingBuilder.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingBuilder.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingBuilder.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContext.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContext.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContext.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContext.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernatePersistentEntity.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/HibernatePersistentEntity.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernatePersistentEntity.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/HibernatePersistentEntity.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Identity.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/Identity.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Identity.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/Identity.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/IdentityEnumType.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/IdentityEnumType.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/IdentityEnumType.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/IdentityEnumType.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/InstanceProxy.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/InstanceProxy.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/InstanceProxy.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/InstanceProxy.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/JoinTable.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/JoinTable.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/JoinTable.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/JoinTable.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Mapping.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/Mapping.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Mapping.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/Mapping.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/NaturalId.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/NaturalId.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/NaturalId.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/NaturalId.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyDefinitionDelegate.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyDefinitionDelegate.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyDefinitionDelegate.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyDefinitionDelegate.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Settings.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/Settings.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Settings.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/Settings.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/SortConfig.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/SortConfig.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/SortConfig.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/SortConfig.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Table.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/Table.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Table.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/cfg/Table.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformation.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformation.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformation.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformation.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/AbstractHibernateConnectionSourceFactory.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/connections/AbstractHibernateConnectionSourceFactory.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/AbstractHibernateConnectionSourceFactory.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/connections/AbstractHibernateConnectionSourceFactory.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSource.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSource.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSource.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSource.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsBuilder.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsBuilder.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsBuilder.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsBuilder.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/datasource/MultipleDataSourceSupport.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/datasource/MultipleDataSourceSupport.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/datasource/MultipleDataSourceSupport.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/datasource/MultipleDataSourceSupport.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/event/listener/HibernateEventListener.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/event/listener/HibernateEventListener.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/event/listener/HibernateEventListener.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/event/listener/HibernateEventListener.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/CouldNotDetermineHibernateDialectException.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/exceptions/CouldNotDetermineHibernateDialectException.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/CouldNotDetermineHibernateDialectException.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/exceptions/CouldNotDetermineHibernateDialectException.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateConfigurationException.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateConfigurationException.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateConfigurationException.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateConfigurationException.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateException.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateException.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateException.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateException.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsQueryException.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsQueryException.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsQueryException.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsQueryException.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/multitenancy/MultiTenantEventListener.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/multitenancy/MultiTenantEventListener.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/multitenancy/MultiTenantEventListener.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/multitenancy/MultiTenantEventListener.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandler.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandler.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandler.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandler.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriterionAdapter.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriterionAdapter.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriterionAdapter.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriterionAdapter.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateQuery.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateQuery.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateQuery.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateQuery.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateCriterionAdapter.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/HibernateCriterionAdapter.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateCriterionAdapter.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/HibernateCriterionAdapter.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateProjectionAdapter.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/HibernateProjectionAdapter.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateProjectionAdapter.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/HibernateProjectionAdapter.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryConstants.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryConstants.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryConstants.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryConstants.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/PagedResultList.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/PagedResultList.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/PagedResultList.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/PagedResultList.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/DataSourceFactoryBean.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/DataSourceFactoryBean.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/DataSourceFactoryBean.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/DataSourceFactoryBean.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreConnectionSourcesRegistrar.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreConnectionSourcesRegistrar.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreConnectionSourcesRegistrar.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreConnectionSourcesRegistrar.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreFactoryBean.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreFactoryBean.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreFactoryBean.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreFactoryBean.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateDialectDetectorFactoryBean.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/HibernateDialectDetectorFactoryBean.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateDialectDetectorFactoryBean.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/HibernateDialectDetectorFactoryBean.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateRuntimeUtils.groovy b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/HibernateRuntimeUtils.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateRuntimeUtils.groovy rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/HibernateRuntimeUtils.groovy diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateVersionSupport.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/HibernateVersionSupport.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateVersionSupport.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/HibernateVersionSupport.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/SoftKey.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/SoftKey.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/SoftKey.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/support/SoftKey.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.java diff --git a/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/transaction/PlatformTransactionManagerProxy.java b/grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/transaction/PlatformTransactionManagerProxy.java similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/transaction/PlatformTransactionManagerProxy.java rename to grace-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/transaction/PlatformTransactionManagerProxy.java diff --git a/grace-datastore-gorm-hibernate5/src/main/resources/META-INF/org.hibernate.integrator.spi.Integrator b/grace-datastore-gorm-hibernate/src/main/resources/META-INF/org.hibernate.integrator.spi.Integrator similarity index 100% rename from grace-datastore-gorm-hibernate5/src/main/resources/META-INF/org.hibernate.integrator.spi.Integrator rename to grace-datastore-gorm-hibernate/src/main/resources/META-INF/org.hibernate.integrator.spi.Integrator diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderTests.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderTests.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderTests.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderTests.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/hibernate/mapping/HibernateOptimisticLockingStyleMappingSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/hibernate/mapping/HibernateOptimisticLockingStyleMappingSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/hibernate/mapping/HibernateOptimisticLockingStyleMappingSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/hibernate/mapping/HibernateOptimisticLockingStyleMappingSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/hibernate/mapping/MappingBuilderSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/hibernate/mapping/MappingBuilderSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/hibernate/mapping/MappingBuilderSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/hibernate/mapping/MappingBuilderSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/AutoTimestampSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/AutoTimestampSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/AutoTimestampSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/AutoTimestampSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CascadeToBidirectionalAsssociationSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/CascadeToBidirectionalAsssociationSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CascadeToBidirectionalAsssociationSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/CascadeToBidirectionalAsssociationSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Club.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/Club.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Club.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/Club.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Contract.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/Contract.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Contract.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/Contract.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CountByWithEmbeddedSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/CountByWithEmbeddedSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CountByWithEmbeddedSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/CountByWithEmbeddedSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DeleteAllWhereSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/DeleteAllWhereSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DeleteAllWhereSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/DeleteAllWhereSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DetachCriteriaSubquerySpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/DetachCriteriaSubquerySpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DetachCriteriaSubquerySpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/DetachCriteriaSubquerySpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DetachedCriteriaJoinSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/DetachedCriteriaJoinSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DetachedCriteriaJoinSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/DetachedCriteriaJoinSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DetachedCriteriaProjectionSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/DetachedCriteriaProjectionSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DetachedCriteriaProjectionSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/DetachedCriteriaProjectionSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DomainGetterSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/DomainGetterSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DomainGetterSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/DomainGetterSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/EnumMappingSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/EnumMappingSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/EnumMappingSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/EnumMappingSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ExecuteQueryWithinValidatorSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/ExecuteQueryWithinValidatorSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ExecuteQueryWithinValidatorSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/ExecuteQueryWithinValidatorSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/GroovyProxySpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/GroovyProxySpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/GroovyProxySpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/GroovyProxySpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/HibernateSuite.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/HibernateSuite.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/HibernateSuite.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/HibernateSuite.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ImportFromConstraintSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/ImportFromConstraintSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ImportFromConstraintSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/ImportFromConstraintSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/LastUpdateWithDynamicUpdateSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/LastUpdateWithDynamicUpdateSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/LastUpdateWithDynamicUpdateSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/LastUpdateWithDynamicUpdateSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ManyToOneSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/ManyToOneSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ManyToOneSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/ManyToOneSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/MultiColumnUniqueConstraintSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/MultiColumnUniqueConstraintSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/MultiColumnUniqueConstraintSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/MultiColumnUniqueConstraintSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/NullValueEqualSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/NullValueEqualSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/NullValueEqualSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/NullValueEqualSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/NullableAndLengthSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/NullableAndLengthSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/NullableAndLengthSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/NullableAndLengthSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/OptimisticLockingSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/OptimisticLockingSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/OptimisticLockingSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/OptimisticLockingSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Player.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/Player.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Player.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/Player.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/RLikeSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/RLikeSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/RLikeSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/RLikeSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ReadOperationSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/ReadOperationSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ReadOperationSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/ReadOperationSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SaveWithExistingValidationErrorSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/SaveWithExistingValidationErrorSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SaveWithExistingValidationErrorSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/SaveWithExistingValidationErrorSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SchemaNameSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/SchemaNameSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SchemaNameSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/SchemaNameSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SequenceIdSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/SequenceIdSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SequenceIdSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/SequenceIdSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SizeConstraintSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/SizeConstraintSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SizeConstraintSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/SizeConstraintSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SqlQuerySpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/SqlQuerySpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SqlQuerySpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/SqlQuerySpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SubclassMultipleListCollectionSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/SubclassMultipleListCollectionSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SubclassMultipleListCollectionSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/SubclassMultipleListCollectionSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SubqueryAliasSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/SubqueryAliasSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SubqueryAliasSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/SubqueryAliasSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Team.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/Team.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Team.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/Team.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ToOneProxySpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/ToOneProxySpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ToOneProxySpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/ToOneProxySpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/TwoBidirectionalOneToManySpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/TwoBidirectionalOneToManySpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/TwoBidirectionalOneToManySpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/TwoBidirectionalOneToManySpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/UniqueConstraintHibernateSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/UniqueConstraintHibernateSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/UniqueConstraintHibernateSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/UniqueConstraintHibernateSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ValidationSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/ValidationSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ValidationSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/ValidationSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/WhereQueryWithAssociationSortSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/WhereQueryWithAssociationSortSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/WhereQueryWithAssociationSortSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/WhereQueryWithAssociationSortSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/WithNewSessionAndExistingTransactionSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/WithNewSessionAndExistingTransactionSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/WithNewSessionAndExistingTransactionSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/WithNewSessionAndExistingTransactionSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/autoimport/AutoImportSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/autoimport/AutoImportSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/autoimport/AutoImportSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/autoimport/AutoImportSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/autoimport/other/A.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/autoimport/other/A.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/autoimport/other/A.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/autoimport/other/A.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/belongsto/BidirectionalOneToOneWithUniqueSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/belongsto/BidirectionalOneToOneWithUniqueSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/belongsto/BidirectionalOneToOneWithUniqueSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/belongsto/BidirectionalOneToOneWithUniqueSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/belongsto/Face.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/belongsto/Face.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/belongsto/Face.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/belongsto/Face.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/belongsto/Nose.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/belongsto/Nose.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/belongsto/Nose.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/belongsto/Nose.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdCriteria.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdCriteria.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdCriteria.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdCriteria.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateDirtyCheckingSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateDirtyCheckingSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateDirtyCheckingSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateDirtyCheckingSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateUpdateFromListenerSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateUpdateFromListenerSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateUpdateFromListenerSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateUpdateFromListenerSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/dirtychecking/PropertyFieldSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/dirtychecking/PropertyFieldSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/dirtychecking/PropertyFieldSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/dirtychecking/PropertyFieldSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/events/UpdatePropertyInEventListenerSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/events/UpdatePropertyInEventListenerSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/events/UpdatePropertyInEventListenerSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/events/UpdatePropertyInEventListenerSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/hasmany/HasManyWithInQuerySpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/hasmany/HasManyWithInQuerySpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/hasmany/HasManyWithInQuerySpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/hasmany/HasManyWithInQuerySpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/hasmany/ListCollectionSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/hasmany/ListCollectionSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/hasmany/ListCollectionSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/hasmany/ListCollectionSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/hasmany/TwoUnidirectionalHasManySpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/hasmany/TwoUnidirectionalHasManySpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/hasmany/TwoUnidirectionalHasManySpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/hasmany/TwoUnidirectionalHasManySpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassImportedSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassImportedSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassImportedSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassImportedSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/jpa/SimpleJpaEntitySpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/jpa/SimpleJpaEntitySpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/jpa/SimpleJpaEntitySpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/jpa/SimpleJpaEntitySpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/mappedby/MultipleOneToOneSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/mappedby/MultipleOneToOneSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/mappedby/MultipleOneToOneSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/mappedby/MultipleOneToOneSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/perf/JoinPerfSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/perf/JoinPerfSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/perf/JoinPerfSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/perf/JoinPerfSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/services/DataServiceSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/services/DataServiceSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/services/DataServiceSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/services/DataServiceSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/softdelete/SoftDeleteSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/softdelete/SoftDeleteSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/softdelete/SoftDeleteSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/softdelete/SoftDeleteSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/traits/InterfacePropertySpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/traits/InterfacePropertySpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/traits/InterfacePropertySpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/traits/InterfacePropertySpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/traits/TraitPropertySpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/traits/TraitPropertySpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/traits/TraitPropertySpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/traits/TraitPropertySpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/CustomIsolationLevelSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/txs/CustomIsolationLevelSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/CustomIsolationLevelSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/txs/CustomIsolationLevelSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/TransactionPropagationSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/txs/TransactionPropagationSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/TransactionPropagationSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/txs/TransactionPropagationSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/TransactionalWithinReadOnlySpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/txs/TransactionalWithinReadOnlySpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/TransactionalWithinReadOnlySpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/txs/TransactionalWithinReadOnlySpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/uuid/UuidInsertSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/uuid/UuidInsertSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/uuid/UuidInsertSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/uuid/UuidInsertSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/BeanValidationSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/BeanValidationSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/BeanValidationSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/BeanValidationSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/DeepValidationSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/DeepValidationSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/DeepValidationSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/DeepValidationSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/SaveWithInvalidEntitySpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/SaveWithInvalidEntitySpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/SaveWithInvalidEntitySpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/SaveWithInvalidEntitySpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueFalseConstraintSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/UniqueFalseConstraintSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueFalseConstraintSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/UniqueFalseConstraintSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueWithHasOneSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/UniqueWithHasOneSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueWithHasOneSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/UniqueWithHasOneSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueWithinGroupSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/UniqueWithinGroupSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueWithinGroupSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/UniqueWithinGroupSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/datastore/gorm/Setup.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/org/grails/datastore/gorm/Setup.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/datastore/gorm/Setup.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/org/grails/datastore/gorm/Setup.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/DefaultConstraintsSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/DefaultConstraintsSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/DefaultConstraintsSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/DefaultConstraintsSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/GormSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/GormSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/GormSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/GormSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformationSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformationSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformationSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformationSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/DataSourceConnectionSourceFactorySpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/DataSourceConnectionSourceFactorySpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/DataSourceConnectionSourceFactorySpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/DataSourceConnectionSourceFactorySpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceConnectionsSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceConnectionsSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceConnectionsSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceConnectionsSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceMetadataSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceMetadataSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceMetadataSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceMetadataSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SecondLevelCacheSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/SecondLevelCacheSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SecondLevelCacheSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/SecondLevelCacheSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandlerSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandlerSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandlerSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandlerSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/support/HibernateVersionSupportSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/support/HibernateVersionSupportSpec.groovy similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/support/HibernateVersionSupportSpec.groovy rename to grace-datastore-gorm-hibernate/src/test/groovy/org/grails/orm/hibernate/support/HibernateVersionSupportSpec.groovy diff --git a/grace-datastore-gorm-hibernate5/src/test/resources/simplelogger.properties b/grace-datastore-gorm-hibernate/src/test/resources/simplelogger.properties similarity index 100% rename from grace-datastore-gorm-hibernate5/src/test/resources/simplelogger.properties rename to grace-datastore-gorm-hibernate/src/test/resources/simplelogger.properties diff --git a/grace-plugin/build.gradle b/grace-plugin/build.gradle index e74889d9..2c3d20bf 100644 --- a/grace-plugin/build.gradle +++ b/grace-plugin/build.gradle @@ -21,7 +21,7 @@ dependencies { exclude group: 'org.graceframework', module: 'grace-datastore-gorm-validation' } api "org.graceframework:grace-datastore-gorm-support:$gormVersion" - api project(":grace-datastore-gorm-hibernate5"), { + api project(":grace-datastore-gorm-hibernate"), { exclude group:'org.springframework', module:'spring-context' exclude group:'org.springframework', module:'spring-core' exclude group:'org.springframework', module:'spring-beans' @@ -55,3 +55,9 @@ dependencies { } groovydoc.classpath += configurations.documentation + +jar { + enabled = true + archiveClassifier.set('plugin') + includeEmptyDirs = false +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index e3757cb6..2c26f30e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,13 +1,13 @@ rootProject.name = 'Grace.Data.Hibernate' // Core -include "grace-datastore-gorm-hibernate5" +include "grace-datastore-gorm-hibernate" // Documentation // include 'docs' // Plugins -include "boot-plugin" +// include "boot-plugin" include 'grace-plugin' // include "examples-grails3-hibernate5" @@ -35,5 +35,5 @@ include 'grace-plugin' // project(":examples-grails-data-service").projectDir = new File(settingsDir, "examples/grails-data-service") -project(':boot-plugin').name = 'gorm-hibernate5-spring-boot' -project(':grace-plugin').name = 'hibernate5' +// project(':boot-plugin').name = 'gorm-hibernate5-spring-boot' +project(':grace-plugin').name = 'hibernate'