BREAKING CHANGES

Rename plugin `hibernate5` to `hibernate` Rename project `grace-datastore-gorm-hibernate5` to `grace-datastore-gorm-hibernate` Remove project `gorm-hibernate5-spring-boot`
graceframework · Jun 9, 2024 · f9795c7 · f9795c7
1 parent 81e422c
commit f9795c7
Show file tree

Hide file tree

Showing 201 changed files with 12 additions and 6 deletions.
diff --git 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 → grace-datastore-gorm-hibernate/build.gradle b/grace-datastore-gorm-hibernate5/build.gradle → grace-datastore-gorm-hibernate/build.gradle
diff --git a/.../grails/orm/HibernateCriteriaBuilder.java → .../grails/orm/HibernateCriteriaBuilder.java b/.../grails/orm/HibernateCriteriaBuilder.java → .../grails/orm/HibernateCriteriaBuilder.java
diff --git a/...in/groovy/grails/orm/PagedResultList.java → ...in/groovy/grails/orm/PagedResultList.java b/...in/groovy/grails/orm/PagedResultList.java → ...in/groovy/grails/orm/PagedResultList.java
diff --git a/...in/groovy/grails/orm/RlikeExpression.java → ...in/groovy/grails/orm/RlikeExpression.java b/...in/groovy/grails/orm/RlikeExpression.java → ...in/groovy/grails/orm/RlikeExpression.java
diff --git a/...ails/orm/hibernate/HibernateEntity.groovy → ...ails/orm/hibernate/HibernateEntity.groovy b/...ails/orm/hibernate/HibernateEntity.groovy → ...ails/orm/hibernate/HibernateEntity.groovy
diff --git a/...m/hibernate/annotation/ManagedEntity.java → ...m/hibernate/annotation/ManagedEntity.java b/...m/hibernate/annotation/ManagedEntity.java → ...m/hibernate/annotation/ManagedEntity.java
diff --git a/...m/hibernate/mapping/MappingBuilder.groovy → ...m/hibernate/mapping/MappingBuilder.groovy b/...m/hibernate/mapping/MappingBuilder.groovy → ...m/hibernate/mapping/MappingBuilder.groovy
diff --git a/...hibernate/AbstractHibernateDatastore.java → ...hibernate/AbstractHibernateDatastore.java b/...hibernate/AbstractHibernateDatastore.java → ...hibernate/AbstractHibernateDatastore.java
diff --git a/...e/AbstractHibernateGormInstanceApi.groovy → ...e/AbstractHibernateGormInstanceApi.groovy b/...e/AbstractHibernateGormInstanceApi.groovy → ...e/AbstractHibernateGormInstanceApi.groovy
diff --git a/...ate/AbstractHibernateGormStaticApi.groovy → ...ate/AbstractHibernateGormStaticApi.groovy b/...ate/AbstractHibernateGormStaticApi.groovy → ...ate/AbstractHibernateGormStaticApi.groovy
diff --git a/...AbstractHibernateGormValidationApi.groovy → ...AbstractHibernateGormValidationApi.groovy b/...AbstractHibernateGormValidationApi.groovy → ...AbstractHibernateGormValidationApi.groovy
diff --git a/...m/hibernate/AbstractHibernateSession.java → ...m/hibernate/AbstractHibernateSession.java b/...m/hibernate/AbstractHibernateSession.java → ...m/hibernate/AbstractHibernateSession.java
diff --git a/...rm/hibernate/EventListenerIntegrator.java → ...rm/hibernate/EventListenerIntegrator.java b/...rm/hibernate/EventListenerIntegrator.java → ...rm/hibernate/EventListenerIntegrator.java
diff --git a/...rm/hibernate/GrailsHibernateTemplate.java → ...rm/hibernate/GrailsHibernateTemplate.java b/...rm/hibernate/GrailsHibernateTemplate.java → ...rm/hibernate/GrailsHibernateTemplate.java
diff --git a/.../GrailsHibernateTransactionManager.groovy → .../GrailsHibernateTransactionManager.groovy b/.../GrailsHibernateTransactionManager.groovy → .../GrailsHibernateTransactionManager.groovy
diff --git a/...s/orm/hibernate/GrailsSessionContext.java → ...s/orm/hibernate/GrailsSessionContext.java b/...s/orm/hibernate/GrailsSessionContext.java → ...s/orm/hibernate/GrailsSessionContext.java
diff --git a/...ils/orm/hibernate/HibernateDatastore.java → ...ils/orm/hibernate/HibernateDatastore.java b/...ils/orm/hibernate/HibernateDatastore.java → ...ils/orm/hibernate/HibernateDatastore.java
diff --git a/...rm/hibernate/HibernateEventListeners.java → ...rm/hibernate/HibernateEventListeners.java b/...rm/hibernate/HibernateEventListeners.java → ...rm/hibernate/HibernateEventListeners.java
diff --git a/...rm/hibernate/HibernateGormEnhancer.groovy → ...rm/hibernate/HibernateGormEnhancer.groovy b/...rm/hibernate/HibernateGormEnhancer.groovy → ...rm/hibernate/HibernateGormEnhancer.groovy
diff --git a/...hibernate/HibernateGormInstanceApi.groovy → ...hibernate/HibernateGormInstanceApi.groovy b/...hibernate/HibernateGormInstanceApi.groovy → ...hibernate/HibernateGormInstanceApi.groovy
diff --git a/...m/hibernate/HibernateGormStaticApi.groovy → ...m/hibernate/HibernateGormStaticApi.groovy b/...m/hibernate/HibernateGormStaticApi.groovy → ...m/hibernate/HibernateGormStaticApi.groovy
diff --git a/...bernate/HibernateGormValidationApi.groovy → ...bernate/HibernateGormValidationApi.groovy b/...bernate/HibernateGormValidationApi.groovy → ...bernate/HibernateGormValidationApi.groovy
diff --git a/...nateMappingContextSessionFactoryBean.java → ...nateMappingContextSessionFactoryBean.java b/...nateMappingContextSessionFactoryBean.java → ...nateMappingContextSessionFactoryBean.java
diff --git a/...rails/orm/hibernate/HibernateSession.java → ...rails/orm/hibernate/HibernateSession.java b/...rails/orm/hibernate/HibernateSession.java → ...rails/orm/hibernate/HibernateSession.java
diff --git a/...ils/orm/hibernate/IHibernateTemplate.java → ...ils/orm/hibernate/IHibernateTemplate.java b/...ils/orm/hibernate/IHibernateTemplate.java → ...ils/orm/hibernate/IHibernateTemplate.java
diff --git a/...ails/orm/hibernate/InstanceApiHelper.java → ...ails/orm/hibernate/InstanceApiHelper.java b/...ails/orm/hibernate/InstanceApiHelper.java → ...ails/orm/hibernate/InstanceApiHelper.java
diff --git a/...s/orm/hibernate/MetadataIntegrator.groovy → ...s/orm/hibernate/MetadataIntegrator.groovy b/...s/orm/hibernate/MetadataIntegrator.groovy → ...s/orm/hibernate/MetadataIntegrator.groovy
diff --git a/...s/orm/hibernate/SessionFactoryHolder.java → ...s/orm/hibernate/SessionFactoryHolder.java b/...s/orm/hibernate/SessionFactoryHolder.java → ...s/orm/hibernate/SessionFactoryHolder.java
diff --git a/...e/access/TraitPropertyAccessStrategy.java → ...e/access/TraitPropertyAccessStrategy.java b/...e/access/TraitPropertyAccessStrategy.java → ...e/access/TraitPropertyAccessStrategy.java
diff --git a/...rnate/cfg/AbstractGrailsDomainBinder.java → ...rnate/cfg/AbstractGrailsDomainBinder.java b/...rnate/cfg/AbstractGrailsDomainBinder.java → ...rnate/cfg/AbstractGrailsDomainBinder.java
diff --git a/...ails/orm/hibernate/cfg/CacheConfig.groovy → ...ails/orm/hibernate/cfg/CacheConfig.groovy b/...ails/orm/hibernate/cfg/CacheConfig.groovy → ...ails/orm/hibernate/cfg/CacheConfig.groovy
diff --git a/...ils/orm/hibernate/cfg/ColumnConfig.groovy → ...ils/orm/hibernate/cfg/ColumnConfig.groovy b/...ils/orm/hibernate/cfg/ColumnConfig.groovy → ...ils/orm/hibernate/cfg/ColumnConfig.groovy
diff --git a/...rm/hibernate/cfg/CompositeIdentity.groovy → ...rm/hibernate/cfg/CompositeIdentity.groovy b/...rm/hibernate/cfg/CompositeIdentity.groovy → ...rm/hibernate/cfg/CompositeIdentity.groovy
diff --git a/.../hibernate/cfg/DiscriminatorConfig.groovy → .../hibernate/cfg/DiscriminatorConfig.groovy b/.../hibernate/cfg/DiscriminatorConfig.groovy → .../hibernate/cfg/DiscriminatorConfig.groovy
diff --git a/...orm/hibernate/cfg/GrailsDomainBinder.java → ...orm/hibernate/cfg/GrailsDomainBinder.java b/...orm/hibernate/cfg/GrailsDomainBinder.java → ...orm/hibernate/cfg/GrailsDomainBinder.java
diff --git a/...rm/hibernate/cfg/GrailsHibernateUtil.java → ...rm/hibernate/cfg/GrailsHibernateUtil.java b/...rm/hibernate/cfg/GrailsHibernateUtil.java → ...rm/hibernate/cfg/GrailsHibernateUtil.java
diff --git a/...cfg/GrailsIdentifierGeneratorFactory.java → ...cfg/GrailsIdentifierGeneratorFactory.java b/...cfg/GrailsIdentifierGeneratorFactory.java → ...cfg/GrailsIdentifierGeneratorFactory.java
diff --git a/...ernate/cfg/HibernateMappingBuilder.groovy → ...ernate/cfg/HibernateMappingBuilder.groovy b/...ernate/cfg/HibernateMappingBuilder.groovy → ...ernate/cfg/HibernateMappingBuilder.groovy
diff --git a/...ibernate/cfg/HibernateMappingContext.java → ...ibernate/cfg/HibernateMappingContext.java b/...ibernate/cfg/HibernateMappingContext.java → ...ibernate/cfg/HibernateMappingContext.java
diff --git a/...HibernateMappingContextConfiguration.java → ...HibernateMappingContextConfiguration.java b/...HibernateMappingContextConfiguration.java → ...HibernateMappingContextConfiguration.java
diff --git a/...ernate/cfg/HibernatePersistentEntity.java → ...ernate/cfg/HibernatePersistentEntity.java b/...ernate/cfg/HibernatePersistentEntity.java → ...ernate/cfg/HibernatePersistentEntity.java
diff --git a/.../grails/orm/hibernate/cfg/Identity.groovy → .../grails/orm/hibernate/cfg/Identity.groovy b/.../grails/orm/hibernate/cfg/Identity.groovy → .../grails/orm/hibernate/cfg/Identity.groovy
diff --git a/...s/orm/hibernate/cfg/IdentityEnumType.java → ...s/orm/hibernate/cfg/IdentityEnumType.java b/...s/orm/hibernate/cfg/IdentityEnumType.java → ...s/orm/hibernate/cfg/IdentityEnumType.java
diff --git a/...ls/orm/hibernate/cfg/InstanceProxy.groovy → ...ls/orm/hibernate/cfg/InstanceProxy.groovy b/...ls/orm/hibernate/cfg/InstanceProxy.groovy → ...ls/orm/hibernate/cfg/InstanceProxy.groovy
diff --git a/...grails/orm/hibernate/cfg/JoinTable.groovy → ...grails/orm/hibernate/cfg/JoinTable.groovy b/...grails/orm/hibernate/cfg/JoinTable.groovy → ...grails/orm/hibernate/cfg/JoinTable.groovy
diff --git a/...g/grails/orm/hibernate/cfg/Mapping.groovy → ...g/grails/orm/hibernate/cfg/Mapping.groovy b/...g/grails/orm/hibernate/cfg/Mapping.groovy → ...g/grails/orm/hibernate/cfg/Mapping.groovy
diff --git a/...grails/orm/hibernate/cfg/NaturalId.groovy → ...grails/orm/hibernate/cfg/NaturalId.groovy b/...grails/orm/hibernate/cfg/NaturalId.groovy → ...grails/orm/hibernate/cfg/NaturalId.groovy
diff --git a/...e/cfg/PersistentEntityNamingStrategy.java → ...e/cfg/PersistentEntityNamingStrategy.java b/...e/cfg/PersistentEntityNamingStrategy.java → ...e/cfg/PersistentEntityNamingStrategy.java
diff --git a/...s/orm/hibernate/cfg/PropertyConfig.groovy → ...s/orm/hibernate/cfg/PropertyConfig.groovy b/...s/orm/hibernate/cfg/PropertyConfig.groovy → ...s/orm/hibernate/cfg/PropertyConfig.groovy
diff --git a/...ate/cfg/PropertyDefinitionDelegate.groovy → ...ate/cfg/PropertyDefinitionDelegate.groovy b/...ate/cfg/PropertyDefinitionDelegate.groovy → ...ate/cfg/PropertyDefinitionDelegate.groovy
diff --git a/...rg/grails/orm/hibernate/cfg/Settings.java → ...rg/grails/orm/hibernate/cfg/Settings.java b/...rg/grails/orm/hibernate/cfg/Settings.java → ...rg/grails/orm/hibernate/cfg/Settings.java
diff --git a/...rails/orm/hibernate/cfg/SortConfig.groovy → ...rails/orm/hibernate/cfg/SortConfig.groovy b/...rails/orm/hibernate/cfg/SortConfig.groovy → ...rails/orm/hibernate/cfg/SortConfig.groovy
diff --git a/...org/grails/orm/hibernate/cfg/Table.groovy → ...org/grails/orm/hibernate/cfg/Table.groovy b/...org/grails/orm/hibernate/cfg/Table.groovy → ...org/grails/orm/hibernate/cfg/Table.groovy
diff --git a/...iler/HibernateEntityTransformation.groovy → ...iler/HibernateEntityTransformation.groovy b/...iler/HibernateEntityTransformation.groovy → ...iler/HibernateEntityTransformation.groovy
diff --git a/...ractHibernateConnectionSourceFactory.java → ...ractHibernateConnectionSourceFactory.java b/...ractHibernateConnectionSourceFactory.java → ...ractHibernateConnectionSourceFactory.java
diff --git a/...onnections/HibernateConnectionSource.java → ...onnections/HibernateConnectionSource.java b/...onnections/HibernateConnectionSource.java → ...onnections/HibernateConnectionSource.java
diff --git a/...ons/HibernateConnectionSourceFactory.java → ...ons/HibernateConnectionSourceFactory.java b/...ons/HibernateConnectionSourceFactory.java → ...ons/HibernateConnectionSourceFactory.java
diff --git a/.../HibernateConnectionSourceSettings.groovy → .../HibernateConnectionSourceSettings.groovy b/.../HibernateConnectionSourceSettings.groovy → .../HibernateConnectionSourceSettings.groovy
diff --git a/...ateConnectionSourceSettingsBuilder.groovy → ...ateConnectionSourceSettingsBuilder.groovy b/...ateConnectionSourceSettingsBuilder.groovy → ...ateConnectionSourceSettingsBuilder.groovy
diff --git a/...datasource/MultipleDataSourceSupport.java → ...datasource/MultipleDataSourceSupport.java b/...datasource/MultipleDataSourceSupport.java → ...datasource/MultipleDataSourceSupport.java
diff --git a/...irty/GrailsEntityDirtinessStrategy.groovy → ...irty/GrailsEntityDirtinessStrategy.groovy b/...irty/GrailsEntityDirtinessStrategy.groovy → ...irty/GrailsEntityDirtinessStrategy.groovy
diff --git a/...tener/AbstractHibernateEventListener.java → ...tener/AbstractHibernateEventListener.java b/...tener/AbstractHibernateEventListener.java → ...tener/AbstractHibernateEventListener.java
diff --git a/...vent/listener/HibernateEventListener.java → ...vent/listener/HibernateEventListener.java b/...vent/listener/HibernateEventListener.java → ...vent/listener/HibernateEventListener.java
diff --git a/...otDetermineHibernateDialectException.java → ...otDetermineHibernateDialectException.java b/...otDetermineHibernateDialectException.java → ...otDetermineHibernateDialectException.java
diff --git a/...railsHibernateConfigurationException.java → ...railsHibernateConfigurationException.java b/...railsHibernateConfigurationException.java → ...railsHibernateConfigurationException.java
diff --git a/.../exceptions/GrailsHibernateException.java → .../exceptions/GrailsHibernateException.java b/.../exceptions/GrailsHibernateException.java → .../exceptions/GrailsHibernateException.java
diff --git a/...nate/exceptions/GrailsQueryException.java → ...nate/exceptions/GrailsQueryException.java b/...nate/exceptions/GrailsQueryException.java → ...nate/exceptions/GrailsQueryException.java
diff --git a/...ultitenancy/MultiTenantEventListener.java → ...ultitenancy/MultiTenantEventListener.java b/...ultitenancy/MultiTenantEventListener.java → ...ultitenancy/MultiTenantEventListener.java
diff --git a/...ibernate/proxy/HibernateProxyHandler.java → ...ibernate/proxy/HibernateProxyHandler.java b/...ibernate/proxy/HibernateProxyHandler.java → ...ibernate/proxy/HibernateProxyHandler.java
diff --git a/...te/proxy/SimpleHibernateProxyHandler.java → ...te/proxy/SimpleHibernateProxyHandler.java b/...te/proxy/SimpleHibernateProxyHandler.java → ...te/proxy/SimpleHibernateProxyHandler.java
diff --git a/...ery/AbstractHibernateCriteriaBuilder.java → ...ery/AbstractHibernateCriteriaBuilder.java b/...ery/AbstractHibernateCriteriaBuilder.java → ...ery/AbstractHibernateCriteriaBuilder.java
diff --git a/...ry/AbstractHibernateCriterionAdapter.java → ...ry/AbstractHibernateCriterionAdapter.java b/...ry/AbstractHibernateCriterionAdapter.java → ...ry/AbstractHibernateCriterionAdapter.java
diff --git a/...bernate/query/AbstractHibernateQuery.java → ...bernate/query/AbstractHibernateQuery.java b/...bernate/query/AbstractHibernateQuery.java → ...bernate/query/AbstractHibernateQuery.java
diff --git a/...nate/query/GrailsHibernateQueryUtils.java → ...nate/query/GrailsHibernateQueryUtils.java b/...nate/query/GrailsHibernateQueryUtils.java → ...nate/query/GrailsHibernateQueryUtils.java
diff --git a/...nate/query/HibernateCriterionAdapter.java → ...nate/query/HibernateCriterionAdapter.java b/...nate/query/HibernateCriterionAdapter.java → ...nate/query/HibernateCriterionAdapter.java
diff --git a/...rm/hibernate/query/HibernateHqlQuery.java → ...rm/hibernate/query/HibernateHqlQuery.java b/...rm/hibernate/query/HibernateHqlQuery.java → ...rm/hibernate/query/HibernateHqlQuery.java
diff --git a/...ate/query/HibernateProjectionAdapter.java → ...ate/query/HibernateProjectionAdapter.java b/...ate/query/HibernateProjectionAdapter.java → ...ate/query/HibernateProjectionAdapter.java
diff --git a/...s/orm/hibernate/query/HibernateQuery.java → ...s/orm/hibernate/query/HibernateQuery.java b/...s/orm/hibernate/query/HibernateQuery.java → ...s/orm/hibernate/query/HibernateQuery.java
diff --git a/...ernate/query/HibernateQueryConstants.java → ...ernate/query/HibernateQueryConstants.java b/...ernate/query/HibernateQueryConstants.java → ...ernate/query/HibernateQueryConstants.java
diff --git a/.../orm/hibernate/query/PagedResultList.java → .../orm/hibernate/query/PagedResultList.java b/.../orm/hibernate/query/PagedResultList.java → .../orm/hibernate/query/PagedResultList.java
diff --git a/...actClosureEventTriggeringInterceptor.java → ...actClosureEventTriggeringInterceptor.java b/...actClosureEventTriggeringInterceptor.java → ...actClosureEventTriggeringInterceptor.java
diff --git a/...bernate/support/ClosureEventListener.java → ...bernate/support/ClosureEventListener.java b/...bernate/support/ClosureEventListener.java → ...bernate/support/ClosureEventListener.java
diff --git a/...rt/ClosureEventTriggeringInterceptor.java → ...rt/ClosureEventTriggeringInterceptor.java b/...rt/ClosureEventTriggeringInterceptor.java → ...rt/ClosureEventTriggeringInterceptor.java
diff --git a/...nate/support/DataSourceFactoryBean.groovy → ...nate/support/DataSourceFactoryBean.groovy b/...nate/support/DataSourceFactoryBean.groovy → ...nate/support/DataSourceFactoryBean.groovy
diff --git a/...atastoreConnectionSourcesRegistrar.groovy → ...atastoreConnectionSourcesRegistrar.groovy b/...atastoreConnectionSourcesRegistrar.groovy → ...atastoreConnectionSourcesRegistrar.groovy
diff --git a/...port/HibernateDatastoreFactoryBean.groovy → ...port/HibernateDatastoreFactoryBean.groovy b/...port/HibernateDatastoreFactoryBean.groovy → ...port/HibernateDatastoreFactoryBean.groovy
diff --git a/.../HibernateDialectDetectorFactoryBean.java → .../HibernateDialectDetectorFactoryBean.java b/.../HibernateDialectDetectorFactoryBean.java → .../HibernateDialectDetectorFactoryBean.java
diff --git a/...nate/support/HibernateRuntimeUtils.groovy → ...nate/support/HibernateRuntimeUtils.groovy b/...nate/support/HibernateRuntimeUtils.groovy → ...nate/support/HibernateRuntimeUtils.groovy
diff --git a/...nate/support/HibernateVersionSupport.java → ...nate/support/HibernateVersionSupport.java b/...nate/support/HibernateVersionSupport.java → ...nate/support/HibernateVersionSupport.java
diff --git a/...grails/orm/hibernate/support/SoftKey.java → ...grails/orm/hibernate/support/SoftKey.java b/...grails/orm/hibernate/support/SoftKey.java → ...grails/orm/hibernate/support/SoftKey.java
diff --git a/...ibernateJtaTransactionManagerAdapter.java → ...ibernateJtaTransactionManagerAdapter.java b/...ibernateJtaTransactionManagerAdapter.java → ...ibernateJtaTransactionManagerAdapter.java
diff --git a/...tion/PlatformTransactionManagerProxy.java → ...tion/PlatformTransactionManagerProxy.java b/...tion/PlatformTransactionManagerProxy.java → ...tion/PlatformTransactionManagerProxy.java
diff --git a/...F/org.hibernate.integrator.spi.Integrator → ...F/org.hibernate.integrator.spi.Integrator b/...F/org.hibernate.integrator.spi.Integrator → ...F/org.hibernate.integrator.spi.Integrator
diff --git a/...pping/HibernateMappingBuilderTests.groovy → ...pping/HibernateMappingBuilderTests.groovy b/...pping/HibernateMappingBuilderTests.groovy → ...pping/HibernateMappingBuilderTests.groovy
diff --git a/...eOptimisticLockingStyleMappingSpec.groovy → ...eOptimisticLockingStyleMappingSpec.groovy b/...eOptimisticLockingStyleMappingSpec.groovy → ...eOptimisticLockingStyleMappingSpec.groovy
diff --git a/...bernate/mapping/MappingBuilderSpec.groovy → ...bernate/mapping/MappingBuilderSpec.groovy b/...bernate/mapping/MappingBuilderSpec.groovy → ...bernate/mapping/MappingBuilderSpec.groovy
diff --git a/...rails/gorm/tests/AutoTimestampSpec.groovy → ...rails/gorm/tests/AutoTimestampSpec.groovy b/...rails/gorm/tests/AutoTimestampSpec.groovy → ...rails/gorm/tests/AutoTimestampSpec.groovy
diff --git a/...adeToBidirectionalAsssociationSpec.groovy → ...adeToBidirectionalAsssociationSpec.groovy b/...adeToBidirectionalAsssociationSpec.groovy → ...adeToBidirectionalAsssociationSpec.groovy
diff --git a/...test/groovy/grails/gorm/tests/Club.groovy → ...test/groovy/grails/gorm/tests/Club.groovy b/...test/groovy/grails/gorm/tests/Club.groovy → ...test/groovy/grails/gorm/tests/Club.groovy
diff --git a/...tests/CompositeIdWithJoinTableSpec.groovy → ...tests/CompositeIdWithJoinTableSpec.groovy b/...tests/CompositeIdWithJoinTableSpec.groovy → ...tests/CompositeIdWithJoinTableSpec.groovy
diff --git a/...siteIdWithManyToOneAndSequenceSpec.groovy → ...siteIdWithManyToOneAndSequenceSpec.groovy b/...siteIdWithManyToOneAndSequenceSpec.groovy → ...siteIdWithManyToOneAndSequenceSpec.groovy
diff --git a/.../groovy/grails/gorm/tests/Contract.groovy → .../groovy/grails/gorm/tests/Contract.groovy b/.../groovy/grails/gorm/tests/Contract.groovy → .../groovy/grails/gorm/tests/Contract.groovy
diff --git a/...gorm/tests/CountByWithEmbeddedSpec.groovy → ...gorm/tests/CountByWithEmbeddedSpec.groovy b/...gorm/tests/CountByWithEmbeddedSpec.groovy → ...gorm/tests/CountByWithEmbeddedSpec.groovy
diff --git a/...ails/gorm/tests/DeleteAllWhereSpec.groovy → ...ails/gorm/tests/DeleteAllWhereSpec.groovy b/...ails/gorm/tests/DeleteAllWhereSpec.groovy → ...ails/gorm/tests/DeleteAllWhereSpec.groovy
diff --git a/...m/tests/DetachCriteriaSubquerySpec.groovy → ...m/tests/DetachCriteriaSubquerySpec.groovy b/...m/tests/DetachCriteriaSubquerySpec.groovy → ...m/tests/DetachCriteriaSubquerySpec.groovy
diff --git a/...orm/tests/DetachedCriteriaJoinSpec.groovy → ...orm/tests/DetachedCriteriaJoinSpec.groovy b/...orm/tests/DetachedCriteriaJoinSpec.groovy → ...orm/tests/DetachedCriteriaJoinSpec.groovy
diff --git a/...sts/DetachedCriteriaProjectionSpec.groovy → ...sts/DetachedCriteriaProjectionSpec.groovy b/...sts/DetachedCriteriaProjectionSpec.groovy → ...sts/DetachedCriteriaProjectionSpec.groovy
diff --git a/...grails/gorm/tests/DomainGetterSpec.groovy → ...grails/gorm/tests/DomainGetterSpec.groovy b/...grails/gorm/tests/DomainGetterSpec.groovy → ...grails/gorm/tests/DomainGetterSpec.groovy
diff --git a/.../grails/gorm/tests/EnumMappingSpec.groovy → .../grails/gorm/tests/EnumMappingSpec.groovy b/.../grails/gorm/tests/EnumMappingSpec.groovy → .../grails/gorm/tests/EnumMappingSpec.groovy
diff --git a/...ts/ExecuteQueryWithinValidatorSpec.groovy → ...ts/ExecuteQueryWithinValidatorSpec.groovy b/...ts/ExecuteQueryWithinValidatorSpec.groovy → ...ts/ExecuteQueryWithinValidatorSpec.groovy
diff --git a/.../grails/gorm/tests/GroovyProxySpec.groovy → .../grails/gorm/tests/GroovyProxySpec.groovy b/.../grails/gorm/tests/GroovyProxySpec.groovy → .../grails/gorm/tests/GroovyProxySpec.groovy
diff --git a/...y/grails/gorm/tests/HibernateSuite.groovy → ...y/grails/gorm/tests/HibernateSuite.groovy b/...y/grails/gorm/tests/HibernateSuite.groovy → ...y/grails/gorm/tests/HibernateSuite.groovy
diff --git a/...ls/gorm/tests/IdentityEnumTypeSpec.groovy → ...ls/gorm/tests/IdentityEnumTypeSpec.groovy b/...ls/gorm/tests/IdentityEnumTypeSpec.groovy → ...ls/gorm/tests/IdentityEnumTypeSpec.groovy
diff --git a/...orm/tests/ImportFromConstraintSpec.groovy → ...orm/tests/ImportFromConstraintSpec.groovy b/...orm/tests/ImportFromConstraintSpec.groovy → ...orm/tests/ImportFromConstraintSpec.groovy
diff --git a/...ts/LastUpdateWithDynamicUpdateSpec.groovy → ...ts/LastUpdateWithDynamicUpdateSpec.groovy b/...ts/LastUpdateWithDynamicUpdateSpec.groovy → ...ts/LastUpdateWithDynamicUpdateSpec.groovy
diff --git a/...vy/grails/gorm/tests/ManyToOneSpec.groovy → ...vy/grails/gorm/tests/ManyToOneSpec.groovy b/...vy/grails/gorm/tests/ManyToOneSpec.groovy → ...vy/grails/gorm/tests/ManyToOneSpec.groovy
diff --git a/...ts/MultiColumnUniqueConstraintSpec.groovy → ...ts/MultiColumnUniqueConstraintSpec.groovy b/...ts/MultiColumnUniqueConstraintSpec.groovy → ...ts/MultiColumnUniqueConstraintSpec.groovy
diff --git a/...ails/gorm/tests/NullValueEqualSpec.groovy → ...ails/gorm/tests/NullValueEqualSpec.groovy b/...ails/gorm/tests/NullValueEqualSpec.groovy → ...ails/gorm/tests/NullValueEqualSpec.groovy
diff --git a/...s/gorm/tests/NullableAndLengthSpec.groovy → ...s/gorm/tests/NullableAndLengthSpec.groovy b/...s/gorm/tests/NullableAndLengthSpec.groovy → ...s/gorm/tests/NullableAndLengthSpec.groovy
diff --git a/...s/gorm/tests/OptimisticLockingSpec.groovy → ...s/gorm/tests/OptimisticLockingSpec.groovy b/...s/gorm/tests/OptimisticLockingSpec.groovy → ...s/gorm/tests/OptimisticLockingSpec.groovy
diff --git a/...st/groovy/grails/gorm/tests/Player.groovy → ...st/groovy/grails/gorm/tests/Player.groovy b/...st/groovy/grails/gorm/tests/Player.groovy → ...st/groovy/grails/gorm/tests/Player.groovy
diff --git a/...groovy/grails/gorm/tests/RLikeSpec.groovy → ...groovy/grails/gorm/tests/RLikeSpec.groovy b/...groovy/grails/gorm/tests/RLikeSpec.groovy → ...groovy/grails/gorm/tests/RLikeSpec.groovy
diff --git a/...rails/gorm/tests/ReadOperationSpec.groovy → ...rails/gorm/tests/ReadOperationSpec.groovy b/...rails/gorm/tests/ReadOperationSpec.groovy → ...rails/gorm/tests/ReadOperationSpec.groovy
diff --git a/...aveWithExistingValidationErrorSpec.groovy → ...aveWithExistingValidationErrorSpec.groovy b/...aveWithExistingValidationErrorSpec.groovy → ...aveWithExistingValidationErrorSpec.groovy
diff --git a/...y/grails/gorm/tests/SchemaNameSpec.groovy → ...y/grails/gorm/tests/SchemaNameSpec.groovy b/...y/grails/gorm/tests/SchemaNameSpec.groovy → ...y/grails/gorm/tests/SchemaNameSpec.groovy
diff --git a/...y/grails/gorm/tests/SequenceIdSpec.groovy → ...y/grails/gorm/tests/SequenceIdSpec.groovy b/...y/grails/gorm/tests/SequenceIdSpec.groovy → ...y/grails/gorm/tests/SequenceIdSpec.groovy
diff --git a/...ails/gorm/tests/SizeConstraintSpec.groovy → ...ails/gorm/tests/SizeConstraintSpec.groovy b/...ails/gorm/tests/SizeConstraintSpec.groovy → ...ails/gorm/tests/SizeConstraintSpec.groovy
diff --git a/...ovy/grails/gorm/tests/SqlQuerySpec.groovy → ...ovy/grails/gorm/tests/SqlQuerySpec.groovy b/...ovy/grails/gorm/tests/SqlQuerySpec.groovy → ...ovy/grails/gorm/tests/SqlQuerySpec.groovy
diff --git a/...SubclassMultipleListCollectionSpec.groovy → ...SubclassMultipleListCollectionSpec.groovy b/...SubclassMultipleListCollectionSpec.groovy → ...SubclassMultipleListCollectionSpec.groovy
diff --git a/...rails/gorm/tests/SubqueryAliasSpec.groovy → ...rails/gorm/tests/SubqueryAliasSpec.groovy b/...rails/gorm/tests/SubqueryAliasSpec.groovy → ...rails/gorm/tests/SubqueryAliasSpec.groovy
diff --git a/...ts/TablePerSubClassAndEmbeddedSpec.groovy → ...ts/TablePerSubClassAndEmbeddedSpec.groovy b/...ts/TablePerSubClassAndEmbeddedSpec.groovy → ...ts/TablePerSubClassAndEmbeddedSpec.groovy
diff --git a/...test/groovy/grails/gorm/tests/Team.groovy → ...test/groovy/grails/gorm/tests/Team.groovy b/...test/groovy/grails/gorm/tests/Team.groovy → ...test/groovy/grails/gorm/tests/Team.groovy
diff --git a/...y/grails/gorm/tests/ToOneProxySpec.groovy → ...y/grails/gorm/tests/ToOneProxySpec.groovy b/...y/grails/gorm/tests/ToOneProxySpec.groovy → ...y/grails/gorm/tests/ToOneProxySpec.groovy
diff --git a/...ests/TwoBidirectionalOneToManySpec.groovy → ...ests/TwoBidirectionalOneToManySpec.groovy b/...ests/TwoBidirectionalOneToManySpec.groovy → ...ests/TwoBidirectionalOneToManySpec.groovy
diff --git a/...ests/UniqueConstraintHibernateSpec.groovy → ...ests/UniqueConstraintHibernateSpec.groovy b/...ests/UniqueConstraintHibernateSpec.groovy → ...ests/UniqueConstraintHibernateSpec.groovy
diff --git a/.../UniqueWithMultipleDataSourcesSpec.groovy → .../UniqueWithMultipleDataSourcesSpec.groovy b/.../UniqueWithMultipleDataSourcesSpec.groovy → .../UniqueWithMultipleDataSourcesSpec.groovy
diff --git a/...y/grails/gorm/tests/ValidationSpec.groovy → ...y/grails/gorm/tests/ValidationSpec.groovy b/...y/grails/gorm/tests/ValidationSpec.groovy → ...y/grails/gorm/tests/ValidationSpec.groovy
diff --git a/.../WhereQueryWithAssociationSortSpec.groovy → .../WhereQueryWithAssociationSortSpec.groovy b/.../WhereQueryWithAssociationSortSpec.groovy → .../WhereQueryWithAssociationSortSpec.groovy
diff --git a/...wSessionAndExistingTransactionSpec.groovy → ...wSessionAndExistingTransactionSpec.groovy b/...wSessionAndExistingTransactionSpec.groovy → ...wSessionAndExistingTransactionSpec.groovy
diff --git a/...rm/tests/autoimport/AutoImportSpec.groovy → ...rm/tests/autoimport/AutoImportSpec.groovy b/...rm/tests/autoimport/AutoImportSpec.groovy → ...rm/tests/autoimport/AutoImportSpec.groovy
diff --git a/...ails/gorm/tests/autoimport/other/A.groovy → ...ails/gorm/tests/autoimport/other/A.groovy b/...ails/gorm/tests/autoimport/other/A.groovy → ...ails/gorm/tests/autoimport/other/A.groovy
diff --git a/...idirectionalOneToOneWithUniqueSpec.groovy → ...idirectionalOneToOneWithUniqueSpec.groovy b/...idirectionalOneToOneWithUniqueSpec.groovy → ...idirectionalOneToOneWithUniqueSpec.groovy
diff --git a/...y/grails/gorm/tests/belongsto/Face.groovy → ...y/grails/gorm/tests/belongsto/Face.groovy b/...y/grails/gorm/tests/belongsto/Face.groovy → ...y/grails/gorm/tests/belongsto/Face.groovy
diff --git a/...y/grails/gorm/tests/belongsto/Nose.groovy → ...y/grails/gorm/tests/belongsto/Nose.groovy b/...y/grails/gorm/tests/belongsto/Nose.groovy → ...y/grails/gorm/tests/belongsto/Nose.groovy
diff --git a/...ts/compositeid/CompositeIdCriteria.groovy → ...ts/compositeid/CompositeIdCriteria.groovy b/...ts/compositeid/CompositeIdCriteria.groovy → ...ts/compositeid/CompositeIdCriteria.groovy
diff --git a/...siteIdWithDeepOneToManyMappingSpec.groovy → ...siteIdWithDeepOneToManyMappingSpec.groovy b/...siteIdWithDeepOneToManyMappingSpec.groovy → ...siteIdWithDeepOneToManyMappingSpec.groovy
diff --git a/...lobalConstraintWithCompositeIdSpec.groovy → ...lobalConstraintWithCompositeIdSpec.groovy b/...lobalConstraintWithCompositeIdSpec.groovy → ...lobalConstraintWithCompositeIdSpec.groovy
diff --git a/...hecking/HibernateDirtyCheckingSpec.groovy → ...hecking/HibernateDirtyCheckingSpec.groovy b/...hecking/HibernateDirtyCheckingSpec.groovy → ...hecking/HibernateDirtyCheckingSpec.groovy
diff --git a/...ng/HibernateUpdateFromListenerSpec.groovy → ...ng/HibernateUpdateFromListenerSpec.groovy b/...ng/HibernateUpdateFromListenerSpec.groovy → ...ng/HibernateUpdateFromListenerSpec.groovy
diff --git a/...ts/dirtychecking/PropertyFieldSpec.groovy → ...ts/dirtychecking/PropertyFieldSpec.groovy b/...ts/dirtychecking/PropertyFieldSpec.groovy → ...ts/dirtychecking/PropertyFieldSpec.groovy
diff --git a/.../UpdatePropertyInEventListenerSpec.groovy → .../UpdatePropertyInEventListenerSpec.groovy b/.../UpdatePropertyInEventListenerSpec.groovy → .../UpdatePropertyInEventListenerSpec.groovy
diff --git a/...sts/hasmany/HasManyWithInQuerySpec.groovy → ...sts/hasmany/HasManyWithInQuerySpec.groovy b/...sts/hasmany/HasManyWithInQuerySpec.groovy → ...sts/hasmany/HasManyWithInQuerySpec.groovy
diff --git a/...m/tests/hasmany/ListCollectionSpec.groovy → ...m/tests/hasmany/ListCollectionSpec.groovy b/...m/tests/hasmany/ListCollectionSpec.groovy → ...m/tests/hasmany/ListCollectionSpec.groovy
diff --git a/...smany/TwoUnidirectionalHasManySpec.groovy → ...smany/TwoUnidirectionalHasManySpec.groovy b/...smany/TwoUnidirectionalHasManySpec.groovy → ...smany/TwoUnidirectionalHasManySpec.groovy
diff --git a/...inheritance/SubclassToOneProxySpec.groovy → ...inheritance/SubclassToOneProxySpec.groovy b/...inheritance/SubclassToOneProxySpec.groovy → ...inheritance/SubclassToOneProxySpec.groovy
diff --git a/...PerConcreteClassAndDateCreatedSpec.groovy → ...PerConcreteClassAndDateCreatedSpec.groovy b/...PerConcreteClassAndDateCreatedSpec.groovy → ...PerConcreteClassAndDateCreatedSpec.groovy
diff --git a/.../TablePerConcreteClassImportedSpec.groovy → .../TablePerConcreteClassImportedSpec.groovy b/.../TablePerConcreteClassImportedSpec.groovy → .../TablePerConcreteClassImportedSpec.groovy
diff --git a/...gorm/tests/jpa/SimpleJpaEntitySpec.groovy → ...gorm/tests/jpa/SimpleJpaEntitySpec.groovy b/...gorm/tests/jpa/SimpleJpaEntitySpec.groovy → ...gorm/tests/jpa/SimpleJpaEntitySpec.groovy
diff --git a/...ests/mappedby/MultipleOneToOneSpec.groovy → ...ests/mappedby/MultipleOneToOneSpec.groovy b/...ests/mappedby/MultipleOneToOneSpec.groovy → ...ests/mappedby/MultipleOneToOneSpec.groovy
diff --git a/...TenancyBidirectionalManyToManySpec.groovy → ...TenancyBidirectionalManyToManySpec.groovy b/...TenancyBidirectionalManyToManySpec.groovy → ...TenancyBidirectionalManyToManySpec.groovy
diff --git a/...TenancyUnidirectionalOneToManySpec.groovy → ...TenancyUnidirectionalOneToManySpec.groovy b/...TenancyUnidirectionalOneToManySpec.groovy → ...TenancyUnidirectionalOneToManySpec.groovy
diff --git a/...rails/gorm/tests/perf/JoinPerfSpec.groovy → ...rails/gorm/tests/perf/JoinPerfSpec.groovy b/...rails/gorm/tests/perf/JoinPerfSpec.groovy → ...rails/gorm/tests/perf/JoinPerfSpec.groovy
diff --git a/...orm/tests/services/DataServiceSpec.groovy → ...orm/tests/services/DataServiceSpec.groovy b/...orm/tests/services/DataServiceSpec.groovy → ...orm/tests/services/DataServiceSpec.groovy
diff --git a/...rm/tests/softdelete/SoftDeleteSpec.groovy → ...rm/tests/softdelete/SoftDeleteSpec.groovy b/...rm/tests/softdelete/SoftDeleteSpec.groovy → ...rm/tests/softdelete/SoftDeleteSpec.groovy
diff --git a/...tests/traits/InterfacePropertySpec.groovy → ...tests/traits/InterfacePropertySpec.groovy b/...tests/traits/InterfacePropertySpec.groovy → ...tests/traits/InterfacePropertySpec.groovy
diff --git a/...orm/tests/traits/TraitPropertySpec.groovy → ...orm/tests/traits/TraitPropertySpec.groovy b/...orm/tests/traits/TraitPropertySpec.groovy → ...orm/tests/traits/TraitPropertySpec.groovy
diff --git a/...tests/txs/CustomIsolationLevelSpec.groovy → ...tests/txs/CustomIsolationLevelSpec.groovy b/...tests/txs/CustomIsolationLevelSpec.groovy → ...tests/txs/CustomIsolationLevelSpec.groovy
diff --git a/...sts/txs/TransactionPropagationSpec.groovy → ...sts/txs/TransactionPropagationSpec.groovy b/...sts/txs/TransactionPropagationSpec.groovy → ...sts/txs/TransactionPropagationSpec.groovy
diff --git a/...xs/TransactionalWithinReadOnlySpec.groovy → ...xs/TransactionalWithinReadOnlySpec.groovy b/...xs/TransactionalWithinReadOnlySpec.groovy → ...xs/TransactionalWithinReadOnlySpec.groovy
diff --git a/...ils/gorm/tests/uuid/UuidInsertSpec.groovy → ...ils/gorm/tests/uuid/UuidInsertSpec.groovy b/...ils/gorm/tests/uuid/UuidInsertSpec.groovy → ...ils/gorm/tests/uuid/UuidInsertSpec.groovy
diff --git a/...ests/validation/BeanValidationSpec.groovy → ...ests/validation/BeanValidationSpec.groovy b/...ests/validation/BeanValidationSpec.groovy → ...ests/validation/BeanValidationSpec.groovy
diff --git a/...s/validation/CascadeValidationSpec.groovy → ...s/validation/CascadeValidationSpec.groovy b/...s/validation/CascadeValidationSpec.groovy → ...s/validation/CascadeValidationSpec.groovy
diff --git a/...ests/validation/DeepValidationSpec.groovy → ...ests/validation/DeepValidationSpec.groovy b/...ests/validation/DeepValidationSpec.groovy → ...ests/validation/DeepValidationSpec.groovy
diff --git a/...lidation/SaveWithInvalidEntitySpec.groovy → ...lidation/SaveWithInvalidEntitySpec.groovy b/...lidation/SaveWithInvalidEntitySpec.groovy → ...lidation/SaveWithInvalidEntitySpec.groovy
diff --git a/...lidation/UniqueFalseConstraintSpec.groovy → ...lidation/UniqueFalseConstraintSpec.groovy b/...lidation/UniqueFalseConstraintSpec.groovy → ...lidation/UniqueFalseConstraintSpec.groovy
diff --git a/...s/validation/UniqueInheritanceSpec.groovy → ...s/validation/UniqueInheritanceSpec.groovy b/...s/validation/UniqueInheritanceSpec.groovy → ...s/validation/UniqueInheritanceSpec.groovy
diff --git a/...ts/validation/UniqueWithHasOneSpec.groovy → ...ts/validation/UniqueWithHasOneSpec.groovy b/...ts/validation/UniqueWithHasOneSpec.groovy → ...ts/validation/UniqueWithHasOneSpec.groovy
diff --git a/...s/validation/UniqueWithinGroupSpec.groovy → ...s/validation/UniqueWithinGroupSpec.groovy b/...s/validation/UniqueWithinGroupSpec.groovy → ...s/validation/UniqueWithinGroupSpec.groovy
diff --git a/...vy/org/grails/datastore/gorm/Setup.groovy → ...vy/org/grails/datastore/gorm/Setup.groovy b/...vy/org/grails/datastore/gorm/Setup.groovy → ...vy/org/grails/datastore/gorm/Setup.groovy
diff --git a/...m/hibernate/DefaultConstraintsSpec.groovy → ...m/hibernate/DefaultConstraintsSpec.groovy b/...m/hibernate/DefaultConstraintsSpec.groovy → ...m/hibernate/DefaultConstraintsSpec.groovy
diff --git a/.../org/grails/orm/hibernate/GormSpec.groovy → .../org/grails/orm/hibernate/GormSpec.groovy b/.../org/grails/orm/hibernate/GormSpec.groovy → .../org/grails/orm/hibernate/GormSpec.groovy
diff --git a/...m/hibernate/HibernateDatastoreSpec.groovy → ...m/hibernate/HibernateDatastoreSpec.groovy b/...m/hibernate/HibernateDatastoreSpec.groovy → ...m/hibernate/HibernateDatastoreSpec.groovy
diff --git a/...te/cfg/HibernateMappingContextSpec.groovy → ...te/cfg/HibernateMappingContextSpec.groovy b/...te/cfg/HibernateMappingContextSpec.groovy → ...te/cfg/HibernateMappingContextSpec.groovy
diff --git a/.../HibernateEntityTransformationSpec.groovy → .../HibernateEntityTransformationSpec.groovy b/.../HibernateEntityTransformationSpec.groovy → .../HibernateEntityTransformationSpec.groovy
diff --git a/...aSourceConnectionSourceFactorySpec.groovy → ...aSourceConnectionSourceFactorySpec.groovy b/...aSourceConnectionSourceFactorySpec.groovy → ...aSourceConnectionSourceFactorySpec.groovy
diff --git a/...bernateConnectionSourceFactorySpec.groovy → ...bernateConnectionSourceFactorySpec.groovy b/...bernateConnectionSourceFactorySpec.groovy → ...bernateConnectionSourceFactorySpec.groovy
diff --git a/...ernateConnectionSourceSettingsSpec.groovy → ...ernateConnectionSourceSettingsSpec.groovy b/...ernateConnectionSourceSettingsSpec.groovy → ...ernateConnectionSourceSettingsSpec.groovy
diff --git a/.../MultipleDataSourceConnectionsSpec.groovy → .../MultipleDataSourceConnectionsSpec.groovy b/.../MultipleDataSourceConnectionsSpec.groovy → .../MultipleDataSourceConnectionsSpec.groovy
diff --git a/...ons/MultipleDataSourceMetadataSpec.groovy → ...ons/MultipleDataSourceMetadataSpec.groovy b/...ons/MultipleDataSourceMetadataSpec.groovy → ...ons/MultipleDataSourceMetadataSpec.groovy
diff --git a/...MultipleDataSourcesWithCachingSpec.groovy → ...MultipleDataSourcesWithCachingSpec.groovy b/...MultipleDataSourcesWithCachingSpec.groovy → ...MultipleDataSourcesWithCachingSpec.groovy
diff --git a/.../MultipleDataSourcesWithEventsSpec.groovy → .../MultipleDataSourcesWithEventsSpec.groovy b/.../MultipleDataSourcesWithEventsSpec.groovy → .../MultipleDataSourcesWithEventsSpec.groovy
diff --git a/...ctions/PartitionedMultiTenancySpec.groovy → ...ctions/PartitionedMultiTenancySpec.groovy b/...ctions/PartitionedMultiTenancySpec.groovy → ...ctions/PartitionedMultiTenancySpec.groovy
diff --git a/.../connections/SchemaMultiTenantSpec.groovy → .../connections/SchemaMultiTenantSpec.groovy b/.../connections/SchemaMultiTenantSpec.groovy → .../connections/SchemaMultiTenantSpec.groovy
diff --git a/...e/connections/SecondLevelCacheSpec.groovy → ...e/connections/SecondLevelCacheSpec.groovy b/...e/connections/SecondLevelCacheSpec.groovy → ...e/connections/SecondLevelCacheSpec.groovy
diff --git a/...rnate/connections/SingleTenantSpec.groovy → ...rnate/connections/SingleTenantSpec.groovy b/...rnate/connections/SingleTenantSpec.groovy → ...rnate/connections/SingleTenantSpec.groovy
diff --git a/...xy/SimpleHibernateProxyHandlerSpec.groovy → ...xy/SimpleHibernateProxyHandlerSpec.groovy b/...xy/SimpleHibernateProxyHandlerSpec.groovy → ...xy/SimpleHibernateProxyHandlerSpec.groovy
diff --git a/...upport/HibernateVersionSupportSpec.groovy → ...upport/HibernateVersionSupportSpec.groovy b/...upport/HibernateVersionSupportSpec.groovy → ...upport/HibernateVersionSupportSpec.groovy
diff --git a/...rc/test/resources/simplelogger.properties → ...rc/test/resources/simplelogger.properties b/...rc/test/resources/simplelogger.properties → ...rc/test/resources/simplelogger.properties
diff --git 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
+}
diff --git 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'