From 55a6752a3fb929a0be4e98c84998e149cf4603dd Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Sat, 2 Mar 2024 11:07:31 +0800 Subject: [PATCH 01/23] Grace: rename all sub-projects --- .../build.gradle | 0 .../grails/orm/HibernateCriteriaBuilder.java | 0 .../main/groovy/grails/orm/PagedResultList.java | 0 .../main/groovy/grails/orm/RlikeExpression.java | 0 .../grails/orm/hibernate/HibernateEntity.groovy | 0 .../orm/hibernate/annotation/ManagedEntity.java | 0 .../orm/hibernate/mapping/MappingBuilder.groovy | 0 .../hibernate/AbstractHibernateDatastore.java | 0 .../AbstractHibernateGormInstanceApi.groovy | 0 .../AbstractHibernateGormStaticApi.groovy | 0 .../AbstractHibernateGormValidationApi.groovy | 0 .../orm/hibernate/AbstractHibernateSession.java | 0 .../orm/hibernate/EventListenerIntegrator.java | 0 .../orm/hibernate/GrailsHibernateTemplate.java | 0 .../GrailsHibernateTransactionManager.groovy | 0 .../orm/hibernate/GrailsSessionContext.java | 0 .../grails/orm/hibernate/HibernateDatastore.java | 0 .../orm/hibernate/HibernateEventListeners.java | 0 .../orm/hibernate/HibernateGormEnhancer.groovy | 0 .../hibernate/HibernateGormInstanceApi.groovy | 0 .../orm/hibernate/HibernateGormStaticApi.groovy | 0 .../hibernate/HibernateGormValidationApi.groovy | 0 ...ibernateMappingContextSessionFactoryBean.java | 0 .../grails/orm/hibernate/HibernateSession.java | 0 .../grails/orm/hibernate/IHibernateTemplate.java | 0 .../grails/orm/hibernate/InstanceApiHelper.java | 0 .../orm/hibernate/MetadataIntegrator.groovy | 0 .../orm/hibernate/SessionFactoryHolder.java | 0 .../access/TraitPropertyAccessStrategy.java | 0 .../cfg/AbstractGrailsDomainBinder.java | 0 .../grails/orm/hibernate/cfg/CacheConfig.groovy | 0 .../grails/orm/hibernate/cfg/ColumnConfig.groovy | 0 .../orm/hibernate/cfg/CompositeIdentity.groovy | 0 .../orm/hibernate/cfg/DiscriminatorConfig.groovy | 0 .../orm/hibernate/cfg/GrailsDomainBinder.java | 0 .../orm/hibernate/cfg/GrailsHibernateUtil.java | 0 .../cfg/GrailsIdentifierGeneratorFactory.java | 0 .../hibernate/cfg/HibernateMappingBuilder.groovy | 0 .../hibernate/cfg/HibernateMappingContext.java | 0 .../HibernateMappingContextConfiguration.java | 0 .../hibernate/cfg/HibernatePersistentEntity.java | 0 .../org/grails/orm/hibernate/cfg/Identity.groovy | 0 .../orm/hibernate/cfg/IdentityEnumType.java | 0 .../orm/hibernate/cfg/InstanceProxy.groovy | 0 .../grails/orm/hibernate/cfg/JoinTable.groovy | 0 .../org/grails/orm/hibernate/cfg/Mapping.groovy | 0 .../grails/orm/hibernate/cfg/NaturalId.groovy | 0 .../cfg/PersistentEntityNamingStrategy.java | 0 .../orm/hibernate/cfg/PropertyConfig.groovy | 0 .../cfg/PropertyDefinitionDelegate.groovy | 0 .../org/grails/orm/hibernate/cfg/Settings.java | 0 .../grails/orm/hibernate/cfg/SortConfig.groovy | 0 .../org/grails/orm/hibernate/cfg/Table.groovy | 0 .../HibernateEntityTransformation.groovy | 0 ...AbstractHibernateConnectionSourceFactory.java | 0 .../connections/HibernateConnectionSource.java | 0 .../HibernateConnectionSourceFactory.java | 0 .../HibernateConnectionSourceSettings.groovy | 0 ...bernateConnectionSourceSettingsBuilder.groovy | 0 .../datasource/MultipleDataSourceSupport.java | 0 .../dirty/GrailsEntityDirtinessStrategy.groovy | 0 .../listener/AbstractHibernateEventListener.java | 0 .../event/listener/HibernateEventListener.java | 0 ...uldNotDetermineHibernateDialectException.java | 0 .../GrailsHibernateConfigurationException.java | 0 .../exceptions/GrailsHibernateException.java | 0 .../exceptions/GrailsQueryException.java | 0 .../multitenancy/MultiTenantEventListener.java | 0 .../hibernate/proxy/HibernateProxyHandler.java | 0 .../proxy/SimpleHibernateProxyHandler.java | 0 .../query/AbstractHibernateCriteriaBuilder.java | 0 .../query/AbstractHibernateCriterionAdapter.java | 0 .../hibernate/query/AbstractHibernateQuery.java | 0 .../query/GrailsHibernateQueryUtils.java | 0 .../query/HibernateCriterionAdapter.java | 0 .../orm/hibernate/query/HibernateHqlQuery.java | 0 .../query/HibernateProjectionAdapter.java | 0 .../orm/hibernate/query/HibernateQuery.java | 0 .../hibernate/query/HibernateQueryConstants.java | 0 .../orm/hibernate/query/PagedResultList.java | 0 ...bstractClosureEventTriggeringInterceptor.java | 0 .../hibernate/support/ClosureEventListener.java | 0 .../ClosureEventTriggeringInterceptor.java | 0 .../support/DataSourceFactoryBean.groovy | 0 ...ateDatastoreConnectionSourcesRegistrar.groovy | 0 .../support/HibernateDatastoreFactoryBean.groovy | 0 .../HibernateDialectDetectorFactoryBean.java | 0 .../support/HibernateRuntimeUtils.groovy | 0 .../support/HibernateVersionSupport.java | 0 .../grails/orm/hibernate/support/SoftKey.java | 0 .../HibernateJtaTransactionManagerAdapter.java | 0 .../PlatformTransactionManagerProxy.java | 0 .../org.hibernate.integrator.spi.Integrator | 0 .../mapping/HibernateMappingBuilderTests.groovy | 0 ...rnateOptimisticLockingStyleMappingSpec.groovy | 0 .../hibernate/mapping/MappingBuilderSpec.groovy | 0 .../grails/gorm/tests/AutoTimestampSpec.groovy | 0 ...CascadeToBidirectionalAsssociationSpec.groovy | 0 .../test/groovy/grails/gorm/tests/Club.groovy | 0 .../tests/CompositeIdWithJoinTableSpec.groovy | 0 ...ompositeIdWithManyToOneAndSequenceSpec.groovy | 0 .../groovy/grails/gorm/tests/Contract.groovy | 0 .../gorm/tests/CountByWithEmbeddedSpec.groovy | 0 .../grails/gorm/tests/DeleteAllWhereSpec.groovy | 0 .../gorm/tests/DetachCriteriaSubquerySpec.groovy | 0 .../gorm/tests/DetachedCriteriaJoinSpec.groovy | 0 .../tests/DetachedCriteriaProjectionSpec.groovy | 0 .../grails/gorm/tests/DomainGetterSpec.groovy | 0 .../grails/gorm/tests/EnumMappingSpec.groovy | 0 .../tests/ExecuteQueryWithinValidatorSpec.groovy | 0 .../grails/gorm/tests/GroovyProxySpec.groovy | 0 .../grails/gorm/tests/HibernateSuite.groovy | 0 .../gorm/tests/IdentityEnumTypeSpec.groovy | 0 .../gorm/tests/ImportFromConstraintSpec.groovy | 0 .../tests/LastUpdateWithDynamicUpdateSpec.groovy | 0 .../grails/gorm/tests/ManyToOneSpec.groovy | 0 .../tests/MultiColumnUniqueConstraintSpec.groovy | 0 .../grails/gorm/tests/NullValueEqualSpec.groovy | 0 .../gorm/tests/NullableAndLengthSpec.groovy | 0 .../gorm/tests/OptimisticLockingSpec.groovy | 0 .../test/groovy/grails/gorm/tests/Player.groovy | 0 .../groovy/grails/gorm/tests/RLikeSpec.groovy | 0 .../grails/gorm/tests/ReadOperationSpec.groovy | 0 .../SaveWithExistingValidationErrorSpec.groovy | 0 .../grails/gorm/tests/SchemaNameSpec.groovy | 0 .../grails/gorm/tests/SequenceIdSpec.groovy | 0 .../grails/gorm/tests/SizeConstraintSpec.groovy | 0 .../groovy/grails/gorm/tests/SqlQuerySpec.groovy | 0 .../SubclassMultipleListCollectionSpec.groovy | 0 .../grails/gorm/tests/SubqueryAliasSpec.groovy | 0 .../tests/TablePerSubClassAndEmbeddedSpec.groovy | 0 .../test/groovy/grails/gorm/tests/Team.groovy | 0 .../grails/gorm/tests/ToOneProxySpec.groovy | 0 .../tests/TwoBidirectionalOneToManySpec.groovy | 0 .../tests/UniqueConstraintHibernateSpec.groovy | 0 .../UniqueWithMultipleDataSourcesSpec.groovy | 0 .../grails/gorm/tests/ValidationSpec.groovy | 0 .../WhereQueryWithAssociationSortSpec.groovy | 0 ...thNewSessionAndExistingTransactionSpec.groovy | 0 .../gorm/tests/autoimport/AutoImportSpec.groovy | 0 .../grails/gorm/tests/autoimport/other/A.groovy | 0 .../BidirectionalOneToOneWithUniqueSpec.groovy | 0 .../grails/gorm/tests/belongsto/Face.groovy | 0 .../grails/gorm/tests/belongsto/Nose.groovy | 0 .../tests/compositeid/CompositeIdCriteria.groovy | 0 ...ompositeIdWithDeepOneToManyMappingSpec.groovy | 0 .../GlobalConstraintWithCompositeIdSpec.groovy | 0 .../HibernateDirtyCheckingSpec.groovy | 0 .../HibernateUpdateFromListenerSpec.groovy | 0 .../tests/dirtychecking/PropertyFieldSpec.groovy | 0 .../UpdatePropertyInEventListenerSpec.groovy | 0 .../tests/hasmany/HasManyWithInQuerySpec.groovy | 0 .../gorm/tests/hasmany/ListCollectionSpec.groovy | 0 .../hasmany/TwoUnidirectionalHasManySpec.groovy | 0 .../inheritance/SubclassToOneProxySpec.groovy | 0 ...ablePerConcreteClassAndDateCreatedSpec.groovy | 0 .../TablePerConcreteClassImportedSpec.groovy | 0 .../gorm/tests/jpa/SimpleJpaEntitySpec.groovy | 0 .../tests/mappedby/MultipleOneToOneSpec.groovy | 0 ...ultiTenancyBidirectionalManyToManySpec.groovy | 0 ...ultiTenancyUnidirectionalOneToManySpec.groovy | 0 .../grails/gorm/tests/perf/JoinPerfSpec.groovy | 0 .../gorm/tests/services/DataServiceSpec.groovy | 0 .../gorm/tests/softdelete/SoftDeleteSpec.groovy | 0 .../tests/traits/InterfacePropertySpec.groovy | 0 .../gorm/tests/traits/TraitPropertySpec.groovy | 0 .../tests/txs/CustomIsolationLevelSpec.groovy | 0 .../tests/txs/TransactionPropagationSpec.groovy | 0 .../txs/TransactionalWithinReadOnlySpec.groovy | 0 .../grails/gorm/tests/uuid/UuidInsertSpec.groovy | 0 .../tests/validation/BeanValidationSpec.groovy | 0 .../validation/CascadeValidationSpec.groovy | 0 .../tests/validation/DeepValidationSpec.groovy | 0 .../validation/SaveWithInvalidEntitySpec.groovy | 0 .../validation/UniqueFalseConstraintSpec.groovy | 0 .../validation/UniqueInheritanceSpec.groovy | 0 .../tests/validation/UniqueWithHasOneSpec.groovy | 0 .../validation/UniqueWithinGroupSpec.groovy | 0 .../org/grails/datastore/gorm/Setup.groovy | 0 .../orm/hibernate/DefaultConstraintsSpec.groovy | 0 .../org/grails/orm/hibernate/GormSpec.groovy | 0 .../orm/hibernate/HibernateDatastoreSpec.groovy | 0 .../cfg/HibernateMappingContextSpec.groovy | 0 .../HibernateEntityTransformationSpec.groovy | 0 .../DataSourceConnectionSourceFactorySpec.groovy | 0 .../HibernateConnectionSourceFactorySpec.groovy | 0 .../HibernateConnectionSourceSettingsSpec.groovy | 0 .../MultipleDataSourceConnectionsSpec.groovy | 0 .../MultipleDataSourceMetadataSpec.groovy | 0 .../MultipleDataSourcesWithCachingSpec.groovy | 0 .../MultipleDataSourcesWithEventsSpec.groovy | 0 .../PartitionedMultiTenancySpec.groovy | 0 .../connections/SchemaMultiTenantSpec.groovy | 0 .../connections/SecondLevelCacheSpec.groovy | 0 .../connections/SingleTenantSpec.groovy | 0 .../proxy/SimpleHibernateProxyHandlerSpec.groovy | 0 .../support/HibernateVersionSupportSpec.groovy | 0 .../src/test/resources/simplelogger.properties | 0 {grails-plugin => grace-plugin}/build.gradle | 0 .../grails-app/.gitkeep | 0 .../grails-app/conf/application.yml | 0 .../grails.plugin.hibernate/Application.groovy | 0 .../HibernateDatastoreSpringInitializer.groovy | 0 .../hibernate/HibernateGrailsPlugin.groovy | 0 .../commands/SchemaExportCommand.groovy | 0 .../grails/test/hibernate/HibernateSpec.groovy | 0 ...ceAggregatePersistenceContextInterceptor.java | 0 .../AggregatePersistenceContextInterceptor.java | 0 .../GrailsOpenSessionInViewInterceptor.java | 0 .../HibernatePersistenceContextInterceptor.java | 0 ...actoryAwarePersistenceContextInterceptor.java | 0 ...ibernateDatastoreSpringInitializerSpec.groovy | 0 .../hibernate/HibernateSpecOverrideSpec.groovy | 0 .../mixin/hibernate/HibernateSpecSpec.groovy | 0 .../groovy/org/grails/orm/hibernate/.DS_Store | Bin 6148 -> 0 bytes 215 files changed, 0 insertions(+), 0 deletions(-) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/build.gradle (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/grails/orm/PagedResultList.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/grails/orm/RlikeExpression.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/grails/orm/hibernate/annotation/ManagedEntity.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/grails/orm/hibernate/mapping/MappingBuilder.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormInstanceApi.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormValidationApi.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/EventListenerIntegrator.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTemplate.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTransactionManager.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/GrailsSessionContext.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/HibernateEventListeners.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/HibernateGormEnhancer.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/HibernateGormInstanceApi.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/HibernateGormValidationApi.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/HibernateMappingContextSessionFactoryBean.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/HibernateSession.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/IHibernateTemplate.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/InstanceApiHelper.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/MetadataIntegrator.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/SessionFactoryHolder.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/access/TraitPropertyAccessStrategy.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/AbstractGrailsDomainBinder.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/CacheConfig.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/ColumnConfig.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/DiscriminatorConfig.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtil.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsIdentifierGeneratorFactory.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingBuilder.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContext.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/HibernatePersistentEntity.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/Identity.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/IdentityEnumType.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/InstanceProxy.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/JoinTable.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/Mapping.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/NaturalId.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyDefinitionDelegate.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/Settings.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/SortConfig.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/cfg/Table.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformation.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/connections/AbstractHibernateConnectionSourceFactory.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSource.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsBuilder.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/datasource/MultipleDataSourceSupport.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/event/listener/HibernateEventListener.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/exceptions/CouldNotDetermineHibernateDialectException.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateConfigurationException.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateException.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsQueryException.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/multitenancy/MultiTenantEventListener.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandler.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriterionAdapter.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateQuery.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/query/HibernateCriterionAdapter.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/query/HibernateProjectionAdapter.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryConstants.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/query/PagedResultList.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/support/DataSourceFactoryBean.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreConnectionSourcesRegistrar.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreFactoryBean.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/support/HibernateDialectDetectorFactoryBean.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/support/HibernateRuntimeUtils.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/support/HibernateVersionSupport.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/support/SoftKey.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/groovy/org/grails/orm/hibernate/transaction/PlatformTransactionManagerProxy.java (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/main/resources/META-INF/org.hibernate.integrator.spi.Integrator (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderTests.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/hibernate/mapping/HibernateOptimisticLockingStyleMappingSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/hibernate/mapping/MappingBuilderSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/AutoTimestampSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/CascadeToBidirectionalAsssociationSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/Club.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/Contract.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/CountByWithEmbeddedSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/DeleteAllWhereSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/DetachCriteriaSubquerySpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/DetachedCriteriaJoinSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/DetachedCriteriaProjectionSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/DomainGetterSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/EnumMappingSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/ExecuteQueryWithinValidatorSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/GroovyProxySpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/HibernateSuite.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/ImportFromConstraintSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/LastUpdateWithDynamicUpdateSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/ManyToOneSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/MultiColumnUniqueConstraintSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/NullValueEqualSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/NullableAndLengthSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/OptimisticLockingSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/Player.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/RLikeSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/ReadOperationSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/SaveWithExistingValidationErrorSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/SchemaNameSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/SequenceIdSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/SizeConstraintSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/SqlQuerySpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/SubclassMultipleListCollectionSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/SubqueryAliasSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/Team.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/ToOneProxySpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/TwoBidirectionalOneToManySpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/UniqueConstraintHibernateSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/ValidationSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/WhereQueryWithAssociationSortSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/WithNewSessionAndExistingTransactionSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/autoimport/AutoImportSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/autoimport/other/A.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/belongsto/BidirectionalOneToOneWithUniqueSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/belongsto/Face.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/belongsto/Nose.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdCriteria.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateDirtyCheckingSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateUpdateFromListenerSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/dirtychecking/PropertyFieldSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/events/UpdatePropertyInEventListenerSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/hasmany/HasManyWithInQuerySpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/hasmany/ListCollectionSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/hasmany/TwoUnidirectionalHasManySpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassImportedSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/jpa/SimpleJpaEntitySpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/mappedby/MultipleOneToOneSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/perf/JoinPerfSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/services/DataServiceSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/softdelete/SoftDeleteSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/traits/InterfacePropertySpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/traits/TraitPropertySpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/txs/CustomIsolationLevelSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/txs/TransactionPropagationSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/txs/TransactionalWithinReadOnlySpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/uuid/UuidInsertSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/validation/BeanValidationSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/validation/DeepValidationSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/validation/SaveWithInvalidEntitySpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/validation/UniqueFalseConstraintSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/validation/UniqueWithHasOneSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/grails/gorm/tests/validation/UniqueWithinGroupSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/org/grails/datastore/gorm/Setup.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/org/grails/orm/hibernate/DefaultConstraintsSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/org/grails/orm/hibernate/GormSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformationSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/org/grails/orm/hibernate/connections/DataSourceConnectionSourceFactorySpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceConnectionsSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceMetadataSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/org/grails/orm/hibernate/connections/SecondLevelCacheSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandlerSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/groovy/org/grails/orm/hibernate/support/HibernateVersionSupportSpec.groovy (100%) rename {grails-datastore-gorm-hibernate5 => grace-datastore-gorm-hibernate5}/src/test/resources/simplelogger.properties (100%) rename {grails-plugin => grace-plugin}/build.gradle (100%) rename {grails-plugin => grace-plugin}/grails-app/.gitkeep (100%) rename {grails-plugin => grace-plugin}/grails-app/conf/application.yml (100%) rename {grails-plugin => grace-plugin}/grails-app/init/grails.plugin.hibernate/Application.groovy (100%) rename {grails-plugin => grace-plugin}/src/main/groovy/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.groovy (100%) rename {grails-plugin => grace-plugin}/src/main/groovy/grails/plugin/hibernate/HibernateGrailsPlugin.groovy (100%) rename {grails-plugin => grace-plugin}/src/main/groovy/grails/plugin/hibernate/commands/SchemaExportCommand.groovy (100%) rename {grails-plugin => grace-plugin}/src/main/groovy/grails/test/hibernate/HibernateSpec.groovy (100%) rename {grails-plugin => grace-plugin}/src/main/groovy/org/grails/plugin/hibernate/support/AbstractMultipleDataSourceAggregatePersistenceContextInterceptor.java (100%) rename {grails-plugin => grace-plugin}/src/main/groovy/org/grails/plugin/hibernate/support/AggregatePersistenceContextInterceptor.java (100%) rename {grails-plugin => grace-plugin}/src/main/groovy/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.java (100%) rename {grails-plugin => grace-plugin}/src/main/groovy/org/grails/plugin/hibernate/support/HibernatePersistenceContextInterceptor.java (100%) rename {grails-plugin => grace-plugin}/src/main/groovy/org/grails/plugin/hibernate/support/SessionFactoryAwarePersistenceContextInterceptor.java (100%) rename {grails-plugin => grace-plugin}/src/test/groovy/grails/orm/bootstrap/HibernateDatastoreSpringInitializerSpec.groovy (100%) rename {grails-plugin => grace-plugin}/src/test/groovy/grails/test/mixin/hibernate/HibernateSpecOverrideSpec.groovy (100%) rename {grails-plugin => grace-plugin}/src/test/groovy/grails/test/mixin/hibernate/HibernateSpecSpec.groovy (100%) delete mode 100644 grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/.DS_Store diff --git a/grails-datastore-gorm-hibernate5/build.gradle b/grace-datastore-gorm-hibernate5/build.gradle similarity index 100% rename from grails-datastore-gorm-hibernate5/build.gradle rename to grace-datastore-gorm-hibernate5/build.gradle diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java b/grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/grails/orm/PagedResultList.java b/grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/PagedResultList.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/grails/orm/PagedResultList.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/PagedResultList.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/grails/orm/RlikeExpression.java b/grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/RlikeExpression.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/grails/orm/RlikeExpression.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/RlikeExpression.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/grails/orm/hibernate/annotation/ManagedEntity.java b/grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/hibernate/annotation/ManagedEntity.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/grails/orm/hibernate/annotation/ManagedEntity.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/hibernate/annotation/ManagedEntity.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/grails/orm/hibernate/mapping/MappingBuilder.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/hibernate/mapping/MappingBuilder.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/grails/orm/hibernate/mapping/MappingBuilder.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/grails/orm/hibernate/mapping/MappingBuilder.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormInstanceApi.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormInstanceApi.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormInstanceApi.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormInstanceApi.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormValidationApi.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormValidationApi.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormValidationApi.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormValidationApi.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/EventListenerIntegrator.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/EventListenerIntegrator.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/EventListenerIntegrator.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/EventListenerIntegrator.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTemplate.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTemplate.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTemplate.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTemplate.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTransactionManager.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTransactionManager.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTransactionManager.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTransactionManager.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/GrailsSessionContext.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/GrailsSessionContext.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/GrailsSessionContext.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/GrailsSessionContext.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateEventListeners.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateEventListeners.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateEventListeners.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateEventListeners.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormEnhancer.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormEnhancer.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormEnhancer.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormEnhancer.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormInstanceApi.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormInstanceApi.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormInstanceApi.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormInstanceApi.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormValidationApi.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormValidationApi.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormValidationApi.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateGormValidationApi.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateMappingContextSessionFactoryBean.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateMappingContextSessionFactoryBean.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateMappingContextSessionFactoryBean.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateMappingContextSessionFactoryBean.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateSession.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateSession.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateSession.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/HibernateSession.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/IHibernateTemplate.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/IHibernateTemplate.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/IHibernateTemplate.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/IHibernateTemplate.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/InstanceApiHelper.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/InstanceApiHelper.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/InstanceApiHelper.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/InstanceApiHelper.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/MetadataIntegrator.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/MetadataIntegrator.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/MetadataIntegrator.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/MetadataIntegrator.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/SessionFactoryHolder.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/SessionFactoryHolder.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/SessionFactoryHolder.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/SessionFactoryHolder.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/access/TraitPropertyAccessStrategy.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/access/TraitPropertyAccessStrategy.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/access/TraitPropertyAccessStrategy.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/access/TraitPropertyAccessStrategy.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/AbstractGrailsDomainBinder.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/AbstractGrailsDomainBinder.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/AbstractGrailsDomainBinder.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/AbstractGrailsDomainBinder.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/CacheConfig.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/CacheConfig.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/CacheConfig.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/CacheConfig.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/ColumnConfig.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/ColumnConfig.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/ColumnConfig.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/ColumnConfig.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/DiscriminatorConfig.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/DiscriminatorConfig.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/DiscriminatorConfig.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/DiscriminatorConfig.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtil.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtil.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtil.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtil.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsIdentifierGeneratorFactory.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsIdentifierGeneratorFactory.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsIdentifierGeneratorFactory.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsIdentifierGeneratorFactory.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingBuilder.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingBuilder.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingBuilder.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingBuilder.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContext.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContext.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContext.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContext.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernatePersistentEntity.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernatePersistentEntity.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernatePersistentEntity.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/HibernatePersistentEntity.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Identity.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Identity.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Identity.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Identity.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/IdentityEnumType.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/IdentityEnumType.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/IdentityEnumType.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/IdentityEnumType.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/InstanceProxy.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/InstanceProxy.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/InstanceProxy.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/InstanceProxy.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/JoinTable.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/JoinTable.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/JoinTable.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/JoinTable.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Mapping.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Mapping.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Mapping.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Mapping.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/NaturalId.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/NaturalId.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/NaturalId.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/NaturalId.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyDefinitionDelegate.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyDefinitionDelegate.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyDefinitionDelegate.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyDefinitionDelegate.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Settings.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Settings.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Settings.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Settings.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/SortConfig.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/SortConfig.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/SortConfig.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/SortConfig.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Table.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Table.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Table.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/Table.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformation.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformation.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformation.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformation.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/AbstractHibernateConnectionSourceFactory.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/AbstractHibernateConnectionSourceFactory.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/AbstractHibernateConnectionSourceFactory.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/AbstractHibernateConnectionSourceFactory.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSource.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSource.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSource.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSource.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsBuilder.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsBuilder.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsBuilder.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsBuilder.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/datasource/MultipleDataSourceSupport.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/datasource/MultipleDataSourceSupport.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/datasource/MultipleDataSourceSupport.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/datasource/MultipleDataSourceSupport.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/event/listener/HibernateEventListener.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/event/listener/HibernateEventListener.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/event/listener/HibernateEventListener.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/event/listener/HibernateEventListener.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/CouldNotDetermineHibernateDialectException.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/CouldNotDetermineHibernateDialectException.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/CouldNotDetermineHibernateDialectException.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/CouldNotDetermineHibernateDialectException.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateConfigurationException.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateConfigurationException.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateConfigurationException.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateConfigurationException.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateException.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateException.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateException.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateException.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsQueryException.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsQueryException.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsQueryException.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsQueryException.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/multitenancy/MultiTenantEventListener.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/multitenancy/MultiTenantEventListener.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/multitenancy/MultiTenantEventListener.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/multitenancy/MultiTenantEventListener.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandler.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandler.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandler.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandler.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriterionAdapter.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriterionAdapter.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriterionAdapter.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriterionAdapter.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateQuery.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateQuery.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateQuery.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateQuery.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateCriterionAdapter.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateCriterionAdapter.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateCriterionAdapter.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateCriterionAdapter.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateProjectionAdapter.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateProjectionAdapter.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateProjectionAdapter.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateProjectionAdapter.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryConstants.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryConstants.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryConstants.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryConstants.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/PagedResultList.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/PagedResultList.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/PagedResultList.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/query/PagedResultList.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/DataSourceFactoryBean.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/DataSourceFactoryBean.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/DataSourceFactoryBean.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/DataSourceFactoryBean.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreConnectionSourcesRegistrar.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreConnectionSourcesRegistrar.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreConnectionSourcesRegistrar.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreConnectionSourcesRegistrar.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreFactoryBean.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreFactoryBean.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreFactoryBean.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreFactoryBean.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateDialectDetectorFactoryBean.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateDialectDetectorFactoryBean.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateDialectDetectorFactoryBean.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateDialectDetectorFactoryBean.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateRuntimeUtils.groovy b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateRuntimeUtils.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateRuntimeUtils.groovy rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateRuntimeUtils.groovy diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateVersionSupport.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateVersionSupport.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateVersionSupport.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/HibernateVersionSupport.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/SoftKey.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/SoftKey.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/SoftKey.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/support/SoftKey.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.java diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/transaction/PlatformTransactionManagerProxy.java b/grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/transaction/PlatformTransactionManagerProxy.java similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/transaction/PlatformTransactionManagerProxy.java rename to grace-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/transaction/PlatformTransactionManagerProxy.java diff --git a/grails-datastore-gorm-hibernate5/src/main/resources/META-INF/org.hibernate.integrator.spi.Integrator b/grace-datastore-gorm-hibernate5/src/main/resources/META-INF/org.hibernate.integrator.spi.Integrator similarity index 100% rename from grails-datastore-gorm-hibernate5/src/main/resources/META-INF/org.hibernate.integrator.spi.Integrator rename to grace-datastore-gorm-hibernate5/src/main/resources/META-INF/org.hibernate.integrator.spi.Integrator diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderTests.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderTests.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderTests.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderTests.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/hibernate/mapping/HibernateOptimisticLockingStyleMappingSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/hibernate/mapping/HibernateOptimisticLockingStyleMappingSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/hibernate/mapping/HibernateOptimisticLockingStyleMappingSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/hibernate/mapping/HibernateOptimisticLockingStyleMappingSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/hibernate/mapping/MappingBuilderSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/hibernate/mapping/MappingBuilderSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/hibernate/mapping/MappingBuilderSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/hibernate/mapping/MappingBuilderSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/AutoTimestampSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/AutoTimestampSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/AutoTimestampSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/AutoTimestampSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CascadeToBidirectionalAsssociationSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CascadeToBidirectionalAsssociationSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CascadeToBidirectionalAsssociationSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CascadeToBidirectionalAsssociationSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Club.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Club.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Club.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Club.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Contract.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Contract.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Contract.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Contract.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CountByWithEmbeddedSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CountByWithEmbeddedSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CountByWithEmbeddedSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/CountByWithEmbeddedSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DeleteAllWhereSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DeleteAllWhereSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DeleteAllWhereSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DeleteAllWhereSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DetachCriteriaSubquerySpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DetachCriteriaSubquerySpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DetachCriteriaSubquerySpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DetachCriteriaSubquerySpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DetachedCriteriaJoinSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DetachedCriteriaJoinSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DetachedCriteriaJoinSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DetachedCriteriaJoinSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DetachedCriteriaProjectionSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DetachedCriteriaProjectionSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DetachedCriteriaProjectionSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DetachedCriteriaProjectionSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DomainGetterSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DomainGetterSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DomainGetterSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/DomainGetterSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/EnumMappingSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/EnumMappingSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/EnumMappingSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/EnumMappingSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ExecuteQueryWithinValidatorSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ExecuteQueryWithinValidatorSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ExecuteQueryWithinValidatorSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ExecuteQueryWithinValidatorSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/GroovyProxySpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/GroovyProxySpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/GroovyProxySpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/GroovyProxySpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/HibernateSuite.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/HibernateSuite.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/HibernateSuite.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/HibernateSuite.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ImportFromConstraintSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ImportFromConstraintSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ImportFromConstraintSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ImportFromConstraintSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/LastUpdateWithDynamicUpdateSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/LastUpdateWithDynamicUpdateSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/LastUpdateWithDynamicUpdateSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/LastUpdateWithDynamicUpdateSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ManyToOneSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ManyToOneSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ManyToOneSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ManyToOneSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/MultiColumnUniqueConstraintSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/MultiColumnUniqueConstraintSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/MultiColumnUniqueConstraintSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/MultiColumnUniqueConstraintSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/NullValueEqualSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/NullValueEqualSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/NullValueEqualSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/NullValueEqualSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/NullableAndLengthSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/NullableAndLengthSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/NullableAndLengthSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/NullableAndLengthSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/OptimisticLockingSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/OptimisticLockingSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/OptimisticLockingSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/OptimisticLockingSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Player.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Player.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Player.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Player.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/RLikeSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/RLikeSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/RLikeSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/RLikeSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ReadOperationSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ReadOperationSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ReadOperationSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ReadOperationSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SaveWithExistingValidationErrorSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SaveWithExistingValidationErrorSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SaveWithExistingValidationErrorSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SaveWithExistingValidationErrorSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SchemaNameSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SchemaNameSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SchemaNameSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SchemaNameSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SequenceIdSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SequenceIdSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SequenceIdSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SequenceIdSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SizeConstraintSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SizeConstraintSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SizeConstraintSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SizeConstraintSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SqlQuerySpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SqlQuerySpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SqlQuerySpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SqlQuerySpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SubclassMultipleListCollectionSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SubclassMultipleListCollectionSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SubclassMultipleListCollectionSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SubclassMultipleListCollectionSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SubqueryAliasSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SubqueryAliasSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SubqueryAliasSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SubqueryAliasSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Team.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Team.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Team.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/Team.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ToOneProxySpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ToOneProxySpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ToOneProxySpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ToOneProxySpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/TwoBidirectionalOneToManySpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/TwoBidirectionalOneToManySpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/TwoBidirectionalOneToManySpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/TwoBidirectionalOneToManySpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/UniqueConstraintHibernateSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/UniqueConstraintHibernateSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/UniqueConstraintHibernateSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/UniqueConstraintHibernateSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ValidationSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ValidationSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ValidationSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/ValidationSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/WhereQueryWithAssociationSortSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/WhereQueryWithAssociationSortSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/WhereQueryWithAssociationSortSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/WhereQueryWithAssociationSortSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/WithNewSessionAndExistingTransactionSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/WithNewSessionAndExistingTransactionSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/WithNewSessionAndExistingTransactionSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/WithNewSessionAndExistingTransactionSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/autoimport/AutoImportSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/autoimport/AutoImportSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/autoimport/AutoImportSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/autoimport/AutoImportSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/autoimport/other/A.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/autoimport/other/A.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/autoimport/other/A.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/autoimport/other/A.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/belongsto/BidirectionalOneToOneWithUniqueSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/belongsto/BidirectionalOneToOneWithUniqueSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/belongsto/BidirectionalOneToOneWithUniqueSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/belongsto/BidirectionalOneToOneWithUniqueSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/belongsto/Face.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/belongsto/Face.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/belongsto/Face.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/belongsto/Face.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/belongsto/Nose.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/belongsto/Nose.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/belongsto/Nose.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/belongsto/Nose.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdCriteria.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdCriteria.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdCriteria.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdCriteria.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateDirtyCheckingSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateDirtyCheckingSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateDirtyCheckingSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateDirtyCheckingSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateUpdateFromListenerSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateUpdateFromListenerSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateUpdateFromListenerSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateUpdateFromListenerSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/dirtychecking/PropertyFieldSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/dirtychecking/PropertyFieldSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/dirtychecking/PropertyFieldSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/dirtychecking/PropertyFieldSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/events/UpdatePropertyInEventListenerSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/events/UpdatePropertyInEventListenerSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/events/UpdatePropertyInEventListenerSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/events/UpdatePropertyInEventListenerSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/hasmany/HasManyWithInQuerySpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/hasmany/HasManyWithInQuerySpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/hasmany/HasManyWithInQuerySpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/hasmany/HasManyWithInQuerySpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/hasmany/ListCollectionSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/hasmany/ListCollectionSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/hasmany/ListCollectionSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/hasmany/ListCollectionSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/hasmany/TwoUnidirectionalHasManySpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/hasmany/TwoUnidirectionalHasManySpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/hasmany/TwoUnidirectionalHasManySpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/hasmany/TwoUnidirectionalHasManySpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassImportedSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassImportedSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassImportedSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassImportedSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/jpa/SimpleJpaEntitySpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/jpa/SimpleJpaEntitySpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/jpa/SimpleJpaEntitySpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/jpa/SimpleJpaEntitySpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/mappedby/MultipleOneToOneSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/mappedby/MultipleOneToOneSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/mappedby/MultipleOneToOneSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/mappedby/MultipleOneToOneSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/perf/JoinPerfSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/perf/JoinPerfSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/perf/JoinPerfSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/perf/JoinPerfSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/services/DataServiceSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/services/DataServiceSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/services/DataServiceSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/services/DataServiceSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/softdelete/SoftDeleteSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/softdelete/SoftDeleteSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/softdelete/SoftDeleteSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/softdelete/SoftDeleteSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/traits/InterfacePropertySpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/traits/InterfacePropertySpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/traits/InterfacePropertySpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/traits/InterfacePropertySpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/traits/TraitPropertySpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/traits/TraitPropertySpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/traits/TraitPropertySpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/traits/TraitPropertySpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/CustomIsolationLevelSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/CustomIsolationLevelSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/CustomIsolationLevelSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/CustomIsolationLevelSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/TransactionPropagationSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/TransactionPropagationSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/TransactionPropagationSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/TransactionPropagationSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/TransactionalWithinReadOnlySpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/TransactionalWithinReadOnlySpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/TransactionalWithinReadOnlySpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/txs/TransactionalWithinReadOnlySpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/uuid/UuidInsertSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/uuid/UuidInsertSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/uuid/UuidInsertSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/uuid/UuidInsertSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/BeanValidationSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/BeanValidationSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/BeanValidationSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/BeanValidationSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/DeepValidationSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/DeepValidationSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/DeepValidationSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/DeepValidationSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/SaveWithInvalidEntitySpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/SaveWithInvalidEntitySpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/SaveWithInvalidEntitySpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/SaveWithInvalidEntitySpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueFalseConstraintSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueFalseConstraintSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueFalseConstraintSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueFalseConstraintSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueWithHasOneSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueWithHasOneSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueWithHasOneSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueWithHasOneSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueWithinGroupSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueWithinGroupSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueWithinGroupSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueWithinGroupSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/datastore/gorm/Setup.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/datastore/gorm/Setup.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/datastore/gorm/Setup.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/datastore/gorm/Setup.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/DefaultConstraintsSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/DefaultConstraintsSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/DefaultConstraintsSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/DefaultConstraintsSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/GormSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/GormSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/GormSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/GormSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformationSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformationSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformationSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformationSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/DataSourceConnectionSourceFactorySpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/DataSourceConnectionSourceFactorySpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/DataSourceConnectionSourceFactorySpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/DataSourceConnectionSourceFactorySpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceConnectionsSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceConnectionsSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceConnectionsSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceConnectionsSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceMetadataSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceMetadataSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceMetadataSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceMetadataSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SecondLevelCacheSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SecondLevelCacheSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SecondLevelCacheSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SecondLevelCacheSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandlerSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandlerSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandlerSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandlerSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/support/HibernateVersionSupportSpec.groovy b/grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/support/HibernateVersionSupportSpec.groovy similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/support/HibernateVersionSupportSpec.groovy rename to grace-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/support/HibernateVersionSupportSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/resources/simplelogger.properties b/grace-datastore-gorm-hibernate5/src/test/resources/simplelogger.properties similarity index 100% rename from grails-datastore-gorm-hibernate5/src/test/resources/simplelogger.properties rename to grace-datastore-gorm-hibernate5/src/test/resources/simplelogger.properties diff --git a/grails-plugin/build.gradle b/grace-plugin/build.gradle similarity index 100% rename from grails-plugin/build.gradle rename to grace-plugin/build.gradle diff --git a/grails-plugin/grails-app/.gitkeep b/grace-plugin/grails-app/.gitkeep similarity index 100% rename from grails-plugin/grails-app/.gitkeep rename to grace-plugin/grails-app/.gitkeep diff --git a/grails-plugin/grails-app/conf/application.yml b/grace-plugin/grails-app/conf/application.yml similarity index 100% rename from grails-plugin/grails-app/conf/application.yml rename to grace-plugin/grails-app/conf/application.yml diff --git a/grails-plugin/grails-app/init/grails.plugin.hibernate/Application.groovy b/grace-plugin/grails-app/init/grails.plugin.hibernate/Application.groovy similarity index 100% rename from grails-plugin/grails-app/init/grails.plugin.hibernate/Application.groovy rename to grace-plugin/grails-app/init/grails.plugin.hibernate/Application.groovy diff --git a/grails-plugin/src/main/groovy/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.groovy b/grace-plugin/src/main/groovy/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.groovy similarity index 100% rename from grails-plugin/src/main/groovy/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.groovy rename to grace-plugin/src/main/groovy/grails/orm/bootstrap/HibernateDatastoreSpringInitializer.groovy diff --git a/grails-plugin/src/main/groovy/grails/plugin/hibernate/HibernateGrailsPlugin.groovy b/grace-plugin/src/main/groovy/grails/plugin/hibernate/HibernateGrailsPlugin.groovy similarity index 100% rename from grails-plugin/src/main/groovy/grails/plugin/hibernate/HibernateGrailsPlugin.groovy rename to grace-plugin/src/main/groovy/grails/plugin/hibernate/HibernateGrailsPlugin.groovy diff --git a/grails-plugin/src/main/groovy/grails/plugin/hibernate/commands/SchemaExportCommand.groovy b/grace-plugin/src/main/groovy/grails/plugin/hibernate/commands/SchemaExportCommand.groovy similarity index 100% rename from grails-plugin/src/main/groovy/grails/plugin/hibernate/commands/SchemaExportCommand.groovy rename to grace-plugin/src/main/groovy/grails/plugin/hibernate/commands/SchemaExportCommand.groovy diff --git a/grails-plugin/src/main/groovy/grails/test/hibernate/HibernateSpec.groovy b/grace-plugin/src/main/groovy/grails/test/hibernate/HibernateSpec.groovy similarity index 100% rename from grails-plugin/src/main/groovy/grails/test/hibernate/HibernateSpec.groovy rename to grace-plugin/src/main/groovy/grails/test/hibernate/HibernateSpec.groovy diff --git a/grails-plugin/src/main/groovy/org/grails/plugin/hibernate/support/AbstractMultipleDataSourceAggregatePersistenceContextInterceptor.java b/grace-plugin/src/main/groovy/org/grails/plugin/hibernate/support/AbstractMultipleDataSourceAggregatePersistenceContextInterceptor.java similarity index 100% rename from grails-plugin/src/main/groovy/org/grails/plugin/hibernate/support/AbstractMultipleDataSourceAggregatePersistenceContextInterceptor.java rename to grace-plugin/src/main/groovy/org/grails/plugin/hibernate/support/AbstractMultipleDataSourceAggregatePersistenceContextInterceptor.java diff --git a/grails-plugin/src/main/groovy/org/grails/plugin/hibernate/support/AggregatePersistenceContextInterceptor.java b/grace-plugin/src/main/groovy/org/grails/plugin/hibernate/support/AggregatePersistenceContextInterceptor.java similarity index 100% rename from grails-plugin/src/main/groovy/org/grails/plugin/hibernate/support/AggregatePersistenceContextInterceptor.java rename to grace-plugin/src/main/groovy/org/grails/plugin/hibernate/support/AggregatePersistenceContextInterceptor.java diff --git a/grails-plugin/src/main/groovy/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.java b/grace-plugin/src/main/groovy/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.java similarity index 100% rename from grails-plugin/src/main/groovy/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.java rename to grace-plugin/src/main/groovy/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.java diff --git a/grails-plugin/src/main/groovy/org/grails/plugin/hibernate/support/HibernatePersistenceContextInterceptor.java b/grace-plugin/src/main/groovy/org/grails/plugin/hibernate/support/HibernatePersistenceContextInterceptor.java similarity index 100% rename from grails-plugin/src/main/groovy/org/grails/plugin/hibernate/support/HibernatePersistenceContextInterceptor.java rename to grace-plugin/src/main/groovy/org/grails/plugin/hibernate/support/HibernatePersistenceContextInterceptor.java diff --git a/grails-plugin/src/main/groovy/org/grails/plugin/hibernate/support/SessionFactoryAwarePersistenceContextInterceptor.java b/grace-plugin/src/main/groovy/org/grails/plugin/hibernate/support/SessionFactoryAwarePersistenceContextInterceptor.java similarity index 100% rename from grails-plugin/src/main/groovy/org/grails/plugin/hibernate/support/SessionFactoryAwarePersistenceContextInterceptor.java rename to grace-plugin/src/main/groovy/org/grails/plugin/hibernate/support/SessionFactoryAwarePersistenceContextInterceptor.java diff --git a/grails-plugin/src/test/groovy/grails/orm/bootstrap/HibernateDatastoreSpringInitializerSpec.groovy b/grace-plugin/src/test/groovy/grails/orm/bootstrap/HibernateDatastoreSpringInitializerSpec.groovy similarity index 100% rename from grails-plugin/src/test/groovy/grails/orm/bootstrap/HibernateDatastoreSpringInitializerSpec.groovy rename to grace-plugin/src/test/groovy/grails/orm/bootstrap/HibernateDatastoreSpringInitializerSpec.groovy diff --git a/grails-plugin/src/test/groovy/grails/test/mixin/hibernate/HibernateSpecOverrideSpec.groovy b/grace-plugin/src/test/groovy/grails/test/mixin/hibernate/HibernateSpecOverrideSpec.groovy similarity index 100% rename from grails-plugin/src/test/groovy/grails/test/mixin/hibernate/HibernateSpecOverrideSpec.groovy rename to grace-plugin/src/test/groovy/grails/test/mixin/hibernate/HibernateSpecOverrideSpec.groovy diff --git a/grails-plugin/src/test/groovy/grails/test/mixin/hibernate/HibernateSpecSpec.groovy b/grace-plugin/src/test/groovy/grails/test/mixin/hibernate/HibernateSpecSpec.groovy similarity index 100% rename from grails-plugin/src/test/groovy/grails/test/mixin/hibernate/HibernateSpecSpec.groovy rename to grace-plugin/src/test/groovy/grails/test/mixin/hibernate/HibernateSpecSpec.groovy diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/.DS_Store b/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Sat, 2 Mar 2024 11:57:37 +0800 Subject: [PATCH 02/23] Grace: update gradle build scripts --- boot-plugin/build.gradle | 4 +- build.gradle | 194 +++++-------------- docs/build.gradle | 8 +- grace-datastore-gorm-hibernate5/build.gradle | 4 +- grace-plugin/build.gradle | 50 +++-- gradle.properties | 7 +- settings.gradle | 70 ++----- 7 files changed, 106 insertions(+), 231 deletions(-) diff --git a/boot-plugin/build.gradle b/boot-plugin/build.gradle index 6c3838af..b25802d2 100644 --- a/boot-plugin/build.gradle +++ b/boot-plugin/build.gradle @@ -1,10 +1,10 @@ dependencies { - compileOnly "org.grails:grails-shell:$grailsVersion", { + compileOnly "org.graceframework:grace-shell:$graceVersion", { exclude group:'org.codehaus.groovy', module:'groovy' } api "org.codehaus.groovy:groovy:$groovyVersion" api "org.springframework.boot:spring-boot-autoconfigure:$springBootVersion" - api project(":grails-datastore-gorm-hibernate5") + api project(":grace-datastore-gorm-hibernate5") testImplementation "org.springframework.boot:spring-boot-cli:$springBootVersion", { exclude group:'org.codehaus.groovy', module:'groovy' diff --git a/build.gradle b/build.gradle index 64ffbda2..85b79b42 100644 --- a/build.gradle +++ b/build.gradle @@ -1,31 +1,30 @@ buildscript { repositories { - mavenLocal() - maven { url "https://repo.grails.org/grails/core" } + mavenCentral() maven { url "https://plugins.gradle.org/m2/" } maven { url 'https://repo.gradle.org/gradle/libs-releases' } + if (project.projectVersion.endsWith('-SNAPSHOT')) { + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } + } } dependencies { - classpath "io.github.gradle-nexus:publish-plugin:1.1.0" - classpath "io.github.groovylang.groovydoc:groovydoc-gradle-plugin:1.0.1" - classpath "org.grails:grails-gradle-plugin:$grailsVersion" + classpath "io.github.gradle-nexus:publish-plugin:1.3.0" + // classpath "io.github.groovylang.groovydoc:groovydoc-gradle-plugin:1.0.1" + classpath "org.graceframework:grace-gradle-plugin:$graceVersion" classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.6.1' classpath "gradle.plugin.com.energizedwork.webdriver-binaries:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion" classpath "org.gradle:test-retry-gradle-plugin:1.3.1" } } -group "org.grails" +group "org.graceframework" version project.projectVersion -logger.info("GORM VERSION = ${project.gormVersion}") ext { isTravisBuild = System.getenv().get("TRAVIS") == 'true' isCiBuild = project.hasProperty("isCiBuild") || System.getenv().get("CI") as Boolean isBuildSnapshot = version.endsWith('-SNAPSHOT') isReleaseVersion = !isBuildSnapshot - nexusUsername = System.getenv("SONATYPE_USERNAME") ?: project.hasProperty("sonatypeOssUsername") ? project.sonatypeOssUsername : '' - nexusPassword = System.getenv("SONATYPE_PASSWORD") ?: project.hasProperty("sonatypeOssPassword") ? project.sonatypeOssPassword : '' } ext."signing.keyId" = System.getenv("SIGNING_KEY") ?: project.hasProperty("signing.keyId") ? project.getProperty('signing.keyId') : null @@ -33,21 +32,20 @@ ext."signing.password" = System.getenv("SIGNING_PASSPHRASE") ?: project.hasPrope ext."signing.secretKeyRingFile" = project.hasProperty("signing.secretKeyRingFile") ? project.getProperty('signing.secretKeyRingFile') : null ext['junit-jupiter.version'] = junitJupiterVersion -if (isReleaseVersion) { - apply plugin: 'maven-publish' - apply plugin: "io.github.gradle-nexus.publish-plugin" - - nexusPublishing { - repositories { - sonatype { - def ossUser = System.getenv("SONATYPE_USERNAME") ?: project.hasProperty("sonatypeOssUsername") ? project.sonatypeOssUsername : '' - def ossPass = System.getenv("SONATYPE_PASSWORD") ?: project.hasProperty("sonatypeOssPassword") ? project.sonatypeOssPassword : '' - def ossStagingProfileId = System.getenv("SONATYPE_STAGING_PROFILE_ID") ?: project.hasProperty("sonatypeOssStagingProfileId") ? project.sonatypeOssStagingProfileId : '' - nexusUrl = uri("https://s01.oss.sonatype.org/service/local/") - username = ossUser - password = ossPass - stagingProfileId = ossStagingProfileId - } +apply plugin: 'maven-publish' +apply plugin: "io.github.gradle-nexus.publish-plugin" + +nexusPublishing { + repositories { + sonatype { + def ossUser = System.getenv("SONATYPE_USERNAME") ?: project.hasProperty("sonatypeOssUsername") ? project.sonatypeOssUsername : '' + def ossPass = System.getenv("SONATYPE_PASSWORD") ?: project.hasProperty("sonatypeOssPassword") ? project.sonatypeOssPassword : '' + def ossStagingProfileId = System.getenv("SONATYPE_STAGING_PROFILE_ID") ?: project.hasProperty("sonatypeOssStagingProfileId") ? project.sonatypeOssStagingProfileId : '' + nexusUrl = uri("https://s01.oss.sonatype.org/service/local/") + snapshotRepositoryUrl = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") + username = ossUser + password = ossPass + stagingProfileId = ossStagingProfileId } } } @@ -55,66 +53,23 @@ if (isReleaseVersion) { subprojects { Project subproject -> repositories { - mavenLocal() mavenCentral() - maven { url "https://repo.grails.org/grails/core" } - maven { url 'https://repo.gradle.org/gradle/libs-releases' } - if (groovyVersion && groovyVersion.endsWith('-SNAPSHOT')) { - maven { - name 'JFrog OSS snapshot repo' - url 'https://oss.jfrog.org/oss-snapshot-local/' - } - } - } - - configurations.all { - resolutionStrategy.dependencySubstitution { - substitute module("org.codehaus.groovy:groovy-all") with module("org.codehaus.groovy:groovy:$groovyVersion") + if (project.projectVersion.endsWith('-SNAPSHOT')) { + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } } + maven { url 'https://repo.gradle.org/gradle/libs-releases' } } ext { - def name = project.name - if (name.startsWith('grails') && name.endsWith('-plugin')) { - name = 'hibernate5' - } - projectArtifactId = name + projectArtifactId = subproject.name isExample = subproject.name.startsWith('example') - isPluginProject = subproject.name.endsWith("-plugin") && (subproject.name.startsWith("grails") || subproject.name.startsWith("rx-")) + isPluginProject = subproject.name.endsWith("-plugin") && (subproject.name.startsWith("grace") || subproject.name.startsWith("rx-")) isGrails3PluginProject = subproject.name.endsWith("-plugin") } if(isExample) { apply plugin: "groovy" - ext['h2.version'] = h2Version - ext['gorm.version'] = gormVersion - - if (subproject.name.startsWith("examples-grails")) { - apply plugin:"org.grails.grails-web" - apply plugin:"org.grails.grails-gsp" - apply plugin:"com.energizedwork.webdriver-binaries" - } - - configurations.all { Configuration configuration-> - configuration.resolutionStrategy.eachDependency { DependencyResolveDetails details -> - if (details.requested.group == 'org.codehaus.groovy' && details.requested.name.startsWith('groovy')) { - details.useVersion(groovyVersion) - } - if (details.requested.group == 'org.springframework') { - details.useVersion(springVersion) - } - if (details.requested.group == "org.springframework.boot") { - details.useVersion(springBootVersion) - } - if (details.requested.group == 'org.grails' && - details.requested.name.startsWith('grails-datastore') && - details.requested.name != 'grails-datastore-gorm-hibernate5') { - details.useVersion(gormVersion) - } - } - } - dependencies { testImplementation "io.projectreactor:reactor-test:3.4.17" testImplementation "org.codehaus.groovy:groovy-test-junit5:$groovyVersion" @@ -135,11 +90,11 @@ subprojects { Project subproject -> } if (isPluginProject) { - group "org.grails.plugins" + group "org.graceframework.plugins" version project.rootProject.version } else { - group "org.grails" + group "org.graceframework" version project.rootProject.version } @@ -147,13 +102,6 @@ subprojects { Project subproject -> return } - if (isGrails3PluginProject) { - apply plugin: "org.grails.grails-plugin" - } - else { - apply plugin:"groovy" - } - apply plugin: 'java-library' apply plugin: 'maven-publish' apply plugin: 'checkstyle' @@ -161,12 +109,10 @@ subprojects { Project subproject -> apply plugin: 'signing' apply plugin: "org.gradle.test-retry" - sourceCompatibility = 11 - targetCompatibility = 11 - dependencies { documentation "org.fusesource.jansi:jansi:$jansiVersion" documentation "org.codehaus.groovy:groovy-dateutil:$groovyVersion" + documentation "org.codehaus.groovy:groovy-xml:$groovyVersion" documentation "info.picocli:picocli:$picocliVersion" documentation "com.github.javaparser:javaparser-core:$javaParserCoreVersion" @@ -181,47 +127,32 @@ subprojects { Project subproject -> apply from: "${rootProject.projectDir}/gradle/testVerbose.gradle" java { + toolchain { + languageVersion = JavaLanguageVersion.of(11) + } withJavadocJar() withSourcesJar() } - tasks.withType(Test) { - configure { - retry { - maxRetries = 2 - maxFailures = 20 - failOnPassedAfterRetry = true - filter { - excludeClasses.add("*GroovyChangeLogSpec") - } - } - } - } + // tasks.withType(Test) { + // configure { + // retry { + // maxRetries = 2 + // maxFailures = 20 + // failOnPassedAfterRetry = true + // filter { + // excludeClasses.add("*GroovyChangeLogSpec") + // } + // } + // } + // } groovydoc.classpath = configurations.documentation publishing { - - if (isBuildSnapshot) { - repositories { - maven { - credentials { - def u = System.getenv("ARTIFACTORY_USERNAME") ?: project.hasProperty("artifactoryPublishUsername") ? project.artifactoryPublishUsername : '' - def p = System.getenv("ARTIFACTORY_PASSWORD") ?: project.hasProperty("artifactoryPublishPassword") ? project.artifactoryPublishPassword : '' - username = u - password = p - } - if(isGrails3PluginProject) { - url "https://repo.grails.org/grails/plugins3-snapshots-local" - } else { - url "https://repo.grails.org/grails/libs-snapshots-local" - } - } - } - } - publications { maven(MavenPublication) { + def projectName = subproject.name.split('-')*.capitalize().join(' ') artifactId projectArtifactId from components.java @@ -234,9 +165,9 @@ subprojects { Project subproject -> } } pom { - name = 'GORM for Hibernate 5' - description = 'Provides a GORM Object Mapping implementations for Hibernate 5' - url = 'https://gorm.grails.org/latest/hibernate' + name = projectName + description = "Grace Data : $projectName" + url = 'https://github.com/graceframework/grace-data-hibernate' licenses { license { @@ -247,28 +178,12 @@ subprojects { Project subproject -> } scm { - url = 'https://github.com/grails/gorm-hibernate5' - connection = 'https://github.com/grails/gorm-hibernate5' - developerConnection = 'https://github.com/grails/gorm-hibernate5' + url = 'https://github.com/graceframework/grace-data-hibernate' + connection = 'https://github.com/graceframework/grace-data-hibernate' + developerConnection = 'https://github.com/graceframework/grace-data-hibernate' } developers { - developer { - id = 'graemerocher' - name = 'Graeme Rocher' - } - developer { - id = 'jeffscottbrown' - name = 'Jeff Brown' - } - developer { - id = 'burtbeckwith' - name = 'Burt Beckwith' - } - developer { - id = 'puneetbehl' - name = 'Puneet Behl' - } developer { id = 'rainboyan' name = 'Michael Yan' @@ -291,11 +206,6 @@ subprojects { Project subproject -> onlyIf { isReleaseVersion } } - //do not generate extra load on Nexus with new staging repository if signing fails - tasks.withType(io.github.gradlenexus.publishplugin.InitializeNexusStagingRepository).configureEach { - shouldRunAfter(tasks.withType(Sign)) - } - checkstyle { toolVersion = "10.3.2" configDirectory.set(rootProject.file("$rootDir/gradle/checkstyle")) diff --git a/docs/build.gradle b/docs/build.gradle index 2ca445fd..b2e2339e 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -30,9 +30,9 @@ configurations.all { } dependencies { - documentation "org.grails:grails-core:$grailsVersion" - documentation "org.grails:grails-bootstrap:$grailsVersion" - documentation "org.grails:grails-spring:$grailsVersion" + documentation "org.graceframework:grace-core:$graceVersion" + documentation "org.graceframework:grace-bootstrap:$graceVersion" + documentation "org.graceframework:grace-spring:$graceVersion" documentation "info.picocli:picocli:$picocliVersion" documentation "org.fusesource.jansi:jansi:$jansiVersion" documentation "org.codehaus.groovy:groovy-dateutil:$groovyVersion" @@ -40,7 +40,7 @@ dependencies { documentation "org.fusesource.jansi:jansi:$jansiVersion" for(p in coreProjects) { - documentation "org.grails:grails-datastore-$p:$gormVersion" + documentation "org.graceframework:grace-datastore-$p:$gormVersion" } project.rootProject.subprojects.each { subproject -> if(subproject.name != "docs" && !subproject.name.startsWith('examples')) { diff --git a/grace-datastore-gorm-hibernate5/build.gradle b/grace-datastore-gorm-hibernate5/build.gradle index ccf7c917..fcc3602c 100644 --- a/grace-datastore-gorm-hibernate5/build.gradle +++ b/grace-datastore-gorm-hibernate5/build.gradle @@ -2,7 +2,7 @@ dependencies { api "org.slf4j:slf4j-api:$slf4jVersion" api "org.codehaus.groovy:groovy:$groovyVersion" - api("org.grails:grails-datastore-gorm:$gormVersion") + api("org.graceframework:grace-datastore-gorm:$gormVersion") api "org.springframework:spring-orm:$springVersion" api("org.hibernate:hibernate-core:$hibernate5Version") { exclude group:'commons-logging', module:'commons-logging' @@ -43,7 +43,7 @@ dependencies { testImplementation "org.codehaus.groovy:groovy-test-junit5:$groovyVersion" testImplementation "org.codehaus.groovy:groovy-sql:$groovyVersion" testImplementation "org.codehaus.groovy:groovy-json:$groovyVersion" - testImplementation "org.grails:grails-datastore-gorm-tck:$gormVersion", { + testImplementation "org.graceframework:grace-datastore-gorm-tck:$gormVersion", { exclude group: "org.spockframework" } testImplementation "com.h2database:h2:$h2Version" diff --git a/grace-plugin/build.gradle b/grace-plugin/build.gradle index 70e42bdb..4be561a4 100644 --- a/grace-plugin/build.gradle +++ b/grace-plugin/build.gradle @@ -1,29 +1,17 @@ -configurations.all { - resolutionStrategy.eachDependency { DependencyResolveDetails details -> - if(details.requested.group == 'org.grails' && - details.requested.name.startsWith('grails-datastore') && - details.requested.name != 'grails-datastore-gorm-hibernate5') { - details.useVersion(gormVersion) - } - if(details.requested.group == 'org.codehaus.groovy' && details.requested.name.startsWith('groovy')) { - details.useVersion(groovyVersion) - } - if(details.requested.group == 'org.springframework') { - details.useVersion(springVersion) - } - } -} +group "org.graceframework.plugins" + +apply plugin: 'org.graceframework.grace-plugin' dependencies { - documentation ("org.grails:grails-core:$grailsVersion") - documentation ("org.grails:grails-bootstrap:$grailsVersion") - documentation ("org.grails:grails-spring:$grailsVersion") + documentation ("org.graceframework:grace-core:$graceVersion") + documentation ("org.graceframework:grace-bootstrap:$graceVersion") + documentation ("org.graceframework:grace-spring:$graceVersion") documentation ("com.github.javaparser:javaparser-core:$javaParserCoreVersion") - compileOnly("org.grails:grails-boot:$grailsVersion") - compileOnly("org.grails:grails-bootstrap:$grailsVersion") - compileOnly("org.grails:grails-core:$grailsVersion") - compileOnly("org.grails:grails-cli:$grailsVersion") + compileOnly("org.graceframework:grace-boot:$graceVersion") + compileOnly("org.graceframework:grace-bootstrap:$graceVersion") + compileOnly("org.graceframework:grace-core:$graceVersion") + compileOnly("org.graceframework:grace-cli:$graceVersion") compileOnly "org.spockframework:spock-core:$spockVersion", { exclude group: "junit", module: "junit-dep" exclude group: 'org.codehaus.groovy', module: 'groovy-all' @@ -33,20 +21,20 @@ dependencies { api "org.springframework.boot:spring-boot:$springBootVersion" api "org.springframework:spring-orm:$springVersion" api "org.hibernate:hibernate-core:${hibernate5Version}" - api "org.grails:grails-datastore-web:$gormVersion" - api "org.grails:grails-datastore-gorm-support:$gormVersion" - api project(":grails-datastore-gorm-hibernate5"), { + api "org.graceframework:grace-datastore-web:$gormVersion" + api "org.graceframework:grace-datastore-gorm-support:$gormVersion" + api project(":grace-datastore-gorm-hibernate5"), { exclude group:'org.springframework', module:'spring-context' exclude group:'org.springframework', module:'spring-core' exclude group:'org.springframework', module:'spring-beans' exclude group:'org.springframework', module:'spring-tx' - exclude group:'org.grails', module:'grails-bootstrap' + exclude group:'org.graceframework', module:'grace-bootstrap' exclude group:'org.codehaus.groovy', module:'groovy-all' - exclude group:'org.grails', module:'grails-core' + exclude group:'org.graceframework', module:'grace-core' exclude group:'javax.transaction', module:'jta' } testRuntimeOnly "org.yaml:snakeyaml:$snakeyamlVersion" - testImplementation "org.grails:grails-test-support" + testImplementation "org.graceframework:grace-test-support" testRuntimeOnly "com.h2database:h2:$h2Version" testRuntimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion" testRuntimeOnly "org.springframework:spring-aop:$springVersion" @@ -54,3 +42,9 @@ dependencies { } groovydoc.classpath += configurations.documentation + +jar { + enabled = true + archiveClassifier.set('') + includeEmptyDirs = false +} diff --git a/gradle.properties b/gradle.properties index 30cfc9e0..4aa0ac18 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,6 @@ -projectVersion=2022.2.0 -gormVersion=2022.2.0 -grailsVersion=2022.1.2 -grailsViewsVersion=5.1.2 +projectVersion=2022.2.0-SNAPSHOT +gormVersion=2022.1.2 +graceVersion=2022.1.2 groovyVersion=3.0.16 h2Version=2.1.214 hibernate5Version=5.6.15.Final diff --git a/settings.gradle b/settings.gradle index c0aeea27..4a5f1fda 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,67 +1,39 @@ -plugins { - id "com.gradle.enterprise" version "3.10" - id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.6.5' -} - -gradleEnterprise { - server = 'https://ge.grails.org' - buildScan { - publishAlways() - publishIfAuthenticated() - uploadInBackground = System.getenv("CI") == null - capture { - taskInputFiles = true - } - } -} - -buildCache { - local { enabled = System.getenv('CI') != 'true' } - remote(HttpBuildCache) { - push = System.getenv('CI') == 'true' - enabled = true - url = 'https://ge.grails.org/cache/' - credentials { - username = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER') - password = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY') - } - }} - +rootProject.name = 'Grace.Data.Hibernate' // Core -include "grails-datastore-gorm-hibernate5" +include "grace-datastore-gorm-hibernate5" // Documentation include 'docs' // Plugins include "boot-plugin" -include 'grails-plugin' - -include "examples-grails3-hibernate5" -project(":examples-grails3-hibernate5").projectDir = new File(settingsDir, "examples/grails3-hibernate5") +include 'grace-plugin' -include "examples-grails3-multiple-datasources" -project(":examples-grails3-multiple-datasources").projectDir = new File(settingsDir, "examples/grails3-multiple-datasources") +// include "examples-grails3-hibernate5" +// project(":examples-grails3-hibernate5").projectDir = new File(settingsDir, "examples/grails3-hibernate5") -include "examples-grails3-database-per-tenant" -project(":examples-grails3-database-per-tenant").projectDir = new File(settingsDir, "examples/grails3-database-per-tenant") +// include "examples-grails3-multiple-datasources" +// project(":examples-grails3-multiple-datasources").projectDir = new File(settingsDir, "examples/grails3-multiple-datasources") -include "examples-grails3-schema-per-tenant" -project(":examples-grails3-schema-per-tenant").projectDir = new File(settingsDir, "examples/grails3-schema-per-tenant") +// include "examples-grails3-database-per-tenant" +// project(":examples-grails3-database-per-tenant").projectDir = new File(settingsDir, "examples/grails3-database-per-tenant") -include "examples-grails3-partitioned-multi-tenancy" -project(":examples-grails3-partitioned-multi-tenancy").projectDir = new File(settingsDir, "examples/grails3-partitioned-multi-tenancy") +// include "examples-grails3-schema-per-tenant" +// project(":examples-grails3-schema-per-tenant").projectDir = new File(settingsDir, "examples/grails3-schema-per-tenant") -include "examples-standalone-hibernate5" -project(":examples-standalone-hibernate5").projectDir = new File(settingsDir, "examples/standalone-hibernate5") +// include "examples-grails3-partitioned-multi-tenancy" +// project(":examples-grails3-partitioned-multi-tenancy").projectDir = new File(settingsDir, "examples/grails3-partitioned-multi-tenancy") -include "examples-spring-boot-hibernate5" -project(":examples-spring-boot-hibernate5").projectDir = new File(settingsDir, "examples/spring-boot-hibernate5") +// include "examples-standalone-hibernate5" +// project(":examples-standalone-hibernate5").projectDir = new File(settingsDir, "examples/standalone-hibernate5") -include "examples-grails-data-service" -project(":examples-grails-data-service").projectDir = new File(settingsDir, "examples/grails-data-service") +// include "examples-spring-boot-hibernate5" +// project(":examples-spring-boot-hibernate5").projectDir = new File(settingsDir, "examples/spring-boot-hibernate5") +// include "examples-grails-data-service" +// project(":examples-grails-data-service").projectDir = new File(settingsDir, "examples/grails-data-service") -findProject(':boot-plugin').name = 'gorm-hibernate5-spring-boot' +project(':boot-plugin').name = 'gorm-hibernate5-spring-boot' +project(':grace-plugin').name = 'hibernate5' From f43a212f6559e6b6f53d95ea1bf694f666303fd1 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Sat, 2 Mar 2024 12:02:48 +0800 Subject: [PATCH 03/23] Grace: update github workflows --- .github/dependabot.yml | 19 ----- .github/renovate.json | 91 ---------------------- .github/workflows/gradle.yml | 114 +++++++++++----------------- .github/workflows/release-notes.yml | 32 ++------ .github/workflows/release.yml | 103 ++++++++++++------------- 5 files changed, 100 insertions(+), 259 deletions(-) delete mode 100644 .github/dependabot.yml delete mode 100644 .github/renovate.json diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index f4b38704..00000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "gradle" - directory: "/" - schedule: - interval: "daily" - labels: - - "type: dependency upgrade" -- package-ecosystem: gradle - directory: "/" - schedule: - interval: daily - open-pull-requests-limit: 10 - target-branch: 7.0.x - ignore: - - dependency-name: com.gradle.build-scan - versions: - - 3.5.1 - - "3.6" diff --git a/.github/renovate.json b/.github/renovate.json deleted file mode 100644 index 73591079..00000000 --- a/.github/renovate.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "extends": [ - "config:base" - ], - "labels": ["type: dependency upgrade"], - "packageRules": [ - { - "matchPackagePatterns": ["*"], - "allowedVersions": "!/SNAPSHOT$/" - }, - { - "matchPackagePatterns": [ - "^org\\.codehaus\\.groovy" - ], - "groupName": "groovy monorepo" - }, - { - "matchPackageNames": [ - "org.slf4j:slf4j-api", - "org.slf4j:slf4j-simple", - "org.slf4j:jcl-over-slf4j" - ], - "groupName": "slf4j monorepo" - }, - { - "matchPackageNames": [ - "org.grails:grails-datastore-core", - "org.grails:grails-datastore-web", - "org.grails:grails-datastore-aync", - "org.grails:grails-datastore-gorm", - "org.grails:grails-datastore-gorm-support", - "org.grails:grails-datastore-gorm-async", - "org.grails:grails-datastore-gorm-rx", - "org.grails:grails-datastore-gorm-test", - "org.grails:grails-datastore-gorm-tck", - "org.grails:grails-datastore-gorm-validation" - ], - "groupName": "gorm-datastore monorepo" - }, - { - "matchPackageNames": [ - "org.grails:views-core", - "org.grails:views-json-testing-support", - "org.grails.plugins:views-gradle", - "org.grails.plugins:views-json", - "org.grails.plugins:views-json-templates", - "org.grails.plugins:views-markup" - ], - "groupName": "grails-views monorepo" - }, - { - "matchPackageNames": [ - "org.grails:grails-bom", - "org.grails:grails-bootstrap", - "org.grails:grails-codecs", - "org.grails:grails-console", - "org.grails:grails-core", - "org.grails:grails-databinding", - "org.grails:grails-dependencies", - "org.grails:grails-docs", - "org.grails:grails-encoder", - "org.grails:grails-gradle-model", - "org.grails:grails-logging", - "org.grails:grails-plugin-codecs", - "org.grails:grails-plugin-controllers", - "org.grails:grails-plugin-databinding", - "org.grails:grails-plugin-datasource", - "org.grails:grails-plugin-domain-class", - "org.grails:grails-plugin-i18n", - "org.grails:grails-plugin-interceptors", - "org.grails:grails-plugin-mimetypes", - "org.grails:grails-plugin-rest", - "org.grails:grails-plugin-services", - "org.grails:grails-plugin-url-mappings", - "org.grails:grails-plugin-url-validation", - "org.grails:grails-shell", - "org.grails:grails-spring", - "org.grails:grails-test", - "org.grails:grails-validation", - "org.grails:grails-web", - "org.grails:grails-web-boot", - "org.grails:grails-web-common", - "org.grails:grails-web-databinding", - "org.grails:grails-web-fileupload", - "org.grails:grails-web-mvc", - "org.grails:grails-web-url-mappings" - ], - "groupName": "grails monorepo" - } - ] -} diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 32628ab5..03f0d934 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,96 +1,72 @@ -name: Java CI +name: Grace CI on: push: branches: - - master - - '[7-9]+.[0-9]+.x' + - 'release/[2022-2029]+.[0-9]+.0' pull_request: branches: - - master - - '[7-9]+.[0-9]+.x' + - 'release/[2022-2029]+.[0-9]+.0' workflow_dispatch: - inputs: - message: - description: 'Snapshot information (e.g. New Core Snapshot Tue Dec 15 00:07:18 UTC 2020 f212f54)' - required: true jobs: build: - runs-on: ubuntu-latest + permissions: + contents: read # to fetch code (actions/checkout) + runs-on: ubuntu-22.04 strategy: matrix: - java: ['8', '11', '14'] + java: ['11'] env: WORKSPACE: ${{ github.workspace }} - GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8 steps: - - name: Print Dispatch Information - if: github.event_name == 'workflow_dispatch' + - name: Checkout repository env: - DISPATCH_INFORMATION: ${{ github.event.inputs.message }} - run: echo $DISPATCH_INFORMATION - - uses: actions/checkout@v3 + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: actions/checkout@v4 + with: + token: ${{ secrets.GITHUB_TOKEN }} - name: Set up JDK uses: actions/setup-java@v3 with: distribution: 'adopt' java-version: ${{ matrix.java }} - - name: Run Tests - if: github.event_name == 'pull_request' - id: tests - uses: gradle/gradle-build-action@v2 - with: - arguments: check -Dgeb.env=chromeHeadless - env: - GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} - GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }} - name: Run Build - if: github.event_name == 'push' id: build - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 + with: + arguments: build -x codenarcMain -x codenarcTest -x checkstyleMain -x checkstyleTest + publish: + if: github.event_name == 'push' + needs: ["build"] + permissions: + contents: read # to fetch code (actions/checkout) + checks: write + runs-on: ubuntu-22.04 + steps: + - name: Checkout repository env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} - GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} - GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: actions/checkout@v4 with: - arguments: build -Dgeb.env=chromeHeadless - - name: Publish Test Report - if: steps.build.outcome == 'failure' || steps.tests.outcome == 'failure' - uses: scacap/action-surefire-report@v1 + token: ${{ secrets.GITHUB_TOKEN }} + - name: Set up JDK 11 + uses: actions/setup-java@v3 with: - github_token: ${{ secrets.GITHUB_TOKEN }} - report_paths: '**/build/test-results/test/TEST-*.xml' - - name: Publish to repo.grails.org + distribution: 'adopt' + java-version: 11 + - name: Generate secring file + env: + SECRING_FILE: ${{ secrets.SECRING_FILE }} + run: echo $SECRING_FILE | base64 -d > ${{ github.workspace }}/secring.gpg + - name: Publish to Sonatype OSSRH id: publish - uses: gradle/gradle-build-action@v2 - if: steps.build.outcome == 'success' && github.event_name == 'push' && matrix.java == '8' + uses: gradle/gradle-build-action@v3 env: - ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} - ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} - with: - arguments: -Dorg.gradle.internal.publish.checksums.insecure=true publish - - name: Build Docs - id: docs - if: steps.build.outcome == 'success' && github.event_name == 'push' && matrix.java == '8' - uses: gradle/gradle-build-action@v2 + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_NEXUS_URL: ${{ secrets.SONATYPE_NEXUS_URL }} + SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} + SIGNING_KEY: ${{ secrets.SIGNING_KEY }} + SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }} + SECRING_FILE: ${{ secrets.SECRING_FILE }} with: - arguments: docs:docs - - name: Determine docs target repository - if: steps.docs.outcome == 'success' && github.event_name == 'push' && matrix.java == '8' - uses: haya14busa/action-cond@v1 - id: docs_target - with: - cond: ${{ github.repository == 'grails/gorm-hibernate5' }} - if_true: "grails/grails-data-mapping" - if_false: ${{ github.repository }} - - name: Publish to Github Pages - if: steps.docs.outcome == 'success' && github.event_name == 'push' && matrix.java == '8' - uses: micronaut-projects/github-pages-deploy-action@master - env: - TARGET_REPOSITORY: ${{ steps.docs_target.outputs.value }} - GH_TOKEN: ${{ secrets.GH_TOKEN }} - BRANCH: gh-pages - FOLDER: docs/build/docs - DOC_SUB_FOLDER: hibernate - DOC_FOLDER: gh-pages - COMMIT_EMAIL: behlp@objectcomputing.com - COMMIT_NAME: Puneet Behl + arguments: -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg publishToSonatype closeAndReleaseSonatypeStagingRepository \ No newline at end of file diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index 9b89fb65..a4f8cd9d 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -1,17 +1,16 @@ -name: Changelog +name: Grace Changelog on: issues: types: [closed,reopened] push: branches: - - master - - '[7-9]+.[0-9]+.x' + - 2022.2.x workflow_dispatch: jobs: release_notes: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Check if it has release drafter config file id: check_release_drafter run: | @@ -21,29 +20,10 @@ jobs: id: extract_branch run: echo ::set-output name=value::${GITHUB_REF:11} # If it has release drafter: - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v6 if: steps.check_release_drafter.outputs.has_release_drafter == 'true' env: - GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: commitish: ${{ steps.extract_branch.outputs.value }} - filter-by-commitish: true - # Otherwise: - - name: Export Gradle Properties - if: steps.check_release_drafter.outputs.has_release_drafter == 'false' - uses: micronaut-projects/github-actions/export-gradle-properties@master - - uses: micronaut-projects/github-actions/release-notes@master - if: steps.check_release_drafter.outputs.has_release_drafter == 'false' - id: release_notes - with: - token: ${{ secrets.GH_TOKEN }} - - uses: ncipollo/release-action@v1 - if: steps.check_release_drafter.outputs.has_release_drafter == 'false' && steps.release_notes.outputs.generated_changelog == 'true' - with: - allowUpdates: true - commit: ${{ steps.release_notes.outputs.current_branch }} - draft: true - name: ${{ env.title }} ${{ steps.release_notes.outputs.next_version }} - tag: v${{ steps.release_notes.outputs.next_version }} - bodyFile: CHANGELOG.md - token: ${{ secrets.GH_TOKEN }} + filter-by-commitish: true \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6cac36cd..aa6952fc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,78 +1,73 @@ -name: Release +name: Grace Release + on: - release: - types: [published] + push: + tags: + - v* + +permissions: + contents: write + jobs: - release: - runs-on: ubuntu-latest + create_draft_release: + runs-on: ubuntu-22.04 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + steps: + - name: Create draft release + run: | + gh release create \ + --repo ${{ github.repository }} \ + --title ${{ github.ref_name }} \ + --notes '' \ + --draft \ + ${{ github.ref_name }} + release_and_publish: + needs: create_draft_release + runs-on: ubuntu-22.04 strategy: matrix: - java: ['8'] + java: ['11'] env: - GIT_USER_NAME: puneetbehl - GIT_USER_EMAIL: behlp@objectcomputing.com + GIT_USER_NAME: rainboyan + GIT_USER_EMAIL: rain@rainboyan.com steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: - token: ${{ secrets.GH_TOKEN }} - - uses: gradle/wrapper-validation-action@v1 + token: ${{ secrets.GITHUB_TOKEN }} + - uses: gradle/wrapper-validation-action@v2 - name: Set up JDK uses: actions/setup-java@v3 with: distribution: 'adopt' java-version: ${{ matrix.java }} + - name: Extract Target Branch + id: extract_branch + run: | + echo "Determining Target Branch" + TARGET_BRANCH=`cat $GITHUB_EVENT_PATH | jq '.release.target_commitish' | sed -e 's/^"\(.*\)"$/\1/g'` + echo $TARGET_BRANCH + echo ::set-output name=value::${TARGET_BRANCH} - name: Set the current release version id: release_version - run: echo ::set-output name=release_version::${GITHUB_REF:11} - - name: Run pre-release - uses: micronaut-projects/github-actions/pre-release@master - with: - token: ${{ secrets.GITHUB_TOKEN }} + run: echo "release_version=${GITHUB_REF:11}" >> $GITHUB_OUTPUT + - name: Generate secring file + id: secring + env: + SECRING_FILE: ${{ secrets.SECRING_FILE }} + run: echo $SECRING_FILE | base64 -d > ${{ github.workspace }}/secring.gpg - name: Publish to Sonatype OSSRH + id: publish + if: steps.secring.outcome == 'success' + uses: gradle/gradle-build-action@v3 env: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_NEXUS_URL: ${{ secrets.SONATYPE_NEXUS_URL }} SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} - ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} - ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} SIGNING_KEY: ${{ secrets.SIGNING_KEY }} SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }} SECRING_FILE: ${{ secrets.SECRING_FILE }} - run: | - echo $SECRING_FILE | base64 -d > secring.gpg - echo "Publishing Artifacts" - (set -x; ./gradlew -Psigning.secretKeyRingFile="${GITHUB_WORKSPACE}/secring.gpg" publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon) - echo "Publishing Documentation" - ./gradlew docs:docs - - name: Export Gradle Properties - uses: micronaut-projects/github-actions/export-gradle-properties@master - - name: Determine docs target repository - if: success() - uses: haya14busa/action-cond@v1 - id: docs_target with: - cond: ${{ github.repository == 'grails/gorm-hibernate5' }} - if_true: "grails/grails-data-mapping" - if_false: ${{ github.repository }} - - name: Publish to Github Pages - if: success() - uses: micronaut-projects/github-pages-deploy-action@master - env: - BETA: ${{ contains(steps.release_version.outputs.release_version, 'M') || contains(steps.release_version.outputs.release_version, 'RC') }} - TARGET_REPOSITORY: ${{ steps.docs_target.outputs.value }} - GH_TOKEN: ${{ secrets.GH_TOKEN }} - BRANCH: gh-pages - FOLDER: docs/build/docs - DOC_SUB_FOLDER: hibernate - DOC_FOLDER: gh-pages - COMMIT_EMAIL: behlp@objectcomputing.com - COMMIT_NAME: Puneet Behl - VERSION: ${{ steps.release_version.outputs.release_version }} - - name: Run post-release - if: success() - uses: micronaut-projects/github-actions/post-release@master - with: - token: ${{ secrets.GITHUB_TOKEN }} - env: - SNAPSHOT_SUFFIX: -SNAPSHOT + arguments: -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg publishToSonatype closeAndReleaseSonatypeStagingRepository From 3d6230ef3e7de91585afb45c484f25933d2ac504 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Sat, 2 Mar 2024 12:08:43 +0800 Subject: [PATCH 04/23] Grace: update gradle build scripts fix test fail --- grace-datastore-gorm-hibernate5/build.gradle | 50 -------------------- 1 file changed, 50 deletions(-) diff --git a/grace-datastore-gorm-hibernate5/build.gradle b/grace-datastore-gorm-hibernate5/build.gradle index fcc3602c..a9263015 100644 --- a/grace-datastore-gorm-hibernate5/build.gradle +++ b/grace-datastore-gorm-hibernate5/build.gradle @@ -76,53 +76,3 @@ test { System.out.flush() } } - -test.doFirst { - def toBaseClassRelativePathWithoutExtension = { String base, String classFile -> - if (classFile.startsWith(base)) { - def sansClass = classFile[0 .. classFile.size() - ".class".size() - 1] - def dollarIndex = sansClass.indexOf('$') - def baseClass = dollarIndex > 0 ? sansClass[0..dollarIndex - 1] : sansClass - def relative = baseClass - base - '/' - relative - } - else { - null - } - } - def tckClassesFile = project - .configurations - .testCompileClasspath - .resolvedConfiguration - .getResolvedArtifacts() - .find { resolved -> - resolved.moduleVersion.id.name == 'grails-datastore-gorm-tck' - }.file - - def tckClassesDir = project.file("${project.buildDir}/tck") - copy { - from zipTree(tckClassesFile) - into tckClassesDir - } - copy { - from tckClassesDir - into sourceSets.test.output.classesDirs.find { it.path.contains('classes' + File.separator + 'groovy') } - include "**/*.class" - exclude { details -> - // Do not copy across any TCK class (or nested classes of that class) - // If there is a corresponding source file in the particular modules - // test source tree. Allows a module to override a test/helper. - if (!details.file.isFile()) { - return false - } - def candidatePath = details.file.absolutePath - def relativePath = toBaseClassRelativePathWithoutExtension(tckClassesDir.absolutePath, candidatePath) - - if (relativePath == null) { - throw new IllegalStateException("$candidatePath does not appear to be in the TCK") - } - - project.file("src/test/groovy/${relativePath}.groovy").exists() - } - } -} From 67130e155aad8643a6343f7f8e95f3e5c5a1a619 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Sat, 2 Mar 2024 12:22:05 +0800 Subject: [PATCH 05/23] Grace: update gradle build scripts update develop email --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 85b79b42..8f6b8dab 100644 --- a/build.gradle +++ b/build.gradle @@ -187,6 +187,7 @@ subprojects { Project subproject -> developer { id = 'rainboyan' name = 'Michael Yan' + email = 'rain@rainboyan.com' } } } From c0a6a54d3df4ece862c17b2e432d1452157593c9 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Sat, 2 Mar 2024 12:22:34 +0800 Subject: [PATCH 06/23] Update hibernate plugin info --- .../hibernate/HibernateGrailsPlugin.groovy | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/grace-plugin/src/main/groovy/grails/plugin/hibernate/HibernateGrailsPlugin.groovy b/grace-plugin/src/main/groovy/grails/plugin/hibernate/HibernateGrailsPlugin.groovy index dd6bdd4e..4f22649f 100644 --- a/grace-plugin/src/main/groovy/grails/plugin/hibernate/HibernateGrailsPlugin.groovy +++ b/grace-plugin/src/main/groovy/grails/plugin/hibernate/HibernateGrailsPlugin.groovy @@ -21,6 +21,7 @@ import org.grails.core.artefact.DomainClassArtefactHandler * Plugin that integrates Hibernate into a Grails application * * @author Graeme Rocher + * @author Michael Yan * @since 3.0 */ @CompileStatic @@ -28,22 +29,22 @@ class HibernateGrailsPlugin extends Plugin { public static final String DEFAULT_DATA_SOURCE_NAME = HibernateDatastoreSpringInitializer.DEFAULT_DATA_SOURCE_NAME - def grailsVersion = '3.1.0 > *' + def grailsVersion = '2022.0.0 > *' - def author = 'Grails Core Team' - def title = 'Hibernate 5 for Grails' - def description = 'Provides integration between Grails and Hibernate 5 through GORM' - def documentation = 'http://grails.github.io/grails-data-mapping/latest/' + def author = 'Michael Yan' + def title = 'Hibernate 5 Plugin' + def description = 'Provides integration between Grace and Hibernate 5 through GORM' + def documentation = 'http://github.com/graceframework/grace-data-hibernate' def observe = ['domainClass'] def loadAfter = ['controllers', 'domainClass'] - def watchedResources = ['file:./grails-app/conf/hibernate/**.xml'] + def watchedResources = ['file:./app/conf/hibernate/**.xml'] def pluginExcludes = ['src/templates/**'] def license = 'APACHE' - def organization = [name: 'Grails', url: 'http://grails.org'] - def issueManagement = [system: 'Github', url: 'https://github.com/grails/grails-data-mapping/issues'] - def scm = [url: 'https://github.com/grails/grails-data-mapping'] + def organization = [name: 'Grace Framework', url: 'https://graceframework.org'] + def issueManagement = [system: 'Github', url: 'https://github.com/graceframework/grace-data-hibernate/issues'] + def scm = [url: 'https://github.com/graceframework/grace-data-hibernate'] Set dataSourceNames From 95d9735e9cb3d38ca8c5aeacddcca891125f6229 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Sat, 2 Mar 2024 16:15:03 +0800 Subject: [PATCH 07/23] Grace: update gradle build scripts remove extra dependencyManagement --- build.gradle | 44 +++++++++++++++++++++++---------------- grace-plugin/build.gradle | 5 ----- gradle.properties | 1 + 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index 8f6b8dab..67dffce9 100644 --- a/build.gradle +++ b/build.gradle @@ -51,6 +51,19 @@ nexusPublishing { } subprojects { Project subproject -> + ext { + projectArtifactId = subproject.name + isExample = subproject.name.startsWith('example') + isPluginProject = subproject.name == 'hibernate5' + } + + if (isPluginProject) { + group "org.graceframework.plugins" + } + else { + group "org.graceframework" + } + version project.rootProject.version repositories { mavenCentral() @@ -60,13 +73,6 @@ subprojects { Project subproject -> maven { url 'https://repo.gradle.org/gradle/libs-releases' } } - ext { - projectArtifactId = subproject.name - isExample = subproject.name.startsWith('example') - isPluginProject = subproject.name.endsWith("-plugin") && (subproject.name.startsWith("grace") || subproject.name.startsWith("rx-")) - isGrails3PluginProject = subproject.name.endsWith("-plugin") - } - if(isExample) { apply plugin: "groovy" @@ -89,15 +95,6 @@ subprojects { Project subproject -> documentation.extendsFrom(compileClasspath) } - if (isPluginProject) { - group "org.graceframework.plugins" - version project.rootProject.version - } - else { - group "org.graceframework" - version project.rootProject.version - } - if (subproject.name == 'docs') { return } @@ -109,6 +106,10 @@ subprojects { Project subproject -> apply plugin: 'signing' apply plugin: "org.gradle.test-retry" + if (isPluginProject) { + apply plugin: 'org.graceframework.grace-plugin' + } + dependencies { documentation "org.fusesource.jansi:jansi:$jansiVersion" documentation "org.codehaus.groovy:groovy-dateutil:$groovyVersion" @@ -158,7 +159,7 @@ subprojects { Project subproject -> from components.java afterEvaluate { - if(isGrails3PluginProject) { + if(isPluginProject) { artifact source:"${sourceSets.main.groovy.outputDir}/META-INF/grails-plugin.xml", classifier:"plugin", extension:'xml' @@ -191,7 +192,14 @@ subprojects { Project subproject -> } } } - + pom.withXml { + def pomNode = asNode() + try { + pomNode.dependencyManagement.replaceNode {} + } catch (Throwable e) { + // ignore + } + } } } } diff --git a/grace-plugin/build.gradle b/grace-plugin/build.gradle index 4be561a4..c1d5dcbd 100644 --- a/grace-plugin/build.gradle +++ b/grace-plugin/build.gradle @@ -1,7 +1,3 @@ -group "org.graceframework.plugins" - -apply plugin: 'org.graceframework.grace-plugin' - dependencies { documentation ("org.graceframework:grace-core:$graceVersion") documentation ("org.graceframework:grace-bootstrap:$graceVersion") @@ -18,7 +14,6 @@ dependencies { exclude group: 'org.hamcrest', module: 'hamcrest-core' } - api "org.springframework.boot:spring-boot:$springBootVersion" api "org.springframework:spring-orm:$springVersion" api "org.hibernate:hibernate-core:${hibernate5Version}" api "org.graceframework:grace-datastore-web:$gormVersion" diff --git a/gradle.properties b/gradle.properties index 4aa0ac18..7bab1867 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,6 +18,7 @@ snakeyamlVersion=1.33 spockVersion=2.3-groovy-3.0 springBootVersion=2.7.10 springVersion=5.3.26 +springDependencyManagementPluginVersion=1.0.15.RELEASE tomcatVersion=9.0.73 # Following are used only for example projects From e8b424291304122096f45325c6a5ae8853afdd75 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Sat, 2 Mar 2024 16:18:35 +0800 Subject: [PATCH 08/23] Grace: update readme --- README.md | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index d233e640..56887c87 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,6 @@ -# GORM for Hibernate 5 +# Grace Data for Hibernate 5 -This project implements [GORM](http://gorm.grails.org/latest/) for the Hibernate 5. - -For more information see the following links: - -* [Documentation](http://gorm.grails.org/latest/hibernate/manual) -* [API](http://gorm.grails.org/latest/hibernate/api) -* [Grails Plugin](https://plugins.grails.org/plugin/grails/hibernate5) -* ![Java CI](https://github.com/grails/gorm-hibernate5/workflows/Java%20CI/badge.svg) - -For the current development version see the following links: - -* [Beta Documentation](http://gorm.grails.org/snapshot/hibernate/manual) -* [Beta API](http://gorm.grails.org/snapshot/hibernate/api) +![Grace CI](https://github.com/graceframework/grace-data-hibernate/workflows/Grace%20CI/badge.svg) +This project implements [GORM](https://github.com/graceframework/grace-data) for the Hibernate 5. From a56a6a8028ae20fe5e3c1f4ef12e3c1ee7ba69f8 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Sat, 2 Mar 2024 16:41:38 +0800 Subject: [PATCH 09/23] Grace: migrate examples to Grace --- examples/grails-data-service/build.gradle | 38 +++++++++---------- .../grails3-database-per-tenant/build.gradle | 23 ++++------- examples/grails3-hibernate5/build.gradle | 18 ++++----- .../grails3-multiple-datasources/build.gradle | 16 ++++---- .../build.gradle | 14 +++---- .../grails3-schema-per-tenant/build.gradle | 16 ++++---- examples/spring-boot-hibernate5/build.gradle | 7 ---- examples/standalone-hibernate5/build.gradle | 4 +- gradle.properties | 5 ++- 9 files changed, 63 insertions(+), 78 deletions(-) diff --git a/examples/grails-data-service/build.gradle b/examples/grails-data-service/build.gradle index 9e22e29f..6b30edd2 100644 --- a/examples/grails-data-service/build.gradle +++ b/examples/grails-data-service/build.gradle @@ -1,40 +1,40 @@ buildscript { repositories { - mavenLocal() - maven { url "https://repo.grails.org/grails/core" } + // mavenLocal() + mavenCentral() maven { url "https://plugins.gradle.org/m2/" } maven { url 'https://repo.gradle.org/gradle/libs-releases' } } dependencies { - classpath "org.grails:grails-gradle-plugin:$grailsVersion" - classpath "org.grails.plugins:views-gradle:$grailsViewsVersion" + classpath "org.graceframework:grace-gradle-plugin:$graceVersion" + classpath "org.graceframework.plugins:views-gradle:$graceViewsVersion" } } group "examples" -apply plugin:"org.grails.grails-web" -apply plugin:"org.grails.plugins.views-json" +apply plugin:"org.graceframework.grace-web" +apply plugin:"org.graceframework.plugins.views-json" dependencies { implementation "org.springframework.boot:spring-boot-starter-logging" implementation "org.springframework.boot:spring-boot-autoconfigure" - implementation "org.grails:grails-core" + implementation "org.graceframework:grace-core" implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-starter-tomcat" - implementation "org.grails:grails-plugin-codecs" - implementation "org.grails:grails-plugin-services" - implementation "org.grails:grails-plugin-datasource" - implementation "org.grails:grails-boot" - implementation "org.grails:grails-logging" - implementation "org.grails.plugins:cache" - implementation "org.grails.plugins:events" - implementation project(":grails-plugin") + implementation "org.graceframework:grace-plugin-codecs" + implementation "org.graceframework:grace-plugin-services" + implementation "org.graceframework:grace-plugin-datasource" + implementation "org.graceframework:grace-boot" + implementation "org.graceframework:grace-logging" + implementation "org.graceframework.plugins:cache" + implementation "org.graceframework.plugins:events" + implementation project(":grace-plugin") implementation "org.hibernate:hibernate-core:$hibernate5Version" - implementation "org.grails.plugins:views-json" - implementation "org.grails.plugins:views-json-templates" - implementation 'org.grails.plugins:spring-security-rest:3.0.1' - profile "org.grails.profiles:rest-api" + implementation "org.graceframework.plugins:views-json" + implementation "org.graceframework.plugins:views-json-templates" + implementation 'org.graceframework.plugins:spring-security-rest:3.0.1' + profile "org.graceframework.profiles:rest-api" runtimeOnly "org.glassfish.web:el-impl:2.2.1-b05" runtimeOnly "org.apache.tomcat:tomcat-jdbc" runtimeOnly "javax.xml.bind:jaxb-api:2.3.1" diff --git a/examples/grails3-database-per-tenant/build.gradle b/examples/grails3-database-per-tenant/build.gradle index 38146f18..f1641cef 100644 --- a/examples/grails3-database-per-tenant/build.gradle +++ b/examples/grails3-database-per-tenant/build.gradle @@ -1,13 +1,5 @@ group "examples" -configurations.all { - resolutionStrategy.eachDependency { DependencyResolveDetails details -> - if (details.requested.group == "org.springframework.boot") { - details.useVersion(springBootVersion) - } - } -} - // grails { // agent { // enabled = false @@ -20,19 +12,18 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-starter-tomcat" implementation "javax.servlet:javax.servlet-api:$servletApiVersion" - implementation "org.grails:grails-boot:$grailsVersion" - implementation "org.grails:grails-core:$grailsVersion" - implementation project(":grails-plugin") - + implementation "org.graceframework:grace-boot:$graceVersion" + implementation "org.graceframework:grace-core:$graceVersion" + implementation project(":grace-plugin") implementation "org.hibernate:hibernate-core:$hibernate5Version" - runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion" + runtimeOnly "org.graceframework.plugins:asset-pipeline-plugin:$assetPipelineVersion" runtimeOnly "com.h2database:h2" runtimeOnly "org.yaml:snakeyaml:$snakeyamlVersion" runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion" - runtimeOnly "org.grails.plugins:fields:$fieldsVersion" - runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion" + runtimeOnly "org.graceframework.plugins:fields:$fieldsVersion" + runtimeOnly "org.graceframework.plugins:scaffolding:$scaffoldingVersion" - testImplementation ("org.grails:grails-test-support") + testImplementation ("org.graceframework:grace-test-support") } diff --git a/examples/grails3-hibernate5/build.gradle b/examples/grails3-hibernate5/build.gradle index 903f32bd..25f81333 100644 --- a/examples/grails3-hibernate5/build.gradle +++ b/examples/grails3-hibernate5/build.gradle @@ -6,24 +6,24 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-starter-tomcat" implementation "javax.servlet:javax.servlet-api:$servletApiVersion" - implementation "org.grails:grails-boot:$grailsVersion" - implementation "org.grails:grails-core:$grailsVersion" - implementation "org.grails:grails-plugin-rest:$grailsVersion" - implementation project(":grails-plugin") + implementation "org.graceframework:grace-boot:$graceVersion" + implementation "org.graceframework:grace-core:$graceVersion" + implementation "org.graceframework:grace-plugin-rest:$graceVersion" + implementation project(":grace-plugin") implementation "org.hibernate:hibernate-core:$hibernate5Version" implementation "org.hibernate:hibernate-ehcache:$hibernate5Version" - runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion" + runtimeOnly "org.graceframework.plugins:asset-pipeline-plugin:$assetPipelineVersion" runtimeOnly "com.h2database:h2" runtimeOnly "org.yaml:snakeyaml:$snakeyamlVersion" runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion" - runtimeOnly "org.grails.plugins:fields:$fieldsVersion" - runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion" + runtimeOnly "org.graceframework.plugins:fields:$fieldsVersion" + runtimeOnly "org.graceframework.plugins:scaffolding:$scaffoldingVersion" - testImplementation("org.grails:grails-test-support") + testImplementation("org.graceframework:grace-test-support") - testImplementation("org.grails.plugins:geb") { + testImplementation("org.graceframework.plugins:geb") { exclude group: 'org.gebish', module: 'geb-spock' } testImplementation "org.gebish:geb-spock:$gebVersion" diff --git a/examples/grails3-multiple-datasources/build.gradle b/examples/grails3-multiple-datasources/build.gradle index e80d3af6..fbd6fe20 100644 --- a/examples/grails3-multiple-datasources/build.gradle +++ b/examples/grails3-multiple-datasources/build.gradle @@ -6,20 +6,20 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-starter-tomcat" implementation "javax.servlet:javax.servlet-api:$servletApiVersion" - implementation "org.grails:grails-boot:$grailsVersion" - implementation "org.grails:grails-core:$grailsVersion" - implementation project(":grails-plugin") + implementation "org.graceframework:grace-boot:$graceVersion" + implementation "org.graceframework:grace-core:$graceVersion" + implementation project(":grace-plugin") implementation "org.hibernate:hibernate-core:$hibernate5Version" - runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion" + runtimeOnly "org.graceframework.plugins:asset-pipeline-plugin:$assetPipelineVersion" runtimeOnly "com.h2database:h2" runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion" - runtimeOnly "org.grails.plugins:fields:$fieldsVersion" - runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion" + runtimeOnly "org.graceframework.plugins:fields:$fieldsVersion" + runtimeOnly "org.graceframework.plugins:scaffolding:$scaffoldingVersion" - testImplementation "org.grails:grails-test-support" - testImplementation "org.grails.plugins:geb" + testImplementation "org.graceframework:grace-test-support" + testImplementation "org.graceframework.plugins:geb" testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion" testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion" testRuntimeOnly "org.seleniumhq.selenium:selenium-safari-driver:$seleniumSafariDriverVersion" diff --git a/examples/grails3-partitioned-multi-tenancy/build.gradle b/examples/grails3-partitioned-multi-tenancy/build.gradle index faec549a..9c9e12ad 100644 --- a/examples/grails3-partitioned-multi-tenancy/build.gradle +++ b/examples/grails3-partitioned-multi-tenancy/build.gradle @@ -8,18 +8,18 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-starter-tomcat" implementation "javax.servlet:javax.servlet-api:$servletApiVersion" - implementation "org.grails:grails-boot:$grailsVersion" - implementation "org.grails:grails-core:$grailsVersion" - implementation project(":grails-plugin") + implementation "org.graceframework:grace-boot:$graceVersion" + implementation "org.graceframework:grace-core:$graceVersion" + implementation project(":grace-plugin") implementation "org.hibernate:hibernate-core:$hibernate5Version" - runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion" + runtimeOnly "org.graceframework.plugins:asset-pipeline-plugin:$assetPipelineVersion" runtimeOnly "com.h2database:h2" runtimeOnly "org.yaml:snakeyaml:$snakeyamlVersion" runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion" - runtimeOnly "org.grails.plugins:fields:$fieldsVersion" - runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion" + runtimeOnly "org.graceframework.plugins:fields:$fieldsVersion" + runtimeOnly "org.graceframework.plugins:scaffolding:$scaffoldingVersion" - testImplementation "org.grails:grails-test-support" + testImplementation "org.graceframework:grace-test-support" } diff --git a/examples/grails3-schema-per-tenant/build.gradle b/examples/grails3-schema-per-tenant/build.gradle index c2a57e65..400c67c2 100644 --- a/examples/grails3-schema-per-tenant/build.gradle +++ b/examples/grails3-schema-per-tenant/build.gradle @@ -6,21 +6,21 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-starter-tomcat" implementation "javax.servlet:javax.servlet-api:$servletApiVersion" - implementation "org.grails:grails-core:$grailsVersion" - implementation "org.grails:grails-boot:$grailsVersion" - implementation project(":grails-plugin") + implementation "org.graceframework:grace-core:$graceVersion" + implementation "org.graceframework:grace-boot:$graceVersion" + implementation project(":grace-plugin") implementation "org.hibernate:hibernate-core:$hibernate5Version" - runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion" + runtimeOnly "org.graceframework.plugins:asset-pipeline-plugin:$assetPipelineVersion" runtimeOnly "com.h2database:h2" runtimeOnly "org.yaml:snakeyaml:$snakeyamlVersion" runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion" - runtimeOnly "org.grails.plugins:fields:$fieldsVersion" - runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion" + runtimeOnly "org.graceframework.plugins:fields:$fieldsVersion" + runtimeOnly "org.graceframework.plugins:scaffolding:$scaffoldingVersion" - testImplementation "org.grails:grails-test-support" - testImplementation "org.grails.plugins:geb" + testImplementation "org.graceframework:grace-test-support" + testImplementation "org.graceframework.plugins:geb" testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion" testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion" testRuntimeOnly "org.seleniumhq.selenium:selenium-safari-driver:$seleniumSafariDriverVersion" diff --git a/examples/spring-boot-hibernate5/build.gradle b/examples/spring-boot-hibernate5/build.gradle index 836602ff..cf4e12b1 100644 --- a/examples/spring-boot-hibernate5/build.gradle +++ b/examples/spring-boot-hibernate5/build.gradle @@ -14,13 +14,6 @@ apply plugin:"groovy" group 'examples' -configurations.all { - resolutionStrategy.eachDependency { DependencyResolveDetails details -> - if(details.requested.group == 'org.codehaus.groovy' && details.requested.name.startsWith('groovy')) { - details.useVersion(groovyVersion) - } - } -} dependencies { implementation("org.springframework.boot:spring-boot-starter") implementation("org.springframework.boot:spring-boot-starter-web") diff --git a/examples/standalone-hibernate5/build.gradle b/examples/standalone-hibernate5/build.gradle index 29a6f6c2..63154d07 100644 --- a/examples/standalone-hibernate5/build.gradle +++ b/examples/standalone-hibernate5/build.gradle @@ -3,12 +3,12 @@ group 'examples' apply plugin:"groovy" dependencies { - implementation project(":grails-datastore-gorm-hibernate5") + implementation project(":grace-datastore-gorm-hibernate5") runtimeOnly "com.h2database:h2:$h2Version" runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion" runtimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:8.5.2" runtimeOnly "org.slf4j:slf4j-api:$slf4jVersion" - implementation "org.grails:grails-core:$grailsVersion" + implementation "org.graceframework:grace-core:$graceVersion" testImplementation "org.spockframework:spock-core:$spockVersion" testRuntimeOnly "org.slf4j:slf4j-simple:$slf4jVersion" diff --git a/gradle.properties b/gradle.properties index 7bab1867..01f8a058 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,11 +22,12 @@ springDependencyManagementPluginVersion=1.0.15.RELEASE tomcatVersion=9.0.73 # Following are used only for example projects -assetPipelineVersion=3.4.7 +assetPipelineVersion=5.1.2 chromeDriverVersion=2.44 fieldsVersion=5.1.2 -gebVersion=3.0 +gebVersion=5.1.2 geckodriverVersion=0.23.0 +graceViewsVersion=5.1.2 micrometer.version=1.8.0 scaffoldingVersion=5.1.2 webdriverBinariesVersion=1.4 From feb936be09c5c815fa3012dd239f304af41831a5 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Sat, 2 Mar 2024 18:13:54 +0800 Subject: [PATCH 10/23] Upgrade to GORM 2022.2.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 01f8a058..fd5c26fe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ projectVersion=2022.2.0-SNAPSHOT -gormVersion=2022.1.2 +gormVersion=2022.2.0 graceVersion=2022.1.2 groovyVersion=3.0.16 h2Version=2.1.214 From 7169ec11c820ec2e7980f54777b09ed32deed5c5 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Sat, 2 Mar 2024 18:22:51 +0800 Subject: [PATCH 11/23] Release v2022.2.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fd5c26fe..f8160a52 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=2022.2.0-SNAPSHOT +projectVersion=2022.2.0 gormVersion=2022.2.0 graceVersion=2022.1.2 groovyVersion=3.0.16 From 98cd23ed4354c1270357430cf674de08d918afb7 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Sun, 10 Mar 2024 17:21:48 +0800 Subject: [PATCH 12/23] Update github workflows --- .github/workflows/gradle.yml | 8 ++++---- .github/workflows/release.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 03f0d934..7ec89cec 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -2,10 +2,10 @@ name: Grace CI on: push: branches: - - 'release/[2022-2029]+.[0-9]+.0' + - 'release/[2022-2029]+.[0-9]+.1' pull_request: branches: - - 'release/[2022-2029]+.[0-9]+.0' + - 'release/[2022-2029]+.[0-9]+.1' workflow_dispatch: jobs: build: @@ -25,7 +25,7 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: ${{ matrix.java }} @@ -49,7 +49,7 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aa6952fc..ca97e368 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,7 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} - uses: gradle/wrapper-validation-action@v2 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: ${{ matrix.java }} From f64114d3e8d5f76bd19f79e63a53809d1df240d2 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Sun, 10 Mar 2024 17:22:23 +0800 Subject: [PATCH 13/23] Upgrade to Grace 2022.2.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4eb64965..ff6ee520 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ projectVersion=2022.2.1-SNAPSHOT gormVersion=2022.2.0 -graceVersion=2022.1.2 +graceVersion=2022.2.0 groovyVersion=3.0.17 h2Version=2.1.214 hibernate5Version=5.6.15.Final From 70638ceea916319c36c014b55753ff8601bb7f6d Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Sun, 10 Mar 2024 17:23:04 +0800 Subject: [PATCH 14/23] Upgrade to Grace GORM 2022.2.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ff6ee520..744125bd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ projectVersion=2022.2.1-SNAPSHOT -gormVersion=2022.2.0 +gormVersion=2022.2.1 graceVersion=2022.2.0 groovyVersion=3.0.17 h2Version=2.1.214 From 44134c55186fbb34a7f64abc6878c5db9e1eee0f Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Sun, 10 Mar 2024 17:35:49 +0800 Subject: [PATCH 15/23] Release v2022.2.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 744125bd..a45d3b3f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=2022.2.1-SNAPSHOT +projectVersion=2022.2.1 gormVersion=2022.2.1 graceVersion=2022.2.0 groovyVersion=3.0.17 From 061e9252767c8957d4135c32cb717d5ea249ac80 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Wed, 20 Mar 2024 00:14:24 +0800 Subject: [PATCH 16/23] Grace: update github workflows --- .github/workflows/gradle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 7ec89cec..e03c27f8 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -2,10 +2,10 @@ name: Grace CI on: push: branches: - - 'release/[2022-2029]+.[0-9]+.1' + - 'release/2022.2.2' pull_request: branches: - - 'release/[2022-2029]+.[0-9]+.1' + - 'release/2022.2.2' workflow_dispatch: jobs: build: From b640ce6d2c175a4f710b91c2041a2de19daef435 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Wed, 20 Mar 2024 00:15:03 +0800 Subject: [PATCH 17/23] Upgrade to Grace 2022.2.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 326eb3e1..2cbe0262 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ projectVersion=2022.2.2-SNAPSHOT gormVersion=2022.2.1 -graceVersion=2022.2.0 +graceVersion=2022.2.1 groovyVersion=3.0.17 h2Version=2.1.214 hibernate5Version=5.6.15.Final From f655f7aa361a15730da3e599d03a11880fe026e0 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Wed, 20 Mar 2024 16:13:25 +0800 Subject: [PATCH 18/23] Upgrade to Grace GORM 2022.2.2 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2cbe0262..7c3ed589 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ projectVersion=2022.2.2-SNAPSHOT -gormVersion=2022.2.1 +gormVersion=2022.2.2 graceVersion=2022.2.1 groovyVersion=3.0.17 h2Version=2.1.214 From fe215137b35dbb93f3a607d0ca946f5d40d276df Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Wed, 20 Mar 2024 16:37:50 +0800 Subject: [PATCH 19/23] Release v2022.2.2 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7c3ed589..bbf7f446 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=2022.2.2-SNAPSHOT +projectVersion=2022.2.2 gormVersion=2022.2.2 graceVersion=2022.2.1 groovyVersion=3.0.17 From 4a861b665be264a9bf40244025ad1aa6b857d77f Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Mon, 25 Mar 2024 15:19:59 +0800 Subject: [PATCH 20/23] Grace: update github workflows --- .github/workflows/gradle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index e03c27f8..b23a26b5 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -2,10 +2,10 @@ name: Grace CI on: push: branches: - - 'release/2022.2.2' + - 'release/2022.2.3' pull_request: branches: - - 'release/2022.2.2' + - 'release/2022.2.3' workflow_dispatch: jobs: build: From 1ee5cb88336394b9ce263ee2e0e60696bdd6e8e9 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Mon, 25 Mar 2024 15:21:18 +0800 Subject: [PATCH 21/23] Upgrade to Grace 2022.2.2 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fa216071..0bbcc6c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ projectVersion=2022.2.3-SNAPSHOT gormVersion=2022.2.2 -graceVersion=2022.2.1 +graceVersion=2022.2.2 groovyVersion=3.0.17 h2Version=2.1.214 hibernate5Version=5.6.15.Final From 123aaa89001c29106d3860b6a95a43f0ee03dc48 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Mon, 25 Mar 2024 15:21:37 +0800 Subject: [PATCH 22/23] Upgrade to Grace GORM 2022.2.3 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0bbcc6c4..c8862075 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ projectVersion=2022.2.3-SNAPSHOT -gormVersion=2022.2.2 +gormVersion=2022.2.3 graceVersion=2022.2.2 groovyVersion=3.0.17 h2Version=2.1.214 From 7713f2db23625370b0b1fb4a241301937e216fd6 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Mon, 25 Mar 2024 15:38:18 +0800 Subject: [PATCH 23/23] Release v2022.2.3 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c8862075..5e01fcf5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=2022.2.3-SNAPSHOT +projectVersion=2022.2.3 gormVersion=2022.2.3 graceVersion=2022.2.2 groovyVersion=3.0.17