diff --git a/boot-plugin/build.gradle b/boot-plugin/build.gradle index c1d08fe4..8eaf1aae 100644 --- a/boot-plugin/build.gradle +++ b/boot-plugin/build.gradle @@ -4,7 +4,7 @@ dependencies { } 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 934689d9..1e34af4c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,25 +1,21 @@ 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' } } dependencies { - classpath "org.codehaus.groovy.modules.http-builder:http-builder:0.7.2" - classpath "io.github.gradle-nexus:publish-plugin:1.1.0" - classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1' - classpath "io.github.groovylang.groovydoc:groovydoc-gradle-plugin:1.0.1" - classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" - classpath "org.grails.plugins:views-gradle:2.2.1" + 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' @@ -46,6 +42,7 @@ if (isReleaseVersion) { 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 @@ -57,66 +54,26 @@ if (isReleaseVersion) { subprojects { Project subproject -> repositories { - mavenLocal() + // mavenLocal() mavenCentral() - maven { url "https://repo.grails.org/grails/core" } - 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") - } + // maven { url "https://repo.grails.org/grails/core" } + maven { url 'https://repo.gradle.org/gradle/libs-releases' } } ext { + def name = project.name + if (name.startsWith('grace') && name.endsWith('-plugin')) { + name = 'hibernate5' + } + projectArtifactId = 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")) { - - if (subproject.name != "examples-grails-data-service") { - 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.contains("testing-support")) { - details.useVersion(testingSupportVersion) - } - 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" @@ -130,80 +87,31 @@ subprojects { Project subproject -> return } - ext { - projectInfo = new PublishingConvention(project) - pomInfo = { - delegate.name projectInfo.projectName - delegate.description projectInfo.projectDescription - delegate.url projectInfo.projectURL - - delegate.licenses { - delegate.license { - delegate.name 'The Apache Software License, Version 2.0' - delegate.url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - delegate.distribution 'repo' - } - } - - delegate.scm { - delegate.url projectInfo.projectVcsUrl - delegate.connection projectInfo.projectVcsUrl - delegate.developerConnection projectInfo.projectVcsUrl - } - - - delegate.developers { - delegate.developer { - delegate.id 'graemerocher' - delegate.name 'Graeme Rocher' - } - delegate.developer { - delegate.id 'jeffscottbrown' - delegate.name 'Jeff Brown' - } - delegate.developer { - delegate.id 'burtbeckwith' - delegate.name 'Burt Beckwith' - } - delegate.developer { - delegate.id 'puneetbehl' - delegate.name 'Puneet Behl' - } - } - - } - } - apply plugin: 'groovy' configurations { documentation.extendsFrom(compileClasspath) } - if(isPluginProject) { - group "org.grails.plugins" + if (isPluginProject) { + group "org.graceframework.plugins" version project.rootProject.version } else { - group "org.grails" + group "org.graceframework" version project.rootProject.version } - if(subproject.name == 'docs') { + if (subproject.name == 'docs') { return } - if(isGrails3PluginProject) { - apply plugin: "org.grails.grails-plugin" - } - else { - apply plugin:"groovy" - apply plugin: 'com.bmuschko.nexus' - - modifyPom { - delegate.project pomInfo - } - } + // if (isGrails3PluginProject) { + // apply plugin: "org.graceframework.grace-plugin" + // } + // else { + // apply plugin:"groovy" + // } apply plugin: 'java-library' apply plugin: 'maven-publish' @@ -212,12 +120,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" @@ -231,61 +137,69 @@ subprojects { Project subproject -> apply from: "${rootProject.projectDir}/gradle/testVerbose.gradle" - tasks.withType(Test) { - configure { - retry { - maxRetries = 2 - maxFailures = 20 - failOnPassedAfterRetry = true - filter { - excludeClasses.add("*GroovyChangeLogSpec") - } - } + java { + toolchain { + languageVersion = JavaLanguageVersion.of(11) } - } + withJavadocJar() + withSourcesJar() + } + + // 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) { - artifactId projectInfo.projectArtifactId + artifactId projectArtifactId from components.java - afterEvaluate { - artifact source: sourcesJar, classifier: "sources" - artifact source: javadocJar, classifier: "javadoc" + afterEvaluate { if(isGrails3PluginProject) { artifact source:"${sourceSets.main.groovy.outputDir}/META-INF/grails-plugin.xml", classifier:"plugin", extension:'xml' } } - pom.withXml { - def xml = asNode() - def dependency = xml.dependencies.find { dep -> dep.artifactId == 'slf4j-simple' } - dependency?.optional = true - xml.children().last() + pomInfo + pom { + name = 'Grace Data Hibernate 5' + description = 'Grace Data for Hibernate 5' + url = 'https://gorm.graceframework.org/latest/hibernate' + + licenses { + license { + name = 'The Apache Software License, Version 2.0' + url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + distribution = 'repo' + } + } + + scm { + 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 = 'rainboyan' + name = 'Michael Yan' + } + } } } @@ -319,25 +233,3 @@ subprojects { Project subproject -> } } - -class PublishingConvention { - Project project - - String projectArtifactId - String projectName = 'GORM for Hibernate 5' - String projectDescription = 'Provides a GORM Object Mapping implementations for Hibernate 5' - String projectURL = 'https://gorm.grails.org/latest/hibernate' - String projectIssueTrackerUrl = 'https://github.com/grails/gorm-hibernate5/issues' - String projectVcsUrl = 'https://github.com/grails/gorm-hibernate5' - - PublishingConvention(Project project) { - this.project = project - - def name = project.name - if(name.startsWith('grails') && name.endsWith('-plugin')) { - name = 'hibernate5' - } - projectArtifactId = name - } -} - diff --git a/grails-datastore-gorm-hibernate5/build.gradle b/grace-datastore-gorm-hibernate5/build.gradle similarity index 97% rename from grails-datastore-gorm-hibernate5/build.gradle rename to grace-datastore-gorm-hibernate5/build.gradle index ccf7c917..fcc3602c 100644 --- a/grails-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/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 52% rename from grails-plugin/build.gradle rename to grace-plugin/build.gradle index 7534f3da..d128615b 100644 --- a/grails-plugin/build.gradle +++ b/grace-plugin/build.gradle @@ -1,27 +1,12 @@ -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) - } - } -} - 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-bootstrap:$grailsVersion") - compileOnly("org.grails:grails-core:$grailsVersion") + compileOnly("org.graceframework:grace-bootstrap:$graceVersion") + compileOnly("org.graceframework:grace-cli:$graceVersion") + compileOnly("org.graceframework:grace-core:$graceVersion") compileOnly "org.spockframework:spock-core:$spockVersion", { exclude group: "junit", module: "junit-dep" exclude group: 'org.codehaus.groovy', module: 'groovy-all' @@ -31,20 +16,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:'grails-bootstrap' exclude group:'org.codehaus.groovy', module:'groovy-all' exclude group:'org.grails', module:'grails-core' exclude group:'javax.transaction', module:'jta' } testRuntimeOnly "org.yaml:snakeyaml:$snakeyamlVersion" - testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion" + testImplementation "org.graceframework:grace-test-support:$graceVersion" testRuntimeOnly "com.h2database:h2:$h2Version" testRuntimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion" testRuntimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:8.5.2" 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/gradle.properties b/gradle.properties index 51629b03..a74cc25b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,6 @@ -projectVersion=2022.0.0 +projectVersion=2022.0.0-SNAPSHOT gormVersion=2022.0.0 -grailsGradlePluginVersion=5.1.5 -grailsVersion=5.1.10 +graceVersion=2021.0.0 groovyVersion=3.0.14 h2Version=1.4.200 hibernate5Version=5.6.14.Final @@ -29,7 +28,6 @@ gebVersion=2.3 geckodriverVersion=0.23.0 micrometer.version=1.8.0 scaffoldingVersion=4.1.0 -testingSupportVersion=2.4.1 webdriverBinariesVersion=1.4 org.gradle.caching=true 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 5008ddfc..00000000 Binary files a/grails-datastore-gorm-hibernate5/src/test/groovy/org/grails/orm/hibernate/.DS_Store and /dev/null differ diff --git a/settings.gradle b/settings.gradle index c0aeea27..6d1d6d5a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,66 +1,37 @@ -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') - } - }} - // Core -include "grails-datastore-gorm-hibernate5" +include "grace-datastore-gorm-hibernate5" // Documentation -include 'docs' +// include 'docs' // Plugins include "boot-plugin" -include 'grails-plugin' +include 'grace-plugin' -include "examples-grails3-hibernate5" -project(":examples-grails3-hibernate5").projectDir = new File(settingsDir, "examples/grails3-hibernate5") +// include "examples-grails3-hibernate5" +// project(":examples-grails3-hibernate5").projectDir = new File(settingsDir, "examples/grails3-hibernate5") -include "examples-grails3-multiple-datasources" -project(":examples-grails3-multiple-datasources").projectDir = new File(settingsDir, "examples/grails3-multiple-datasources") +// include "examples-grails3-multiple-datasources" +// project(":examples-grails3-multiple-datasources").projectDir = new File(settingsDir, "examples/grails3-multiple-datasources") -include "examples-grails3-database-per-tenant" -project(":examples-grails3-database-per-tenant").projectDir = new File(settingsDir, "examples/grails3-database-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-schema-per-tenant" -project(":examples-grails3-schema-per-tenant").projectDir = new File(settingsDir, "examples/grails3-schema-per-tenant") +// include "examples-grails3-schema-per-tenant" +// project(":examples-grails3-schema-per-tenant").projectDir = new File(settingsDir, "examples/grails3-schema-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-partitioned-multi-tenancy" +// project(":examples-grails3-partitioned-multi-tenancy").projectDir = new File(settingsDir, "examples/grails3-partitioned-multi-tenancy") -include "examples-standalone-hibernate5" -project(":examples-standalone-hibernate5").projectDir = new File(settingsDir, "examples/standalone-hibernate5") +// include "examples-standalone-hibernate5" +// project(":examples-standalone-hibernate5").projectDir = new File(settingsDir, "examples/standalone-hibernate5") -include "examples-spring-boot-hibernate5" -project(":examples-spring-boot-hibernate5").projectDir = new File(settingsDir, "examples/spring-boot-hibernate5") +// 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") +// 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'