diff --git a/.github/renovate.json b/.github/renovate.json index 12c20a61a2f..a08655e52be 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -20,42 +20,9 @@ }, { "matchPackageNames": [ - "org.grails:grails-bom", - "org.grails:grails-bootstrap", - "org.grails:grails-codecs", - "org.grails:grails-console", - "org.grails:grails-core", - "org.grails:grails-databinding", - "org.grails:grails-dependencies", - "org.grails:grails-docs", - "org.grails:grails-encoder", - "org.grails:grails-gradle-model", - "org.grails:grails-logging", - "org.grails:grails-plugin-codecs", - "org.grails:grails-plugin-controllers", - "org.grails:grails-plugin-databinding", - "org.grails:grails-plugin-datasource", - "org.grails:grails-plugin-domain-class", - "org.grails:grails-plugin-i18n", - "org.grails:grails-plugin-interceptors", - "org.grails:grails-plugin-mimetypes", - "org.grails:grails-plugin-rest", - "org.grails:grails-plugin-services", - "org.grails:grails-plugin-url-mappings", - "org.grails:grails-plugin-url-validation", - "org.grails:grails-shell", - "org.grails:grails-spring", - "org.grails:grails-test", - "org.grails:grails-validation", - "org.grails:grails-web", - "org.grails:grails-web-boot", - "org.grails:grails-web-common", - "org.grails:grails-web-databinding", - "org.grails:grails-web-fileupload", - "org.grails:grails-web-mvc", - "org.grails:grails-web-url-mappings" + "org.grails:grails-bom" ], - "groupName": "grails monorepo" + "groupName": "grails bom" } ] } diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 1205d8117f8..955bf85bec7 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -28,7 +28,7 @@ jobs: - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@v4 with: - develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} + develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }} - name: "🔨 Run Build" id: build env: @@ -53,7 +53,7 @@ jobs: - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@v4 with: - develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} + develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }} - name: "▶️ Start MongoDB (needed for some tests)" uses: supercharge/mongodb-github-action@90004df786821b6308fb02299e5835d0dae05d0d # v1.12.0 (Use commit sha as this is a 3rd party action) with: @@ -81,7 +81,7 @@ jobs: - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@v4 with: - develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} + develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }} - name: "🔨 Run Build" id: build env: @@ -103,15 +103,14 @@ jobs: - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@v4 with: - develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} + develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }} - name: "📤 Publish Snapshot to repo.grails.org" env: GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }} GRADLE_PUBLISH_RELEASE: 'false' - MAVEN_PUBLISH_USERNAME: ${{ secrets.MAVEN_PUBLISH_USERNAME }} - MAVEN_PUBLISH_PASSWORD: ${{ secrets.MAVEN_PUBLISH_PASSWORD }} - # NOTE: secrets.MAVEN_PUBLISH_URL == https://repo.grails.org/grails/plugins3-snapshot-local - MAVEN_PUBLISH_URL: https://repo.grails.org/grails/libs-snapshots-local + MAVEN_PUBLISH_URL: ${{ secrets.GRAILS_NEXUS_PUBLISH_SNAPSHOT_URL }} + MAVEN_PUBLISH_USERNAME: ${{ secrets.NEXUS_USER }} + MAVEN_PUBLISH_PASSWORD: ${{ secrets.NEXUS_PW }} run: ./gradlew --no-build-cache publish docs: if: github.event_name == 'push' @@ -130,7 +129,7 @@ jobs: - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@v4 with: - develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} + develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }} - name: "🔨 Build Docs" env: GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }} @@ -162,7 +161,7 @@ jobs: continue-on-error: true uses: actions/github-script@v7 with: - github-token: ${{ secrets.GH_TOKEN }} # must be a PAT since we're triggering on an external repo + github-token: ${{ secrets.GRAILS_GH_TOKEN }} # must be a PAT since we're triggering on an external repo script: | try { const result = await github.rest.actions.createWorkflowDispatch({ diff --git a/.github/workflows/groovy-joint-workflow.yml b/.github/workflows/groovy-joint-workflow.yml index 8153a8af957..bc125c1c7a9 100644 --- a/.github/workflows/groovy-joint-workflow.yml +++ b/.github/workflows/groovy-joint-workflow.yml @@ -47,7 +47,7 @@ jobs: - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@v4 with: - develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} + develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }} - name: "📝 Store Groovy version to use when building the project" id: groovy-version run: | @@ -69,7 +69,7 @@ jobs: id: develocity-conf-2 run: | echo "VALUE<> $GITHUB_OUTPUT - echo "def isAuthenticated = System.getenv('DEVELOCITY_ACCESS_KEY') != null" >> $GITHUB_OUTPUT + echo "def isAuthenticated = System.getenv('GRAILS_DEVELOCITY_ACCESS_KEY') != null" >> $GITHUB_OUTPUT echo "develocity {" >> $GITHUB_OUTPUT echo " server = 'https://ge.grails.org'" >> $GITHUB_OUTPUT echo " buildScan {" >> $GITHUB_OUTPUT @@ -119,7 +119,7 @@ jobs: - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@v4 with: - develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} + develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }} - name: "🗄️ Restore local Maven repository from cache" uses: actions/cache@v4 with: diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index 75b66d20733..234f006619c 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -19,4 +19,4 @@ jobs: - name: "📝 Update Release Draft" uses: release-drafter/release-drafter@v6 env: - GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GRAILS_GH_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index acfa5e7eddc..e2c03f3db7c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@v4 with: - develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} + develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }} - name: "⚙️ Run pre-release" uses: apache/grails-github-actions/pre-release@asf - name: "🔍 Determine Target Branch" @@ -84,7 +84,7 @@ jobs: - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@v4 with: - develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} + develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }} - name: "🚀 Release Sonatype Staging Repository" env: GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }} @@ -117,7 +117,7 @@ jobs: - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@v4 with: - develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} + develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }} - name: "📖 Generate documentation" env: GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }} diff --git a/build.gradle b/build.gradle index c51e6e43f72..c8d4606715e 100644 --- a/build.gradle +++ b/build.gradle @@ -22,18 +22,15 @@ allprojects { } repositories { + // Used for testing locally against the latest snapshot of Groovy & for pulling dependencies in other repos + // Usage: ./gradlew build -P"groovyVersion=X.X.X-SNAPSHOT" + maven { + name = 'ASF Snapshot repo' + url = 'https://repository.apache.org/content/repositories/snapshots' + } mavenCentral() maven { url = 'https://repo.grails.org/grails/core' } // mavenLocal() // Keep, this will be uncommented and used by CI (groovy-joint-workflow) - if (customGroovyVersion?.endsWith('-SNAPSHOT')) { - // Used for testing locally against the latest snapshot of Groovy - // Usage: ./gradlew build -P"groovyVersion=X.X.X-SNAPSHOT" - logger.lifecycle('Adding Groovy Snapshot Repo for project: {}, Using Groovy {}', name, customGroovyVersion) - maven { - name = 'ASF Snapshot repo' - url = 'https://repository.apache.org/content/repositories/snapshots' - } - } if (System.getenv('GITHUB_MAVEN_PASSWORD') && !grailsVersion.endsWith('-SNAPSHOT')) { logger.lifecycle('Adding Grails Core Staging Repo for project: {}', name) maven { @@ -58,34 +55,34 @@ def publishedProjects = [ 'grails-datastore-async', 'grails-datastore-core', 'grails-datastore-gorm', - 'grails-datastore-gorm-async', + 'grails-datamapping-async', //'grails-datastore-gorm-rx', - 'grails-datastore-gorm-support', - 'grails-datastore-gorm-tck', - 'grails-datastore-gorm-tck-base', - 'grails-datastore-gorm-tck-domains', - 'grails-datastore-gorm-validation', + 'grails-datamapping-support', + 'grails-datamapping-tck-tests', + 'grails-datamapping-tck-base', + 'grails-datamapping-tck-domains', + 'grails-datamapping-validation', 'grails-datastore-web', - 'grails-gorm-testing-support', + 'grails-testing-support-datamapping', // simple 'simple-gorm', // hibernate5 'hibernate5-boot-plugin', 'hibernate5-database-migration', - 'hibernate5-gorm', + 'hibernate5-core', 'hibernate5-grails-plugin', // mongodb 'mongodb-boot-plugin', - 'mongodb-gorm', - 'mongodb-gorm-bson', - 'mongodb-gorm-ext', + 'mongodb-core', + 'mongodb-bson', + 'mongodb-ext', 'mongodb-grails-plugin', - 'mongodb-views-json-templates' + 'mongodb-gson-templates' ] subprojects { if (name in publishedProjects) { // This has to be applied here - apply plugin: 'org.grails.grails-publish' + apply plugin: 'org.apache.grails.gradle.grails-publish' } } diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 1bc0e791f22..1fd3563147c 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -8,7 +8,7 @@ file('../gradle.properties').withInputStream { } repositories { -// mavenLocal() + maven { url = 'https://repository.apache.org/content/repositories/snapshots' } maven { url = 'https://repo.grails.org/grails/core' } mavenCentral() if (System.getenv('GITHUB_MAVEN_PASSWORD')) { @@ -23,9 +23,8 @@ repositories { } dependencies { - implementation platform("org.grails:grails-bom:${versions.getProperty('grailsVersion')}") - implementation 'org.grails:grails-gradle-plugin' + implementation platform("org.apache.grails:grails-bom:${versions.getProperty('grailsVersion')}") + implementation 'org.apache.grails:grails-gradle-plugins' implementation 'com.bertramlabs.plugins:asset-pipeline-gradle' - implementation 'org.grails.plugins:views-gradle' implementation 'org.springframework.boot:spring-boot-gradle-plugin' } \ No newline at end of file diff --git a/docs/guide-developer/build.gradle b/docs/guide-developer/build.gradle index 615a1131522..fa7bf2a479f 100644 --- a/docs/guide-developer/build.gradle +++ b/docs/guide-developer/build.gradle @@ -5,7 +5,7 @@ plugins { } version project.projectVersion -group 'org.grails' +group 'org.apache.grails' def asciidoctorAttributes = [ icons : 'font', diff --git a/docs/guide-developer/src/main/docs/gettingStarted.adoc b/docs/guide-developer/src/main/docs/gettingStarted.adoc index 19f7768fc5f..040531587cf 100644 --- a/docs/guide-developer/src/main/docs/gettingStarted.adoc +++ b/docs/guide-developer/src/main/docs/gettingStarted.adoc @@ -31,8 +31,8 @@ The project is essentially a multi-project Gradle build. There is a core API and * `grails-datastore-core` - The core API, this provides core interfaces for implementing a GORM provider * `grails-datastore-gorm` - The runtime meta-programming and AST transformation infrastructure behind GORM. This also provides end users with APIs like `grails.gorm.CriteriaBuilder` and `grails.gorm.DetachedCriteria` -* `grails-datastore-gorm-support` - Support classes for easing the writing of a GORM plugin for Grails -* `grails-datastore-gorm-tck` - The TCK that includes hundreds of Spock specifications that a GORM implementation will need to pass +* `grails-datamapping-support` - Support classes for easing the writing of a GORM plugin for Grails +* `grails-datamapping-tck-tests` - The TCK that includes hundreds of Spock specifications that a GORM implementation will need to pass * `grails-datastore-web` - Classes required to integrate GORM into a web tier In addition to this, there are separate projects of GORM implementations for various datastores: diff --git a/docs/guide-developer/src/main/docs/stepByStep.adoc b/docs/guide-developer/src/main/docs/stepByStep.adoc index e7e7841fddc..ea6ada314d9 100644 --- a/docs/guide-developer/src/main/docs/stepByStep.adoc +++ b/docs/guide-developer/src/main/docs/stepByStep.adoc @@ -30,9 +30,9 @@ With contents: dependencies { implementation project(':grails-datastore-gorm'), project(':grails-datastore-web'), - project(':grails-datastore-gorm-support') + project(':grails-datamapping-support') - testImplementation project(':grails-datastore-gorm-tck') + testImplementation project(':grails-datamapping-tck-tests') testRuntime "javax.servlet:javax.servlet-api:$servletApiVersion" } diff --git a/docs/guide-developer/src/main/docs/testing.adoc b/docs/guide-developer/src/main/docs/testing.adoc index 7faabeba669..64d72885f17 100644 --- a/docs/guide-developer/src/main/docs/testing.adoc +++ b/docs/guide-developer/src/main/docs/testing.adoc @@ -1,8 +1,8 @@ -The `grails-datastore-gorm-tck` project provides several hundred tests to guarantee that a particular GORM implementation is compliant. To use the TCK you need to define a dependency on the TCK in the subprojects `build.gradle` file: +The `grails-datamapping-tck-tests` project provides several hundred tests to guarantee that a particular GORM implementation is compliant. To use the TCK you need to define a dependency on the TCK in the subprojects `build.gradle` file: [source,groovy] ---- -testCompile project(':grails-datastore-gorm-tck') +testCompile project(':grails-datamapping-tck-tests') ---- Then create a `Setup.groovy` file that sets up your custom datastore in your implementation. diff --git a/docs/guide-rx/build.gradle b/docs/guide-rx/build.gradle index 615a1131522..fa7bf2a479f 100644 --- a/docs/guide-rx/build.gradle +++ b/docs/guide-rx/build.gradle @@ -5,7 +5,7 @@ plugins { } version project.projectVersion -group 'org.grails' +group 'org.apache.grails' def asciidoctorAttributes = [ icons : 'font', diff --git a/docs/guide-whats-new/build.gradle b/docs/guide-whats-new/build.gradle index 341131c29b1..f9d677befe8 100644 --- a/docs/guide-whats-new/build.gradle +++ b/docs/guide-whats-new/build.gradle @@ -5,7 +5,7 @@ plugins { } version project.projectVersion -group 'org.grails' +group 'org.apache.grails' def asciidoctorAttributes = [ icons : 'font', diff --git a/gradle/documentation-config.gradle b/gradle/documentation-config.gradle index abbc07ebdfd..a4a3d372855 100644 --- a/gradle/documentation-config.gradle +++ b/gradle/documentation-config.gradle @@ -3,7 +3,7 @@ apply plugin: 'groovy' configurations.register('documentation') dependencies { - documentation platform("org.grails:grails-bom:$grailsVersion") + documentation platform("org.apache.grails:grails-bom:$grailsVersion") documentation 'org.apache.groovy:groovy-groovydoc' documentation 'org.apache.groovy:groovy-ant' } @@ -22,15 +22,15 @@ tasks.register('data-mapping-groovydoc', Groovydoc) { 'grails-datastore-async', 'grails-datastore-core', 'grails-datastore-gorm', - 'grails-datastore-gorm-async', - 'grails-datastore-gorm-support', - 'grails-datastore-gorm-validation', + 'grails-datamapping-async', + 'grails-datamapping-support', + 'grails-datamapping-validation', 'grails-datastore-web', // These are test api docs that aren't typically included in the runtime classpath of applications. // for now include them in the groovy doc unless we want to call out that documentation separately later. 'grails-datastore-gorm-test', - 'grails-gorm-testing-support' + 'grails-testing-support-datamapping' ] } diff --git a/gradle/publish-config.gradle b/gradle/publish-config.gradle index 1bdef059bac..c0df8213a88 100644 --- a/gradle/publish-config.gradle +++ b/gradle/publish-config.gradle @@ -1,13 +1,8 @@ import org.grails.gradle.plugin.publishing.GrailsPublishExtension -if (project.hasProperty('snapshotPublishUrl')) { - ext.set('mavenPublishUrl', property('snapshotPublishUrl')) - logger.lifecycle('Configuring {}:{} snapshot publish repo: {}', group, findProperty('pomArtifactId') ?: name, mavenPublishUrl) -} - extensions.configure(GrailsPublishExtension) { // Explicit `it` is required here - it.githubSlug = 'grails/grails-data-mapping' + it.githubSlug = 'apache/grails-data-mapping' it.license.name = 'Apache-2.0' it.title = findProperty('pomTitle') ?: 'Grails GORM' it.desc = findProperty('pomDescription') ?: 'GORM - Grails Data Access Framework' diff --git a/gradle/tck-config.gradle b/gradle/tck-config.gradle index fc59143b7d0..b88b354b2c6 100644 --- a/gradle/tck-config.gradle +++ b/gradle/tck-config.gradle @@ -10,11 +10,11 @@ configurations { dependencies { if (!project.hasProperty('includeBaseTckClass') || project.findProperty('includeBaseTckClass')) { - testImplementation project(':grails-datastore-gorm-tck-base') + testImplementation project(':grails-datamapping-tck-base') } // So we can easily extract the compiled classes - tck project(':grails-datastore-gorm-tck') - testImplementation project(':grails-datastore-gorm-tck-domains') + tck project(':grails-datamapping-tck-tests') + testImplementation project(':grails-datamapping-tck-domains') runtimeOnly 'org.apache.groovy:groovy-dateutil', { // Groovy Date Utils Extensions are used in the tests diff --git a/grails-data-graphql/build.gradle b/grails-data-graphql/build.gradle index caf16f537f0..c462c3aa4fc 100644 --- a/grails-data-graphql/build.gradle +++ b/grails-data-graphql/build.gradle @@ -3,10 +3,9 @@ buildscript { maven { url "https://repo.grails.org/grails/core" } } dependencies { - classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" - classpath "org.grails.plugins:views-gradle:$viewGradleVersion" - classpath "org.grails.plugins:views-json:$viewsJsonVersion" - classpath "org.grails:grails-docs:${project.ext.properties.grailsDocsVersion ?: grailsVersion}" + classpath "org.apache.grails:grails-gradle-plugins:$grailsGradlePluginVersion" + classpath "org.apache.grails.gradle:grails-gson:$viewsJsonVersion" + classpath "org.apache.grails:grails-docs-core:${project.ext.properties.grailsDocsVersion ?: grailsVersion}" classpath "io.github.gradle-nexus:publish-plugin:1.3.0" } } @@ -52,23 +51,20 @@ subprojects { if (project.name.startsWith("examples-")) { if (project.name.startsWith("examples-grails-")) { - apply plugin: "org.grails.grails-web" + apply plugin: 'org.apache.grails.gradle.grails-web' } return } - if (isGrailsPlugin) { - group "org.grails.plugins" - } else { - group "org.grails" - } + //TODO: See RENAME.md in grails-core on how to repackage these libraries + group "org.apache.grails" if (isGrailsPlugin) { apply plugin: 'groovy' apply plugin: 'eclipse' apply plugin: 'idea' apply plugin: 'java-library' - apply plugin: "org.grails.grails-plugin" + apply plugin: 'org.apache.grails.gradle.grails-plugin' sourceCompatibility = 1.11 targetCompatibility = 1.11 @@ -81,7 +77,7 @@ subprojects { testImplementation "org.codehaus.groovy:groovy-test:$groovyVersion" testImplementation "io.projectreactor:reactor-test:3.6.1" testImplementation("org.spockframework:spock-core:$spockVersion") - implementation 'org.grails:grails-datastore-gorm:7.3.4' + implementation 'org.apache.grails.data:grails-datamapping-core:7.3.4' } } diff --git a/grails-data-graphql/core/build.gradle b/grails-data-graphql/core/build.gradle index 5751f98fd45..d187e330036 100644 --- a/grails-data-graphql/core/build.gradle +++ b/grails-data-graphql/core/build.gradle @@ -7,20 +7,20 @@ apply plugin: 'codenarc' dependencies { documentation "org.codehaus.groovy:groovy-cli-picocli:$groovyVersion" - api "org.grails:grails-datastore-gorm:${gormVersion}" + api "org.apache.grails.data:grails-datamapping-core:${gormVersion}" api "com.graphql-java:graphql-java:$graphqlJavaVersion" api "com.graphql-java:graphql-java-extended-scalars:$graphqlJavaScalarExtVersion" api 'com.github.javaparser:javaparser-core:3.25.7' - api "org.grails.plugins:views-json:2.3.2" + api 'org.grails.plugins:views-json:2.3.2' api 'org.javassist:javassist:3.29.2-GA' codenarc "org.codenarc:CodeNarc:$codenarcVersion" - testImplementation "org.grails:grails-datastore-gorm-hibernate5:${gormHibernateVersion}" - testImplementation "org.grails:grails-datastore-gorm-mongodb:${gormMongoDbVersion}" + testImplementation "org.apache.grails.data:grails-data-hibernate5-core:${gormHibernateVersion}" + testImplementation "org.apache.grails.data:grails-data-mongodb-core:${gormMongoDbVersion}" testImplementation 'com.github.fakemongo:fongo:2.1.1' testImplementation 'com.h2database:h2:2.2.224' - testImplementation "org.apache.tomcat:tomcat-jdbc:8.5.97" + testImplementation 'org.apache.tomcat:tomcat-jdbc:8.5.97' testImplementation "org.apache.tomcat.embed:tomcat-embed-logging-log4j:8.5.2" testImplementation "org.slf4j:slf4j-api:$slf4jVersion" } diff --git a/grails-data-graphql/examples/grails-docs-app/build.gradle b/grails-data-graphql/examples/grails-docs-app/build.gradle index 68578d76da6..e8f192d7e3e 100644 --- a/grails-data-graphql/examples/grails-docs-app/build.gradle +++ b/grails-data-graphql/examples/grails-docs-app/build.gradle @@ -1,32 +1,34 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-logging" implementation "org.springframework.boot:spring-boot-autoconfigure" - implementation "org.grails:grails-core" + implementation "org.apache.grails:grails-core", { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-starter-tomcat" - implementation "org.grails:grails-plugin-url-mappings" - implementation "org.grails:grails-plugin-rest" - implementation "org.grails:grails-plugin-codecs" - implementation "org.grails:grails-plugin-interceptors" - implementation "org.grails:grails-plugin-services" - implementation "org.grails:grails-plugin-datasource" - implementation "org.grails:grails-plugin-databinding" - implementation "org.grails:grails-web-boot" - implementation "org.grails:grails-logging" + implementation "org.apache.grails:grails-url-mappings" + implementation "org.apache.grails:grails-rest-transforms" + implementation "org.apache.grails:grails-codecs" + implementation "org.apache.grails:grails-interceptors" + implementation "org.apache.grails:grails-services" + implementation "org.apache.grails:grails-datasource" + implementation "org.apache.grails:grails-databinding" + implementation "org.apache.grails.web:grails-web-boot" + implementation "org.apache.grails:grails-logging" implementation "org.grails.plugins:cache" - implementation "org.grails.plugins:async" - implementation "org.grails.plugins:events" - implementation "org.grails.plugins:hibernate5" + implementation "org.apache.grails:grails-async" + implementation "org.apache.grails:grails-events" + implementation "org.apache.grails:grails-data-hibernate5" implementation "org.hibernate:hibernate-core:$hibernateCoreVersion" implementation "org.grails.plugins:views-json" - implementation "org.grails.plugins:views-json-templates" + implementation "org.apache.grails:grails-data-mongodb-gson-templates" implementation 'io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.2.0' - console "org.grails:grails-console" + console "org.apache.grails:grails-console" profile "org.grails.profiles:rest-api" runtimeOnly "org.glassfish.web:el-impl:2.1.2-b03" runtimeOnly "com.h2database:h2" runtimeOnly "org.apache.tomcat:tomcat-jdbc" - testImplementation "org.grails:grails-gorm-testing-support" + testImplementation project(':grails-testing-support-datamapping') testImplementation "org.grails:grails-web-testing-support" implementation project(":grails-plugin-gorm-graphql-plugin") diff --git a/grails-data-graphql/examples/grails-multi-datastore-app/build.gradle b/grails-data-graphql/examples/grails-multi-datastore-app/build.gradle index abbe3c0f4be..6a3c17f84b3 100644 --- a/grails-data-graphql/examples/grails-multi-datastore-app/build.gradle +++ b/grails-data-graphql/examples/grails-multi-datastore-app/build.gradle @@ -5,41 +5,43 @@ repositories { dependencies { implementation "org.springframework.boot:spring-boot-starter-logging" implementation "org.springframework.boot:spring-boot-autoconfigure" - implementation "org.grails:grails-core" + implementation "org.apache.grails:grails-core", { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-starter-tomcat" - implementation "org.grails:grails-plugin-url-mappings" - implementation "org.grails:grails-plugin-rest" - implementation "org.grails:grails-plugin-codecs" - implementation "org.grails:grails-plugin-interceptors" - implementation "org.grails:grails-plugin-services" - implementation "org.grails:grails-plugin-datasource" - implementation "org.grails:grails-plugin-databinding" - implementation "org.grails:grails-web-boot" - implementation "org.grails:grails-logging" + implementation "org.apache.grails:grails-url-mappings" + implementation "org.apache.grails:grails-rest-transforms" + implementation "org.apache.grails:grails-codecs" + implementation "org.apache.grails:grails-interceptors" + implementation "org.apache.grails:grails-services" + implementation "org.apache.grails:grails-datasource" + implementation "org.apache.grails:grails-databinding" + implementation "org.apache.grails.web:grails-web-boot" + implementation "org.apache.grails:grails-logging" implementation "org.grails.plugins:cache" - implementation "org.grails.plugins:async" - implementation "org.grails.plugins:hibernate5" + implementation "org.apache.grails:grails-async" + implementation "org.apache.grails:grails-data-hibernate5" implementation "org.hibernate:hibernate-core:$hibernateCoreVersion" - implementation "org.grails.plugins:mongodb" + implementation "org.apache.grails:grails-data-mongodb" implementation "org.grails.plugins:views-json" implementation 'io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.2.0' - implementation "org.grails.plugins:views-json-templates" + implementation "org.apache.grails:grails-data-mongodb-gson-templates" implementation "com.graphql-java:graphql-java:$graphqlJavaVersion" - console "org.grails:grails-console" + console "org.apache.grails:grails-console" profile "org.grails.profiles:rest-api" compileOnly 'org.grails.plugins:embedded-mongodb:2.0.1' implementation "org.apache.commons:commons-compress:1.10" implementation "org.glassfish.web:el-impl:2.1.2-b03" implementation "com.h2database:h2" implementation "org.apache.tomcat:tomcat-jdbc" - compileOnly "org.grails:grails-gorm-testing-support" - compileOnly "org.grails.plugins:geb" + compileOnly "org.apache.grails:grails-testing-support-datamapping" + compileOnly "org.apache.grails:grails-geb" compileOnly "org.grails:grails-web-testing-support" testRuntimeOnly "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1" testRuntimeOnly "net.sourceforge.htmlunit:htmlunit:2.18" testImplementation "org.grails:grails-test-mixins:3.3.0" - testImplementation "org.grails:grails-gorm-testing-support" + testImplementation project(':grails-testing-support-datamapping') implementation project(":grails-plugin-gorm-graphql-plugin") } diff --git a/grails-data-graphql/examples/grails-tenant-app/build.gradle b/grails-data-graphql/examples/grails-tenant-app/build.gradle index 7b55403839b..bc86b9b3b4b 100644 --- a/grails-data-graphql/examples/grails-tenant-app/build.gradle +++ b/grails-data-graphql/examples/grails-tenant-app/build.gradle @@ -1,33 +1,35 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-logging" implementation "org.springframework.boot:spring-boot-autoconfigure" - implementation "org.grails:grails-core" + implementation "org.apache.grails:grails-core", { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-starter-tomcat" - implementation "org.grails:grails-plugin-url-mappings" - implementation "org.grails:grails-plugin-rest" - implementation "org.grails:grails-plugin-codecs" - implementation "org.grails:grails-plugin-interceptors" - implementation "org.grails:grails-plugin-services" - implementation "org.grails:grails-plugin-datasource" - implementation "org.grails:grails-plugin-databinding" - implementation "org.grails:grails-web-boot" - implementation "org.grails:grails-logging" + implementation "org.apache.grails:grails-url-mappings" + implementation "org.apache.grails:grails-rest-transforms" + implementation "org.apache.grails:grails-codecs" + implementation "org.apache.grails:grails-interceptors" + implementation "org.apache.grails:grails-services" + implementation "org.apache.grails:grails-datasource" + implementation "org.apache.grails:grails-databinding" + implementation "org.apache.grails.web:grails-web-boot" + implementation "org.apache.grails:grails-logging" implementation "org.grails.plugins:cache" - implementation "org.grails.plugins:async" - implementation "org.grails.plugins:events" - implementation "org.grails.plugins:hibernate5" + implementation "org.apache.grails:grails-async" + implementation "org.apache.grails:grails-events" + implementation "org.apache.grails:grails-data-hibernate5" implementation "org.hibernate:hibernate-core:$hibernateCoreVersion" implementation "org.grails.plugins:views-json" - implementation "org.grails.plugins:views-json-templates" + implementation "org.apache.grails:grails-data-mongodb-gson-templates" implementation 'io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.2.0' - console "org.grails:grails-console" + console "org.apache.grails:grails-console" profile "org.grails.profiles:rest-api" runtimeOnly "org.glassfish.web:el-impl:2.1.2-b03" runtimeOnly "com.h2database:h2" runtimeOnly "org.apache.tomcat:tomcat-jdbc" - testImplementation "org.grails:grails-gorm-testing-support" - testImplementation "org.grails.plugins:geb" + testImplementation project(':grails-testing-support-datamapping') + testImplementation "org.apache.grails:grails-geb" testImplementation "org.grails:grails-web-testing-support" testRuntimeOnly "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1" testRuntimeOnly "net.sourceforge.htmlunit:htmlunit:2.18" diff --git a/grails-data-graphql/examples/grails-test-app/build.gradle b/grails-data-graphql/examples/grails-test-app/build.gradle index 6a285b25512..886158dd65e 100644 --- a/grails-data-graphql/examples/grails-test-app/build.gradle +++ b/grails-data-graphql/examples/grails-test-app/build.gradle @@ -1,33 +1,35 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-logging" implementation "org.springframework.boot:spring-boot-autoconfigure" - implementation "org.grails:grails-core" + implementation "org.apache.grails:grails-core", { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-starter-tomcat" - implementation "org.grails:grails-plugin-url-mappings" - implementation "org.grails:grails-plugin-rest" - implementation "org.grails:grails-plugin-codecs" - implementation "org.grails:grails-plugin-interceptors" - implementation "org.grails:grails-plugin-services" - implementation "org.grails:grails-plugin-datasource" - implementation "org.grails:grails-plugin-databinding" - implementation "org.grails:grails-web-boot" - implementation "org.grails:grails-logging" + implementation "org.apache.grails:grails-url-mappings" + implementation "org.apache.grails:grails-rest-transforms" + implementation "org.apache.grails:grails-codecs" + implementation "org.apache.grails:grails-interceptors" + implementation "org.apache.grails:grails-services" + implementation "org.apache.grails:grails-datasource" + implementation "org.apache.grails:grails-databinding" + implementation "org.apache.grails.web:grails-web-boot" + implementation "org.apache.grails:grails-logging" implementation "org.grails.plugins:cache" - implementation "org.grails.plugins:async" - implementation "org.grails.plugins:events" - implementation "org.grails.plugins:hibernate5" + implementation "org.apache.grails:grails-async" + implementation "org.apache.grails:grails-events" + implementation "org.apache.grails:grails-data-hibernate5" implementation "org.hibernate:hibernate-core:$hibernateCoreVersion" implementation "org.grails.plugins:views-json" - implementation "org.grails.plugins:views-json-templates" + implementation "org.apache.grails:grails-data-mongodb-gson-templates" implementation "com.graphql-java:graphql-java:$graphqlJavaVersion" implementation 'io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.2.0' - console "org.grails:grails-console" + console "org.apache.grails:grails-console" profile "org.grails.profiles:rest-api" runtimeOnly "org.glassfish.web:el-impl:2.1.2-b03" runtimeOnly "com.h2database:h2" runtimeOnly "org.apache.tomcat:tomcat-jdbc" - testImplementation "org.grails:grails-gorm-testing-support" + testImplementation project(':grails-testing-support-datamapping') testImplementation "org.grails:grails-web-testing-support" testImplementation "org.grails:grails-test-mixins:3.3.0" diff --git a/grails-data-graphql/examples/spring-boot-app/build.gradle b/grails-data-graphql/examples/spring-boot-app/build.gradle index 8d02f0297fc..5e83d9fb43b 100644 --- a/grails-data-graphql/examples/spring-boot-app/build.gradle +++ b/grails-data-graphql/examples/spring-boot-app/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath platform("org.grails:grails-bom:$grailsVersion") + classpath platform("org.apache.grails:grails-bom:$grailsVersion") classpath("org.springframework.boot:spring-boot-gradle-plugin") } } @@ -14,7 +14,7 @@ apply plugin: 'org.springframework.boot' apply plugin: 'io.spring.dependency-management' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation 'org.springframework.boot:spring-boot-starter' implementation "org.springframework.boot:spring-boot-starter-web" @@ -24,7 +24,9 @@ dependencies { // exclude javax variant of hibernate-core exclude group: 'org.hibernate', module: 'hibernate-core' } - implementation "org.grails:grails-core" + implementation "org.apache.grails:grails-core", { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } implementation project(":gorm-graphql") //implementation 'org.codehaus.groovy:groovy-astbuilder:3.0.19' implementation 'jakarta.transaction:jakarta.transaction-api' diff --git a/grails-data-graphql/plugin/build.gradle b/grails-data-graphql/plugin/build.gradle index cae89cbf2d2..1d4252250ff 100644 --- a/grails-data-graphql/plugin/build.gradle +++ b/grails-data-graphql/plugin/build.gradle @@ -5,17 +5,17 @@ plugins { } dependencies { - api "org.grails:grails-plugin-controllers" - api "org.grails:grails-plugin-databinding" - api("org.grails:grails-plugin-rest") { + api "org.apache.grails:grails-controllers" + api "org.apache.grails:grails-databinding" + api("org.apache.grails:grails-rest-transforms") { exclude group: 'org.grails.plugins', module: 'converters' } - api "org.grails:grails-plugin-url-mappings" + api "org.apache.grails:grails-url-mappings" api "org.grails.plugins:views-json:$viewsJsonVersion" api 'io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.3.0' api "javax.servlet:javax.servlet-api:$servletApiVersion" api "io.micronaut:micronaut-http-client:$micronautVersion" - api "org.grails.plugins:converters:3.3.1" + api "org.apache.grails:grails-converters:3.3.1" api 'com.github.javaparser:javaparser-core:3.25.7' api "com.graphql-java:graphql-java:$graphqlJavaVersion" testImplementation "org.grails:grails-web-testing-support" diff --git a/grails-data-hibernate5/boot-plugin/build.gradle b/grails-data-hibernate5/boot-plugin/build.gradle index 4f00b8425f8..56d8d195caa 100644 --- a/grails-data-hibernate5/boot-plugin/build.gradle +++ b/grails-data-hibernate5/boot-plugin/build.gradle @@ -4,12 +4,11 @@ plugins { } version = projectVersion -group = 'org.grails' +group = 'org.apache.grails' ext { apiDocs = true - snapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local' - pomArtifactId = 'gorm-hibernate5-spring-boot' + pomArtifactId = 'grails-data-hibernate5-spring-boot' pomDevelopers = [ 'graemerocher': 'Graeme Rocher', 'jeffscottbrown': 'Jeff Brown', @@ -20,16 +19,16 @@ ext { dependencies { // TODO: Clarify and clean up dependencies - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") - compileOnly "org.grails:grails-shell", { + compileOnly "org.apache.grails:grails-shell-cli", { exclude group:'org.apache.groovy', module:'groovy' } api "org.apache.groovy:groovy" api "org.springframework.boot:spring-boot-autoconfigure" - api project(":hibernate5-gorm") + api project(":hibernate5-core") - testImplementation "org.grails:grails-shell", { + testImplementation "org.apache.grails:grails-shell-cli", { exclude group:'org.apache.groovy', module:'groovy' } testImplementation "org.spockframework:spock-core" diff --git a/grails-data-hibernate5/boot-plugin/src/main/groovy/org/grails/datastore/gorm/boot/compiler/GormCompilerAutoConfiguration.groovy b/grails-data-hibernate5/boot-plugin/src/main/groovy/org/grails/datastore/gorm/boot/compiler/GormCompilerAutoConfiguration.groovy index 384d27de067..5e81ec86e0d 100644 --- a/grails-data-hibernate5/boot-plugin/src/main/groovy/org/grails/datastore/gorm/boot/compiler/GormCompilerAutoConfiguration.groovy +++ b/grails-data-hibernate5/boot-plugin/src/main/groovy/org/grails/datastore/gorm/boot/compiler/GormCompilerAutoConfiguration.groovy @@ -40,7 +40,7 @@ class GormCompilerAutoConfiguration extends CompilerAutoConfiguration{ @Override void applyDependencies(DependencyCustomizer dependencies) throws CompilationFailedException { dependencies.ifAnyMissingClasses("grails.persistence.Entity", "grails.gorm.annotation.Entity") - .add("grails-datastore-gorm-hibernate5") + .add("grails-data-hibernate5-core") } @Override diff --git a/grails-data-hibernate5/gorm/build.gradle b/grails-data-hibernate5/core/build.gradle similarity index 92% rename from grails-data-hibernate5/gorm/build.gradle rename to grails-data-hibernate5/core/build.gradle index ecac1193504..0e7cfa4400e 100644 --- a/grails-data-hibernate5/gorm/build.gradle +++ b/grails-data-hibernate5/core/build.gradle @@ -4,12 +4,11 @@ plugins { } version = projectVersion -group = 'org.grails' +group = 'org.apache.grails.data' ext { apiDocs = true - snapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local' - pomArtifactId = 'grails-datastore-gorm-hibernate5' + pomArtifactId = 'grails-data-hibernate5-core' pomDevelopers = [ 'graemerocher': 'Graeme Rocher', 'jeffscottbrown': 'Jeff Brown', @@ -20,7 +19,7 @@ ext { dependencies { // TODO: Clarify and clean up dependencies - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") api "org.slf4j:slf4j-api" diff --git a/grails-data-hibernate5/gorm/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java b/grails-data-hibernate5/core/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java rename to grails-data-hibernate5/core/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/grails/orm/PagedResultList.java b/grails-data-hibernate5/core/src/main/groovy/grails/orm/PagedResultList.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/grails/orm/PagedResultList.java rename to grails-data-hibernate5/core/src/main/groovy/grails/orm/PagedResultList.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/grails/orm/RlikeExpression.java b/grails-data-hibernate5/core/src/main/groovy/grails/orm/RlikeExpression.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/grails/orm/RlikeExpression.java rename to grails-data-hibernate5/core/src/main/groovy/grails/orm/RlikeExpression.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy b/grails-data-hibernate5/core/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy rename to grails-data-hibernate5/core/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/grails/orm/hibernate/annotation/ManagedEntity.java b/grails-data-hibernate5/core/src/main/groovy/grails/orm/hibernate/annotation/ManagedEntity.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/grails/orm/hibernate/annotation/ManagedEntity.java rename to grails-data-hibernate5/core/src/main/groovy/grails/orm/hibernate/annotation/ManagedEntity.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/grails/orm/hibernate/mapping/MappingBuilder.groovy b/grails-data-hibernate5/core/src/main/groovy/grails/orm/hibernate/mapping/MappingBuilder.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/grails/orm/hibernate/mapping/MappingBuilder.groovy rename to grails-data-hibernate5/core/src/main/groovy/grails/orm/hibernate/mapping/MappingBuilder.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormInstanceApi.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormInstanceApi.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormInstanceApi.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormInstanceApi.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormValidationApi.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormValidationApi.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormValidationApi.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormValidationApi.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/EventListenerIntegrator.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/EventListenerIntegrator.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/EventListenerIntegrator.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/EventListenerIntegrator.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTemplate.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTemplate.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTemplate.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTemplate.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTransactionManager.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTransactionManager.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTransactionManager.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTransactionManager.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/GrailsSessionContext.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/GrailsSessionContext.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/GrailsSessionContext.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/GrailsSessionContext.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/HibernateEventListeners.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/HibernateEventListeners.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/HibernateEventListeners.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/HibernateEventListeners.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/HibernateGormEnhancer.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormEnhancer.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/HibernateGormEnhancer.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormEnhancer.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/HibernateGormInstanceApi.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormInstanceApi.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/HibernateGormInstanceApi.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormInstanceApi.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/HibernateGormValidationApi.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormValidationApi.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/HibernateGormValidationApi.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormValidationApi.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/HibernateMappingContextSessionFactoryBean.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/HibernateMappingContextSessionFactoryBean.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/HibernateMappingContextSessionFactoryBean.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/HibernateMappingContextSessionFactoryBean.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/HibernateSession.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/HibernateSession.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/HibernateSession.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/HibernateSession.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/IHibernateTemplate.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/IHibernateTemplate.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/IHibernateTemplate.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/IHibernateTemplate.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/InstanceApiHelper.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/InstanceApiHelper.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/InstanceApiHelper.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/InstanceApiHelper.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/MetadataIntegrator.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/MetadataIntegrator.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/MetadataIntegrator.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/MetadataIntegrator.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/SessionFactoryHolder.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/SessionFactoryHolder.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/SessionFactoryHolder.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/SessionFactoryHolder.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/access/TraitPropertyAccessStrategy.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/access/TraitPropertyAccessStrategy.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/access/TraitPropertyAccessStrategy.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/access/TraitPropertyAccessStrategy.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/AbstractGrailsDomainBinder.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/AbstractGrailsDomainBinder.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/AbstractGrailsDomainBinder.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/AbstractGrailsDomainBinder.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/CacheConfig.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/CacheConfig.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/CacheConfig.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/CacheConfig.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/ColumnConfig.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/ColumnConfig.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/ColumnConfig.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/ColumnConfig.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/DiscriminatorConfig.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/DiscriminatorConfig.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/DiscriminatorConfig.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/DiscriminatorConfig.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtil.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtil.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtil.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtil.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsIdentifierGeneratorFactory.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsIdentifierGeneratorFactory.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsIdentifierGeneratorFactory.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsIdentifierGeneratorFactory.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingBuilder.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingBuilder.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingBuilder.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingBuilder.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContext.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContext.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContext.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContext.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextConfiguration.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/HibernatePersistentEntity.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/HibernatePersistentEntity.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/HibernatePersistentEntity.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/HibernatePersistentEntity.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/Identity.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/Identity.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/Identity.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/Identity.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/IdentityEnumType.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/IdentityEnumType.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/IdentityEnumType.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/IdentityEnumType.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/InstanceProxy.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/InstanceProxy.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/InstanceProxy.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/InstanceProxy.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/JoinTable.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/JoinTable.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/JoinTable.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/JoinTable.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/Mapping.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/Mapping.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/Mapping.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/Mapping.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/NaturalId.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/NaturalId.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/NaturalId.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/NaturalId.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyDefinitionDelegate.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyDefinitionDelegate.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyDefinitionDelegate.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyDefinitionDelegate.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/Settings.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/Settings.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/Settings.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/Settings.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/SortConfig.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/SortConfig.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/SortConfig.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/SortConfig.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/Table.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/Table.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/cfg/Table.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/Table.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformation.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformation.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformation.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformation.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/connections/AbstractHibernateConnectionSourceFactory.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/connections/AbstractHibernateConnectionSourceFactory.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/connections/AbstractHibernateConnectionSourceFactory.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/connections/AbstractHibernateConnectionSourceFactory.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSource.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSource.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSource.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSource.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsBuilder.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsBuilder.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsBuilder.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsBuilder.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/datasource/MultipleDataSourceSupport.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/datasource/MultipleDataSourceSupport.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/datasource/MultipleDataSourceSupport.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/datasource/MultipleDataSourceSupport.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/event/listener/HibernateEventListener.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/event/listener/HibernateEventListener.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/event/listener/HibernateEventListener.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/event/listener/HibernateEventListener.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/exceptions/CouldNotDetermineHibernateDialectException.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/exceptions/CouldNotDetermineHibernateDialectException.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/exceptions/CouldNotDetermineHibernateDialectException.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/exceptions/CouldNotDetermineHibernateDialectException.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateConfigurationException.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateConfigurationException.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateConfigurationException.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateConfigurationException.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateException.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateException.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateException.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsHibernateException.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsQueryException.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsQueryException.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsQueryException.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/exceptions/GrailsQueryException.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/multitenancy/MultiTenantEventListener.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/multitenancy/MultiTenantEventListener.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/multitenancy/MultiTenantEventListener.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/multitenancy/MultiTenantEventListener.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandler.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandler.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandler.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandler.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriterionAdapter.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriterionAdapter.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriterionAdapter.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateCriterionAdapter.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateQuery.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateQuery.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateQuery.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateQuery.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/HibernateCriterionAdapter.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateCriterionAdapter.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/HibernateCriterionAdapter.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateCriterionAdapter.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/HibernateProjectionAdapter.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateProjectionAdapter.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/HibernateProjectionAdapter.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateProjectionAdapter.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryConstants.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryConstants.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryConstants.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryConstants.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/PagedResultList.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/PagedResultList.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/query/PagedResultList.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/query/PagedResultList.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/DataSourceFactoryBean.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/DataSourceFactoryBean.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/DataSourceFactoryBean.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/DataSourceFactoryBean.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreConnectionSourcesRegistrar.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreConnectionSourcesRegistrar.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreConnectionSourcesRegistrar.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreConnectionSourcesRegistrar.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreFactoryBean.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreFactoryBean.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreFactoryBean.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreFactoryBean.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/HibernateDialectDetectorFactoryBean.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/HibernateDialectDetectorFactoryBean.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/HibernateDialectDetectorFactoryBean.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/HibernateDialectDetectorFactoryBean.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/HibernateRuntimeUtils.groovy b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/HibernateRuntimeUtils.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/HibernateRuntimeUtils.groovy rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/HibernateRuntimeUtils.groovy diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/HibernateVersionSupport.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/HibernateVersionSupport.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/HibernateVersionSupport.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/HibernateVersionSupport.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/SoftKey.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/SoftKey.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/support/SoftKey.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/support/SoftKey.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/transaction/HibernateJtaTransactionManagerAdapter.java diff --git a/grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/transaction/PlatformTransactionManagerProxy.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/transaction/PlatformTransactionManagerProxy.java similarity index 100% rename from grails-data-hibernate5/gorm/src/main/groovy/org/grails/orm/hibernate/transaction/PlatformTransactionManagerProxy.java rename to grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/transaction/PlatformTransactionManagerProxy.java diff --git a/grails-data-hibernate5/gorm/src/main/resources/META-INF/org.hibernate.integrator.spi.Integrator b/grails-data-hibernate5/core/src/main/resources/META-INF/org.hibernate.integrator.spi.Integrator similarity index 100% rename from grails-data-hibernate5/gorm/src/main/resources/META-INF/org.hibernate.integrator.spi.Integrator rename to grails-data-hibernate5/core/src/main/resources/META-INF/org.hibernate.integrator.spi.Integrator diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderTests.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderTests.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderTests.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderTests.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/hibernate/mapping/HibernateOptimisticLockingStyleMappingSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/hibernate/mapping/HibernateOptimisticLockingStyleMappingSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/hibernate/mapping/HibernateOptimisticLockingStyleMappingSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/hibernate/mapping/HibernateOptimisticLockingStyleMappingSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/hibernate/mapping/MappingBuilderSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/hibernate/mapping/MappingBuilderSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/hibernate/mapping/MappingBuilderSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/hibernate/mapping/MappingBuilderSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/AutoTimestampSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/AutoTimestampSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/AutoTimestampSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/AutoTimestampSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/CascadeToBidirectionalAsssociationSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/CascadeToBidirectionalAsssociationSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/CascadeToBidirectionalAsssociationSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/CascadeToBidirectionalAsssociationSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/Club.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/Club.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/Club.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/Club.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/CompositeIdWithJoinTableSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/CompositeIdWithManyToOneAndSequenceSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/Contract.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/Contract.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/Contract.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/Contract.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/CountByWithEmbeddedSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/CountByWithEmbeddedSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/CountByWithEmbeddedSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/CountByWithEmbeddedSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/DeleteAllWhereSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/DeleteAllWhereSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/DeleteAllWhereSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/DeleteAllWhereSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/DetachCriteriaSubquerySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/DetachCriteriaSubquerySpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/DetachCriteriaSubquerySpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/DetachCriteriaSubquerySpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/DetachedCriteriaJoinSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/DetachedCriteriaJoinSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/DetachedCriteriaJoinSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/DetachedCriteriaJoinSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/DetachedCriteriaProjectionAliasSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/DetachedCriteriaProjectionAliasSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/DetachedCriteriaProjectionAliasSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/DetachedCriteriaProjectionAliasSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/DetachedCriteriaProjectionSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/DetachedCriteriaProjectionSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/DetachedCriteriaProjectionSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/DetachedCriteriaProjectionSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/DomainGetterSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/DomainGetterSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/DomainGetterSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/DomainGetterSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/EnumMappingSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/EnumMappingSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/EnumMappingSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/EnumMappingSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/ExecuteQueryWithinValidatorSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/ExecuteQueryWithinValidatorSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/ExecuteQueryWithinValidatorSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/ExecuteQueryWithinValidatorSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/GormDatastoreSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/GormDatastoreSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/GormDatastoreSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/GormDatastoreSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/HibernateEntityTraitGeneratedSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/HibernateEntityTraitGeneratedSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/HibernateEntityTraitGeneratedSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/HibernateEntityTraitGeneratedSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/HibernateOptimisticLockingSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/HibernateOptimisticLockingSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/HibernateOptimisticLockingSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/HibernateOptimisticLockingSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/HibernateSuite.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/HibernateSuite.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/HibernateSuite.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/HibernateSuite.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/HibernateValidationSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/HibernateValidationSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/HibernateValidationSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/HibernateValidationSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/IdentityEnumTypeSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/ImportFromConstraintSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/ImportFromConstraintSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/ImportFromConstraintSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/ImportFromConstraintSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/LastUpdateWithDynamicUpdateSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/LastUpdateWithDynamicUpdateSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/LastUpdateWithDynamicUpdateSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/LastUpdateWithDynamicUpdateSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/ManyToOneSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/ManyToOneSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/ManyToOneSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/ManyToOneSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/MultiColumnUniqueConstraintSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/MultiColumnUniqueConstraintSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/MultiColumnUniqueConstraintSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/MultiColumnUniqueConstraintSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/NullableAndLengthSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/NullableAndLengthSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/NullableAndLengthSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/NullableAndLengthSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/Player.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/Player.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/Player.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/Player.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/RLikeSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/RLikeSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/RLikeSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/RLikeSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/ReadOperationSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/ReadOperationSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/ReadOperationSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/ReadOperationSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/SaveWithExistingValidationErrorSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/SaveWithExistingValidationErrorSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/SaveWithExistingValidationErrorSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/SaveWithExistingValidationErrorSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/SchemaNameSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/SchemaNameSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/SchemaNameSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/SchemaNameSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/SequenceIdSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/SequenceIdSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/SequenceIdSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/SequenceIdSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/SizeConstraintSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/SizeConstraintSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/SizeConstraintSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/SizeConstraintSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/SqlQuerySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/SqlQuerySpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/SqlQuerySpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/SqlQuerySpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/SubclassMultipleListCollectionSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/SubclassMultipleListCollectionSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/SubclassMultipleListCollectionSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/SubclassMultipleListCollectionSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/SubqueryAliasSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/SubqueryAliasSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/SubqueryAliasSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/SubqueryAliasSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/Team.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/Team.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/Team.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/Team.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/ToOneProxySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/ToOneProxySpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/ToOneProxySpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/ToOneProxySpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/TwoBidirectionalOneToManySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/TwoBidirectionalOneToManySpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/TwoBidirectionalOneToManySpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/TwoBidirectionalOneToManySpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/UniqueConstraintHibernateSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/UniqueConstraintHibernateSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/UniqueConstraintHibernateSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/UniqueConstraintHibernateSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/UniqueWithMultipleDataSourcesSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/WhereQueryWithAssociationSortSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/WhereQueryWithAssociationSortSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/WhereQueryWithAssociationSortSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/WhereQueryWithAssociationSortSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/WithNewSessionAndExistingTransactionSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/WithNewSessionAndExistingTransactionSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/WithNewSessionAndExistingTransactionSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/WithNewSessionAndExistingTransactionSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/autoimport/AutoImportSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/autoimport/AutoImportSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/autoimport/AutoImportSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/autoimport/AutoImportSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/autoimport/other/A.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/autoimport/other/A.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/autoimport/other/A.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/autoimport/other/A.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/belongsto/BidirectionalOneToOneWithUniqueSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/belongsto/BidirectionalOneToOneWithUniqueSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/belongsto/BidirectionalOneToOneWithUniqueSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/belongsto/BidirectionalOneToOneWithUniqueSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/belongsto/Face.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/belongsto/Face.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/belongsto/Face.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/belongsto/Face.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/belongsto/Nose.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/belongsto/Nose.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/belongsto/Nose.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/belongsto/Nose.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdCriteria.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdCriteria.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdCriteria.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdCriteria.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/compositeid/GlobalConstraintWithCompositeIdSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateDirtyCheckingSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateDirtyCheckingSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateDirtyCheckingSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateDirtyCheckingSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateUpdateFromListenerSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateUpdateFromListenerSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateUpdateFromListenerSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/dirtychecking/HibernateUpdateFromListenerSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/dirtychecking/PropertyFieldSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/dirtychecking/PropertyFieldSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/dirtychecking/PropertyFieldSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/dirtychecking/PropertyFieldSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/events/UpdatePropertyInEventListenerSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/events/UpdatePropertyInEventListenerSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/events/UpdatePropertyInEventListenerSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/events/UpdatePropertyInEventListenerSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/hasmany/HasManyWithInQuerySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/hasmany/HasManyWithInQuerySpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/hasmany/HasManyWithInQuerySpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/hasmany/HasManyWithInQuerySpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/hasmany/ListCollectionSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/hasmany/ListCollectionSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/hasmany/ListCollectionSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/hasmany/ListCollectionSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/hasmany/TwoUnidirectionalHasManySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/hasmany/TwoUnidirectionalHasManySpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/hasmany/TwoUnidirectionalHasManySpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/hasmany/TwoUnidirectionalHasManySpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassImportedSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassImportedSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassImportedSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassImportedSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/jpa/SimpleJpaEntitySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/jpa/SimpleJpaEntitySpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/jpa/SimpleJpaEntitySpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/jpa/SimpleJpaEntitySpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/mappedby/MultipleOneToOneSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/mappedby/MultipleOneToOneSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/mappedby/MultipleOneToOneSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/mappedby/MultipleOneToOneSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyBidirectionalManyToManySpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/multitenancy/MultiTenancyUnidirectionalOneToManySpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/perf/JoinPerfSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/perf/JoinPerfSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/perf/JoinPerfSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/perf/JoinPerfSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/proxy/ByteBuddyProxySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/proxy/ByteBuddyProxySpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/proxy/ByteBuddyProxySpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/proxy/ByteBuddyProxySpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/proxy/StaticTestUtil.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/proxy/StaticTestUtil.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/proxy/StaticTestUtil.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/proxy/StaticTestUtil.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/services/DataServiceSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/services/DataServiceSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/services/DataServiceSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/services/DataServiceSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/softdelete/SoftDeleteSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/softdelete/SoftDeleteSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/softdelete/SoftDeleteSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/softdelete/SoftDeleteSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/traits/InterfacePropertySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/traits/InterfacePropertySpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/traits/InterfacePropertySpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/traits/InterfacePropertySpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/traits/TraitPropertySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/traits/TraitPropertySpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/traits/TraitPropertySpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/traits/TraitPropertySpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/txs/CustomIsolationLevelSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/txs/CustomIsolationLevelSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/txs/CustomIsolationLevelSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/txs/CustomIsolationLevelSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/txs/TransactionPropagationSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/txs/TransactionPropagationSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/txs/TransactionPropagationSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/txs/TransactionPropagationSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/txs/TransactionalWithinReadOnlySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/txs/TransactionalWithinReadOnlySpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/txs/TransactionalWithinReadOnlySpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/txs/TransactionalWithinReadOnlySpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/uuid/UuidInsertSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/uuid/UuidInsertSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/uuid/UuidInsertSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/uuid/UuidInsertSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/BeanValidationSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/BeanValidationSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/BeanValidationSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/BeanValidationSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/DeepValidationSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/DeepValidationSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/DeepValidationSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/DeepValidationSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/EmbeddedWithValidationExceptionSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/EmbeddedWithValidationExceptionSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/EmbeddedWithValidationExceptionSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/EmbeddedWithValidationExceptionSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/SaveWithInvalidEntitySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/SaveWithInvalidEntitySpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/SaveWithInvalidEntitySpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/SaveWithInvalidEntitySpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/SkipValidationSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/SkipValidationSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/SkipValidationSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/SkipValidationSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/UniqueFalseConstraintSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/UniqueFalseConstraintSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/UniqueFalseConstraintSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/UniqueFalseConstraintSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/UniqueWithHasOneSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/UniqueWithHasOneSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/UniqueWithHasOneSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/UniqueWithHasOneSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/UniqueWithinGroupSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/UniqueWithinGroupSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/grails/gorm/tests/validation/UniqueWithinGroupSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/validation/UniqueWithinGroupSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/org/grails/datastore/gorm/Setup.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/datastore/gorm/Setup.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/org/grails/datastore/gorm/Setup.groovy rename to grails-data-hibernate5/core/src/test/groovy/org/grails/datastore/gorm/Setup.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/DefaultConstraintsSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/DefaultConstraintsSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/DefaultConstraintsSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/DefaultConstraintsSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/GormSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/GormSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/GormSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/GormSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/cfg/HibernateMappingContextSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformationSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformationSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformationSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformationSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/DataSourceConnectionSourceFactorySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/DataSourceConnectionSourceFactorySpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/DataSourceConnectionSourceFactorySpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/DataSourceConnectionSourceFactorySpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactorySpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceConnectionsSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceConnectionsSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceConnectionsSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceConnectionsSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceMetadataSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceMetadataSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceMetadataSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceMetadataSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/PartitionedMultiTenancySpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/SchemaMultiTenantSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/SecondLevelCacheSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/SecondLevelCacheSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/SecondLevelCacheSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/SecondLevelCacheSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/connections/SingleTenantSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandlerSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandlerSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandlerSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandlerSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/support/HibernateVersionSupportSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/support/HibernateVersionSupportSpec.groovy similarity index 100% rename from grails-data-hibernate5/gorm/src/test/groovy/org/grails/orm/hibernate/support/HibernateVersionSupportSpec.groovy rename to grails-data-hibernate5/core/src/test/groovy/org/grails/orm/hibernate/support/HibernateVersionSupportSpec.groovy diff --git a/grails-data-hibernate5/gorm/src/test/resources/simplelogger.properties b/grails-data-hibernate5/core/src/test/resources/simplelogger.properties similarity index 100% rename from grails-data-hibernate5/gorm/src/test/resources/simplelogger.properties rename to grails-data-hibernate5/core/src/test/resources/simplelogger.properties diff --git a/grails-data-hibernate5/database-migration/build.gradle b/grails-data-hibernate5/database-migration/build.gradle index 9a86db88b5f..a5cba94d094 100644 --- a/grails-data-hibernate5/database-migration/build.gradle +++ b/grails-data-hibernate5/database-migration/build.gradle @@ -1,26 +1,25 @@ plugins { id 'java-library' - id 'org.grails.grails-plugin' + id 'org.apache.grails.gradle.grails-plugin' } version = projectVersion -group = 'org.grails.plugins' +group = 'org.apache.grails' ext { apiDocs = true - pomArtifactId = 'database-migration' + pomArtifactId = 'grails-data-hibernate5-dbmigration' pomTitle = 'Grails Database Migration Plugin' pomDescription = 'The Database Migration plugin helps you manage database changes, via Liquibase, while developing Grails applications' pomDevelopers = [ 'kazukiyamamoto': 'Kazuki YAMAMOTO', 'jamesfredley': 'James Fredley', ] - snapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local' } dependencies { // TODO: Clarify and clean up dependencies - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") api("org.liquibase:liquibase-core:$liquibaseHibernate5Version") api("org.liquibase.ext:liquibase-hibernate5:$liquibaseHibernate5Version") { @@ -31,22 +30,33 @@ dependencies { exclude group: 'org.liquibase', module: 'liquibase-commercial' } - api('org.grails:grails-shell') { + api('org.apache.grails:grails-shell-cli') { exclude group: 'org.slf4j', module: 'slf4j-simple' } compileOnly "org.springframework.boot:spring-boot-starter-logging" compileOnly "org.springframework.boot:spring-boot-autoconfigure" compileOnly project(":hibernate5-grails-plugin") - compileOnly "org.grails:grails-core" + compileOnly "org.apache.grails:grails-core", { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } compileOnly "org.apache.groovy:groovy-sql" compileOnly "org.apache.groovy:groovy-xml" testImplementation "org.springframework.boot:spring-boot-starter-tomcat" testImplementation project(":hibernate5-grails-plugin") - testImplementation "org.grails:grails-core" - testImplementation project(":grails-gorm-testing-support") - testImplementation "org.grails:grails-web-testing-support" + testImplementation "org.apache.grails:grails-core", { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } + testImplementation project(":grails-testing-support-datamapping") + testImplementation "org.grails:grails-web-testing-support", { + exclude group: 'org.grails', module: 'grails-testing-support' // TODO: Remove after views are published + exclude group: 'org.grails', module: 'grails-plugin-interceptors' // TODO: remove after views published + exclude group: 'org.grails', module: 'grails-plugin-rest' // TODO: remove when views published + } + testImplementation 'org.apache.grails:grails-rest-transforms' // TODO: Remove when views published + testImplementation 'org.apache.grails:grails-interceptors' // TODO: Remove when views published + testImplementation 'org.apache.grails.testing:grails-testing-support-core' // TODO: Remove after views are published testImplementation "com.h2database:h2" } diff --git a/grails-data-hibernate5/docs/build.gradle b/grails-data-hibernate5/docs/build.gradle index b39a687b898..5fd603ba85a 100644 --- a/grails-data-hibernate5/docs/build.gradle +++ b/grails-data-hibernate5/docs/build.gradle @@ -21,17 +21,19 @@ configurations { } dependencies { - documentation platform("org.grails:grails-bom:$grailsVersion") + documentation platform("org.apache.grails:grails-bom:$grailsVersion") documentation 'com.github.javaparser:javaparser-core' documentation "info.picocli:picocli:$picocliVersion" documentation 'org.apache.groovy:groovy-dateutil' documentation 'org.fusesource.jansi:jansi' - documentation 'org.grails:grails-bootstrap' - documentation 'org.grails:grails-core' - documentation 'org.grails:grails-spring' + documentation 'org.apache.grails.bootstrap:grails-bootstrap' + documentation 'org.apache.grails:grails-core', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } + documentation 'org.apache.grails:grails-spring' documentation "org.hibernate:hibernate-core-jakarta:$hibernateVersion" coreProjects.each { - documentation "org.grails:$it" + documentation "org.apache.grails.data:$it" } rootProject.subprojects .findAll { it.findProperty('apiDocs') } diff --git a/grails-data-hibernate5/docs/src/docs/asciidoc/gettingStarted/outsideGrails.adoc b/grails-data-hibernate5/docs/src/docs/asciidoc/gettingStarted/outsideGrails.adoc index 021c94e37ca..f482b29c772 100644 --- a/grails-data-hibernate5/docs/src/docs/asciidoc/gettingStarted/outsideGrails.adoc +++ b/grails-data-hibernate5/docs/src/docs/asciidoc/gettingStarted/outsideGrails.adoc @@ -2,7 +2,7 @@ If you wish to use GORM for Hibernate outside of a Grails application you should [source,groovy,subs="attributes"] ---- -compile "org.grails:grails-datastore-gorm-hibernate5:{version}" +compile "org.apache.grails.data:grails-data-hibernate5-core:{version}" runtime "com.h2database:h2:1.4.192" runtime "org.apache.tomcat:tomcat-jdbc:8.5.0" runtime "org.apache.tomcat.embed:tomcat-embed-logging-log4j:8.5.0" diff --git a/grails-data-hibernate5/examples/grails-data-service/build.gradle b/grails-data-hibernate5/examples/grails-data-service/build.gradle index ee522fa6571..a3c5284aa0b 100644 --- a/grails-data-hibernate5/examples/grails-data-service/build.gradle +++ b/grails-data-hibernate5/examples/grails-data-service/build.gradle @@ -1,31 +1,56 @@ plugins { - id 'org.grails.grails-web' - id 'org.grails.plugins.views-json' + id 'org.apache.grails.gradle.grails-web' + id 'org.apache.grails.gradle.grails-gson' } version = projectVersion group = 'examples' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':hibernate5-grails-plugin') - implementation 'org.grails:grails-core' - implementation 'org.grails.plugins:views-json' + implementation 'org.apache.grails:grails-core', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } + implementation 'org.grails.plugins:views-json', { + exclude group: 'org.grails', module: 'grails-plugin-rest' // TODO: remove when views published + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-plugin-mimetypes' // TODO: remove when views published + exclude group: 'org.grails', module: 'grails-web-url-mappings' // TODO: remove when views published + } + implementation 'org.apache.grails:grails-mimetypes', { // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } + implementation 'org.apache.grails.web:grails-web-url-mappings', { // TODO: Remove views published + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } + implementation 'org.apache.grails:grails-rest-transforms', { // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } compileOnly 'org.slf4j:slf4j-nop' // Remove warning during Gson views compilation runtimeOnly 'com.h2database:h2' runtimeOnly 'com.zaxxer:HikariCP' - runtimeOnly 'org.grails:grails-plugin-databinding' - runtimeOnly 'org.grails:grails-plugin-i18n' - runtimeOnly 'org.grails:grails-plugin-services' - runtimeOnly 'org.grails:grails-plugin-url-mappings' + runtimeOnly 'org.apache.grails:grails-databinding' + runtimeOnly 'org.apache.grails:grails-i18n' + runtimeOnly 'org.apache.grails:grails-services' + runtimeOnly 'org.apache.grails:grails-url-mappings' runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure' runtimeOnly 'org.springframework.boot:spring-boot-starter-logging' runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat' - integrationTestImplementation 'org.grails:grails-testing-support' + integrationTestImplementation 'org.apache.grails.testing:grails-testing-support-core' } apply { diff --git a/grails-data-hibernate5/examples/grails-database-per-tenant/build.gradle b/grails-data-hibernate5/examples/grails-database-per-tenant/build.gradle index a1b845c0d95..c5f76dc02df 100644 --- a/grails-data-hibernate5/examples/grails-database-per-tenant/build.gradle +++ b/grails-data-hibernate5/examples/grails-database-per-tenant/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.grails.grails-web' - id 'org.grails.grails-gsp' + id 'org.apache.grails.gradle.grails-web' + id 'org.apache.grails.gradle.grails-gsp' id 'com.bertramlabs.asset-pipeline' } @@ -8,26 +8,33 @@ version = projectVersion group = 'examples' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':hibernate5-grails-plugin') - implementation 'org.grails:grails-core' - implementation 'org.grails:grails-plugin-rest' + implementation 'org.apache.grails:grails-core', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } + implementation 'org.apache.grails:grails-rest-transforms', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } implementation 'org.grails.plugins:gsp' runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails' runtimeOnly 'com.h2database:h2' runtimeOnly 'com.zaxxer:HikariCP' - runtimeOnly 'org.grails:grails-plugin-databinding' - runtimeOnly 'org.grails:grails-plugin-i18n' - runtimeOnly 'org.grails:grails-plugin-services' - runtimeOnly 'org.grails:grails-plugin-url-mappings' + runtimeOnly 'org.apache.grails:grails-databinding' + runtimeOnly 'org.apache.grails:grails-i18n' + runtimeOnly 'org.apache.grails:grails-services' + runtimeOnly 'org.apache.grails:grails-url-mappings' runtimeOnly 'org.grails.plugins:fields' runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure' runtimeOnly 'org.springframework.boot:spring-boot-starter-logging' runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat' - testImplementation project(':grails-gorm-testing-support') + testImplementation project(':grails-testing-support-datamapping') testImplementation 'org.spockframework:spock-core' } diff --git a/grails-data-hibernate5/examples/grails-hibernate-groovy-proxy/build.gradle b/grails-data-hibernate5/examples/grails-hibernate-groovy-proxy/build.gradle index e008dbf6332..bf735c1a1f6 100644 --- a/grails-data-hibernate5/examples/grails-hibernate-groovy-proxy/build.gradle +++ b/grails-data-hibernate5/examples/grails-hibernate-groovy-proxy/build.gradle @@ -1,15 +1,17 @@ plugins { - id 'org.grails.grails-web' + id 'org.apache.grails.gradle.grails-web' } version = projectVersion group = 'examples' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':hibernate5-grails-plugin') - implementation 'org.grails:grails-core' + implementation 'org.apache.grails:grails-core', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } implementation "org.yakworks:hibernate-groovy-proxy:$yakworksHibernateGroovyProxyVersion", { exclude group: 'org.codehaus.groovy', module: 'groovy' } @@ -19,7 +21,7 @@ dependencies { runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure' runtimeOnly 'org.springframework.boot:spring-boot-starter-logging' - testImplementation 'org.grails:grails-testing-support' + testImplementation 'org.apache.grails.testing:grails-testing-support-core' } apply { diff --git a/grails-data-hibernate5/examples/grails-hibernate/build.gradle b/grails-data-hibernate5/examples/grails-hibernate/build.gradle index 3f20f1b6bab..29571405989 100644 --- a/grails-data-hibernate5/examples/grails-hibernate/build.gradle +++ b/grails-data-hibernate5/examples/grails-hibernate/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.grails.grails-web' - id 'org.grails.grails-gsp' + id 'org.apache.grails.gradle.grails-web' + id 'org.apache.grails.gradle.grails-gsp' id 'com.bertramlabs.asset-pipeline' } @@ -8,22 +8,30 @@ version = projectVersion group = 'examples' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") + integrationTestImplementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':hibernate5-grails-plugin') implementation 'jakarta.persistence:jakarta.persistence-api' implementation 'jakarta.validation:jakarta.validation-api' - implementation 'org.grails:grails-core' - implementation 'org.grails:grails-plugin-rest' + implementation 'org.apache.grails:grails-core', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } + implementation 'org.apache.grails:grails-rest-transforms', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } implementation 'org.grails.plugins:gsp' runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails' runtimeOnly 'com.h2database:h2' runtimeOnly 'com.zaxxer:HikariCP' - runtimeOnly 'org.grails:grails-plugin-databinding' - runtimeOnly 'org.grails:grails-plugin-i18n' - runtimeOnly 'org.grails:grails-plugin-services' - runtimeOnly 'org.grails:grails-plugin-url-mappings' + runtimeOnly 'org.apache.grails:grails-databinding' + runtimeOnly 'org.apache.grails:grails-i18n' + runtimeOnly 'org.apache.grails:grails-services' + runtimeOnly 'org.apache.grails:grails-url-mappings' runtimeOnly 'org.grails.plugins:fields' runtimeOnly "org.hibernate:hibernate-ehcache:$hibernateVersion", { // exclude javax variant of hibernate-core 5.6 @@ -36,10 +44,13 @@ dependencies { runtimeOnly 'org.springframework.boot:spring-boot-starter-logging' runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat' - testImplementation 'org.grails:grails-testing-support' - testImplementation 'org.grails:grails-web-testing-support' + testImplementation 'org.apache.grails.testing:grails-testing-support-core' + testImplementation "org.grails:grails-web-testing-support", { + exclude group: 'org.grails', module: 'grails-testing-support' // TODO: Remove after views are published + } + testImplementation 'org.apache.grails.testing:grails-testing-support-core' // TODO: Remove after views are published - integrationTestImplementation testFixtures('org.grails.plugins:geb') + integrationTestImplementation testFixtures('org.apache.grails:grails-geb') } apply { diff --git a/grails-data-hibernate5/examples/grails-multiple-datasources/build.gradle b/grails-data-hibernate5/examples/grails-multiple-datasources/build.gradle index 5daf6b0b181..1a4ad05b0c6 100644 --- a/grails-data-hibernate5/examples/grails-multiple-datasources/build.gradle +++ b/grails-data-hibernate5/examples/grails-multiple-datasources/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.grails.grails-web' + id 'org.apache.grails.gradle.grails-web' } version = projectVersion @@ -10,26 +10,32 @@ configurations { } dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") + //astTransformation platform("org.apache.grails:grails-bom:$grailsVersion") astTransformation 'jakarta.servlet:jakarta.servlet-api' - astTransformation 'org.grails:grails-plugin-controllers' + astTransformation 'org.apache.grails:grails-controllers' implementation project(':hibernate5-grails-plugin') - implementation 'org.grails:grails-core' - implementation 'org.grails:grails-plugin-domain-class' + implementation 'org.apache.grails:grails-core', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } + implementation 'org.apache.grails:grails-domain-class' runtimeOnly 'com.h2database:h2' runtimeOnly 'com.zaxxer:HikariCP' - runtimeOnly 'org.grails:grails-plugin-databinding' - runtimeOnly 'org.grails:grails-plugin-controllers' + runtimeOnly 'org.apache.grails:grails-databinding' + runtimeOnly 'org.apache.grails:grails-controllers' runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure' runtimeOnly 'org.springframework.boot:spring-boot-starter-logging' runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat' - testImplementation 'org.grails:grails-testing-support' + testImplementation 'org.apache.grails.testing:grails-testing-support-core' - testRuntimeOnly 'org.grails:grails-web-testing-support' + testRuntimeOnly "org.grails:grails-web-testing-support", { + exclude group: 'org.grails', module: 'grails-testing-support' // TODO: Remove after views are published + } + testRuntimeOnly 'org.apache.grails.testing:grails-testing-support-core' // TODO: Remove after views are published } sourceSets { diff --git a/grails-data-hibernate5/examples/grails-partitioned-multi-tenancy/build.gradle b/grails-data-hibernate5/examples/grails-partitioned-multi-tenancy/build.gradle index 24f7ac5949d..a0ecc0e9081 100644 --- a/grails-data-hibernate5/examples/grails-partitioned-multi-tenancy/build.gradle +++ b/grails-data-hibernate5/examples/grails-partitioned-multi-tenancy/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.grails.grails-web' - id 'org.grails.grails-gsp' + id 'org.apache.grails.gradle.grails-web' + id 'org.apache.grails.gradle.grails-gsp' id 'com.bertramlabs.asset-pipeline' } @@ -8,26 +8,33 @@ version = projectVersion group = 'examples' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':hibernate5-grails-plugin') - implementation 'org.grails:grails-core' - implementation 'org.grails:grails-plugin-rest' + implementation 'org.apache.grails:grails-core', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } + implementation 'org.apache.grails:grails-rest-transforms', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } implementation 'org.grails.plugins:gsp' runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails' runtimeOnly 'com.h2database:h2' runtimeOnly 'com.zaxxer:HikariCP' - runtimeOnly 'org.grails:grails-plugin-databinding' - runtimeOnly 'org.grails:grails-plugin-i18n' - runtimeOnly 'org.grails:grails-plugin-services' - runtimeOnly 'org.grails:grails-plugin-url-mappings' + runtimeOnly 'org.apache.grails:grails-databinding' + runtimeOnly 'org.apache.grails:grails-i18n' + runtimeOnly 'org.apache.grails:grails-services' + runtimeOnly 'org.apache.grails:grails-url-mappings' runtimeOnly 'org.grails.plugins:fields' runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure' runtimeOnly 'org.springframework.boot:spring-boot-starter-logging' runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat' - testImplementation 'org.grails:grails-testing-support' + testImplementation 'org.apache.grails.testing:grails-testing-support-core' } apply { diff --git a/grails-data-hibernate5/examples/grails-schema-per-tenant/build.gradle b/grails-data-hibernate5/examples/grails-schema-per-tenant/build.gradle index 24f7ac5949d..a0ecc0e9081 100644 --- a/grails-data-hibernate5/examples/grails-schema-per-tenant/build.gradle +++ b/grails-data-hibernate5/examples/grails-schema-per-tenant/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.grails.grails-web' - id 'org.grails.grails-gsp' + id 'org.apache.grails.gradle.grails-web' + id 'org.apache.grails.gradle.grails-gsp' id 'com.bertramlabs.asset-pipeline' } @@ -8,26 +8,33 @@ version = projectVersion group = 'examples' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':hibernate5-grails-plugin') - implementation 'org.grails:grails-core' - implementation 'org.grails:grails-plugin-rest' + implementation 'org.apache.grails:grails-core', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } + implementation 'org.apache.grails:grails-rest-transforms', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } implementation 'org.grails.plugins:gsp' runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails' runtimeOnly 'com.h2database:h2' runtimeOnly 'com.zaxxer:HikariCP' - runtimeOnly 'org.grails:grails-plugin-databinding' - runtimeOnly 'org.grails:grails-plugin-i18n' - runtimeOnly 'org.grails:grails-plugin-services' - runtimeOnly 'org.grails:grails-plugin-url-mappings' + runtimeOnly 'org.apache.grails:grails-databinding' + runtimeOnly 'org.apache.grails:grails-i18n' + runtimeOnly 'org.apache.grails:grails-services' + runtimeOnly 'org.apache.grails:grails-url-mappings' runtimeOnly 'org.grails.plugins:fields' runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure' runtimeOnly 'org.springframework.boot:spring-boot-starter-logging' runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat' - testImplementation 'org.grails:grails-testing-support' + testImplementation 'org.apache.grails.testing:grails-testing-support-core' } apply { diff --git a/grails-data-hibernate5/examples/issue450/build.gradle b/grails-data-hibernate5/examples/issue450/build.gradle index 7486cc0b422..5fbb9be075c 100644 --- a/grails-data-hibernate5/examples/issue450/build.gradle +++ b/grails-data-hibernate5/examples/issue450/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.grails.grails-web' - id 'org.grails.grails-gsp' + id 'org.apache.grails.gradle.grails-web' + id 'org.apache.grails.gradle.grails-gsp' id 'com.bertramlabs.asset-pipeline' } @@ -8,20 +8,27 @@ version = projectVersion group = 'multitenantcomposite' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':hibernate5-grails-plugin') - implementation 'org.grails:grails-core' - implementation 'org.grails:grails-plugin-rest' + implementation 'org.apache.grails:grails-core', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } + implementation 'org.apache.grails:grails-rest-transforms', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } implementation 'org.grails.plugins:gsp' runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails' runtimeOnly 'com.h2database:h2' runtimeOnly 'com.zaxxer:HikariCP' - runtimeOnly 'org.grails:grails-plugin-databinding' - runtimeOnly 'org.grails:grails-plugin-i18n' - runtimeOnly 'org.grails:grails-plugin-services' - runtimeOnly 'org.grails:grails-plugin-url-mappings' + runtimeOnly 'org.apache.grails:grails-databinding' + runtimeOnly 'org.apache.grails:grails-i18n' + runtimeOnly 'org.apache.grails:grails-services' + runtimeOnly 'org.apache.grails:grails-url-mappings' runtimeOnly 'org.grails.plugins:fields' runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure' runtimeOnly 'org.springframework.boot:spring-boot-starter-logging' @@ -29,7 +36,7 @@ dependencies { integrationTestImplementation platform("io.micronaut.platform:micronaut-platform:$micronautPlatformVersion") integrationTestImplementation 'io.micronaut:micronaut-http-client' - integrationTestImplementation 'org.grails:grails-testing-support' + integrationTestImplementation 'org.apache.grails.testing:grails-testing-support-core' integrationTestImplementation 'org.spockframework:spock-core' integrationTestRuntimeOnly 'io.micronaut.serde:micronaut-serde-jackson' diff --git a/grails-data-hibernate5/examples/spring-boot-hibernate/build.gradle b/grails-data-hibernate5/examples/spring-boot-hibernate/build.gradle index 44d210f86a0..408916e991a 100644 --- a/grails-data-hibernate5/examples/spring-boot-hibernate/build.gradle +++ b/grails-data-hibernate5/examples/spring-boot-hibernate/build.gradle @@ -8,7 +8,7 @@ group = 'examples' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':hibernate5-boot-plugin') implementation 'org.springframework.boot:spring-boot-starter-web' diff --git a/grails-data-hibernate5/examples/standalone-hibernate/build.gradle b/grails-data-hibernate5/examples/standalone-hibernate/build.gradle index 562ee8b8cc0..c1582bd2af7 100644 --- a/grails-data-hibernate5/examples/standalone-hibernate/build.gradle +++ b/grails-data-hibernate5/examples/standalone-hibernate/build.gradle @@ -6,8 +6,8 @@ group = 'examples' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") - implementation project(':hibernate5-gorm') + implementation platform("org.apache.grails:grails-bom:$grailsVersion") + implementation project(':hibernate5-core') implementation 'org.springframework:spring-tx' runtimeOnly 'com.h2database:h2' diff --git a/grails-data-hibernate5/grails-plugin/build.gradle b/grails-data-hibernate5/grails-plugin/build.gradle index 53c77d98049..3ab7ca4f8aa 100644 --- a/grails-data-hibernate5/grails-plugin/build.gradle +++ b/grails-data-hibernate5/grails-plugin/build.gradle @@ -1,15 +1,14 @@ plugins { id 'java-library' - id 'org.grails.grails-plugin' + id 'org.apache.grails.gradle.grails-plugin' } version = projectVersion -group = 'org.grails.plugins' +group = 'org.apache.grails' ext { apiDocs = true - pomArtifactId = 'hibernate5' - snapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local' + pomArtifactId = 'grails-data-hibernate5' pomDevelopers = [ 'graemerocher': 'Graeme Rocher', 'jeffscottbrown': 'Jeff Brown', @@ -20,26 +19,28 @@ ext { dependencies { // TODO: Clarify and clean up dependencies - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") api "org.springframework.boot:spring-boot" api "org.springframework:spring-orm" api "org.hibernate:hibernate-core-jakarta:$hibernateVersion" api project(":grails-datastore-web") - api project(":grails-datastore-gorm-support") - api project(":hibernate5-gorm"), { + api project(":grails-datamapping-support") + api project(":hibernate5-core"), { 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.apache.grails', module:'grails-bootstrap' exclude group:'org.codehaus.groovy', module:'groovy-all' - exclude group:'org.grails', module:'grails-core' + exclude group:'org.apache.grails', module:'grails-core' exclude group:'javax.transaction', module:'jta' } - compileOnly "org.grails:grails-bootstrap" - compileOnly "org.grails:grails-core" + compileOnly "org.apache.grails.bootstrap:grails-bootstrap" + compileOnly "org.apache.grails:grails-core", { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } compileOnly "org.spockframework:spock-core", { exclude group: "junit", module: "junit-dep" @@ -47,7 +48,7 @@ dependencies { exclude group: 'org.hamcrest', module: 'hamcrest-core' } - testImplementation project(":grails-gorm-testing-support") + testImplementation project(":grails-testing-support-datamapping") testImplementation "org.spockframework:spock-core" testRuntimeOnly "com.h2database:h2" diff --git a/grails-data-mongodb/boot-plugin/build.gradle b/grails-data-mongodb/boot-plugin/build.gradle index cc4d1c65b15..2e40fa17738 100644 --- a/grails-data-mongodb/boot-plugin/build.gradle +++ b/grails-data-mongodb/boot-plugin/build.gradle @@ -4,12 +4,11 @@ plugins { } version = projectVersion -group = 'org.grails' +group = 'org.apache.grails' ext { apiDocs = true - snapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local' - pomArtifactId = 'gorm-mongodb-spring-boot' + pomArtifactId = 'grails-data-mongodb-spring-boot' pomTitle = 'GORM for MongoDB' pomDescription = 'Provides a GORM Object Mapping implementations for the MongoDB Document Database' pomDevelopers = [ @@ -21,16 +20,16 @@ ext { dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") - api project(':mongodb-gorm'), { + api project(':mongodb-core'), { // api: MongoDatastore if (excludeUnusedTransDeps) { // API dependencies in grails-datastore-gorm-mongodb exclude group: 'org.mongodb', module: 'mongodb-driver-sync' - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' - //exclude group: 'org.grails', module: 'grails-datastore-gorm' // GormEntity needed downstream - //exclude group: 'org.grails', module: 'grails-datastore-gorm-bson' // Needed at runtime downstream (BsonPersistentEntityCodec) + exclude group: 'org.apache.grails.data', module: 'grails-datamapping-validation' + //exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm' // GormEntity needed downstream + //exclude group: 'org.apache.grails.data', module: 'grails-data-mongodb-bson' // Needed at runtime downstream (BsonPersistentEntityCodec) } } api 'org.mongodb:mongodb-driver-core', { @@ -56,9 +55,10 @@ dependencies { // impl: Needed for Java Spring Boot apps // comp: @CompileStatic(source) } - implementation project(':grails-datastore-core'), { - // impl: Service - } + // Provided by grails-datastore-gorm +// implementation project(':grails-datastore-core'), { +// // impl: Service +// } implementation project(':grails-datastore-gorm'), { // impl: ConfigurableApplicationContextEventPublisher } diff --git a/grails-data-mongodb/gorm-bson/build.gradle b/grails-data-mongodb/bson/build.gradle similarity index 84% rename from grails-data-mongodb/gorm-bson/build.gradle rename to grails-data-mongodb/bson/build.gradle index 9b2fe92e34e..0a9e90d717f 100644 --- a/grails-data-mongodb/gorm-bson/build.gradle +++ b/grails-data-mongodb/bson/build.gradle @@ -4,12 +4,11 @@ plugins { } version = projectVersion -group = 'org.grails' +group = 'org.apache.grails.data' ext { apiDocs = true - snapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local' - pomArtifactId = 'grails-datastore-gorm-bson' + pomArtifactId = 'grails-data-mongodb-bson' pomTitle = 'GORM for MongoDB' pomDescription = 'Provides a GORM Object Mapping implementations for the MongoDB Document Database' pomDevelopers = [ @@ -21,7 +20,7 @@ ext { dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") api 'org.mongodb:bson', { // api: AbstractBsonReader, AbstractBsonWriter, BsonBinary, BsonContextType, BsonDbPointer, BsonReader, @@ -39,9 +38,9 @@ dependencies { exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' exclude group: 'jakarta.inject', module: 'jakarta.inject-api' //exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' // Entity - exclude group: 'org.grails', module: 'grails-bootstrap' - exclude group: 'org.grails', module: 'grails-datastore-core' - exclude group: 'org.grails', module: 'grails-spring' + exclude group: 'org.apache.grails.bootstrap', module: 'grails-bootstrap' + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + exclude group: 'org.apache.grails', module: 'grails-spring' exclude group: 'org.springframework', module: 'spring-beans' exclude group: 'org.springframework', module: 'spring-context' //exclude group: 'org.springframework', module: 'spring-core' // ConversionService @@ -56,8 +55,8 @@ dependencies { // API dependencies in grails-datastore-gorm exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' //exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' // Entity - exclude group: 'org.grails', module: 'grails-datastore-core' - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + exclude group: 'org.apache.grails.data', module: 'grails-datamapping-validation' //exclude group: 'org.springframework', module: 'spring-context' // Validator exclude group: 'org.springframework', module: 'spring-jdbc' exclude group: 'org.springframework', module: 'spring-tx' diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/BigDecimalCodec.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/BigDecimalCodec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/BigDecimalCodec.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/BigDecimalCodec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/BigIntegerCodec.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/BigIntegerCodec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/BigIntegerCodec.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/BigIntegerCodec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/BsonPersistentEntityCodec.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/BsonPersistentEntityCodec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/BsonPersistentEntityCodec.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/BsonPersistentEntityCodec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/CodecCustomTypeMarshaller.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/CodecCustomTypeMarshaller.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/CodecCustomTypeMarshaller.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/CodecCustomTypeMarshaller.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/CodecExtensions.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/CodecExtensions.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/CodecExtensions.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/CodecExtensions.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/CodecRegistryAware.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/CodecRegistryAware.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/CodecRegistryAware.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/CodecRegistryAware.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/CodecRegistryProvider.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/CodecRegistryProvider.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/CodecRegistryProvider.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/CodecRegistryProvider.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/InstantCodec.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/InstantCodec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/InstantCodec.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/InstantCodec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/LocalDateCodec.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/LocalDateCodec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/LocalDateCodec.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/LocalDateCodec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/LocalDateTimeCodec.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/LocalDateTimeCodec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/LocalDateTimeCodec.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/LocalDateTimeCodec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/LocalTimeCodec.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/LocalTimeCodec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/LocalTimeCodec.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/LocalTimeCodec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/OffsetDateTimeCodec.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/OffsetDateTimeCodec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/OffsetDateTimeCodec.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/OffsetDateTimeCodec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/OffsetTimeCodec.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/OffsetTimeCodec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/OffsetTimeCodec.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/OffsetTimeCodec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/PeriodCodec.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/PeriodCodec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/PeriodCodec.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/PeriodCodec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/PropertyDecoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/PropertyDecoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/PropertyDecoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/PropertyDecoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/PropertyEncoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/PropertyEncoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/PropertyEncoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/PropertyEncoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/ZonedDateTimeCodec.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/ZonedDateTimeCodec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/ZonedDateTimeCodec.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/ZonedDateTimeCodec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/BasicCollectionTypeDecoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/BasicCollectionTypeDecoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/BasicCollectionTypeDecoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/BasicCollectionTypeDecoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/CustomTypeDecoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/CustomTypeDecoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/CustomTypeDecoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/CustomTypeDecoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/EmbeddedCollectionDecoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/EmbeddedCollectionDecoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/EmbeddedCollectionDecoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/EmbeddedCollectionDecoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/EmbeddedDecoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/EmbeddedDecoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/EmbeddedDecoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/EmbeddedDecoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/IdentityDecoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/IdentityDecoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/IdentityDecoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/IdentityDecoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/InstantDecoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/InstantDecoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/InstantDecoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/InstantDecoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/LocalDateDecoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/LocalDateDecoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/LocalDateDecoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/LocalDateDecoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/LocalDateTimeDecoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/LocalDateTimeDecoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/LocalDateTimeDecoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/LocalDateTimeDecoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/LocalTimeDecoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/LocalTimeDecoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/LocalTimeDecoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/LocalTimeDecoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/OffsetDateTimeDecoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/OffsetDateTimeDecoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/OffsetDateTimeDecoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/OffsetDateTimeDecoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/OffsetTimeDecoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/OffsetTimeDecoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/OffsetTimeDecoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/OffsetTimeDecoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/PeriodDecoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/PeriodDecoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/PeriodDecoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/PeriodDecoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/TenantIdDecoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/TenantIdDecoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/TenantIdDecoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/TenantIdDecoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/ZonedDateTimeDecoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/ZonedDateTimeDecoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/ZonedDateTimeDecoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/ZonedDateTimeDecoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/BasicCollectionTypeEncoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/BasicCollectionTypeEncoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/BasicCollectionTypeEncoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/BasicCollectionTypeEncoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/CustomTypeEncoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/CustomTypeEncoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/CustomTypeEncoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/CustomTypeEncoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/EmbeddedCollectionEncoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/EmbeddedCollectionEncoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/EmbeddedCollectionEncoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/EmbeddedCollectionEncoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/EmbeddedEncoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/EmbeddedEncoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/EmbeddedEncoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/EmbeddedEncoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/IdentityEncoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/IdentityEncoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/IdentityEncoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/IdentityEncoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/InstantEncoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/InstantEncoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/InstantEncoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/InstantEncoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/LocalDateEncoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/LocalDateEncoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/LocalDateEncoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/LocalDateEncoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/LocalDateTimeEncoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/LocalDateTimeEncoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/LocalDateTimeEncoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/LocalDateTimeEncoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/LocalTimeEncoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/LocalTimeEncoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/LocalTimeEncoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/LocalTimeEncoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/OffsetDateTimeEncoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/OffsetDateTimeEncoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/OffsetDateTimeEncoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/OffsetDateTimeEncoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/OffsetTimeEncoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/OffsetTimeEncoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/OffsetTimeEncoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/OffsetTimeEncoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/PeriodEncoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/PeriodEncoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/PeriodEncoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/PeriodEncoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/TenantIdEncoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/TenantIdEncoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/TenantIdEncoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/TenantIdEncoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/ZonedDateTimeEncoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/ZonedDateTimeEncoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/ZonedDateTimeEncoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/encoders/ZonedDateTimeEncoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/TemporalBsonConverter.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/TemporalBsonConverter.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/TemporalBsonConverter.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/TemporalBsonConverter.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverter.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverter.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverter.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverter.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/json/JsonReader.java b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/json/JsonReader.java similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/json/JsonReader.java rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/json/JsonReader.java diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/json/JsonScanner.java b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/json/JsonScanner.java similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/json/JsonScanner.java rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/json/JsonScanner.java diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/json/JsonToken.java b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/json/JsonToken.java similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/json/JsonToken.java rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/json/JsonToken.java diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/json/JsonTokenType.java b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/json/JsonTokenType.java similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/json/JsonTokenType.java rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/json/JsonTokenType.java diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/json/JsonWriter.java b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/json/JsonWriter.java similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/json/JsonWriter.java rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/json/JsonWriter.java diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/query/BsonQuery.java b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/query/BsonQuery.java similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/query/BsonQuery.java rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/query/BsonQuery.java diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/query/CodecRegistryEmbeddedQueryEncoder.groovy b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/query/CodecRegistryEmbeddedQueryEncoder.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/query/CodecRegistryEmbeddedQueryEncoder.groovy rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/query/CodecRegistryEmbeddedQueryEncoder.groovy diff --git a/grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/query/EmbeddedQueryEncoder.java b/grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/query/EmbeddedQueryEncoder.java similarity index 100% rename from grails-data-mongodb/gorm-bson/src/main/groovy/org/grails/datastore/bson/query/EmbeddedQueryEncoder.java rename to grails-data-mongodb/bson/src/main/groovy/org/grails/datastore/bson/query/EmbeddedQueryEncoder.java diff --git a/grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/BsonPersistentEntityCodecSpec.groovy b/grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/BsonPersistentEntityCodecSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/BsonPersistentEntityCodecSpec.groovy rename to grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/BsonPersistentEntityCodecSpec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/domain/Person.groovy b/grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/domain/Person.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/domain/Person.groovy rename to grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/domain/Person.groovy diff --git a/grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/InstantBsonConverterSpec.groovy b/grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/InstantBsonConverterSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/InstantBsonConverterSpec.groovy rename to grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/InstantBsonConverterSpec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverterSpec.groovy b/grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverterSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverterSpec.groovy rename to grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverterSpec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverterSpec.groovy b/grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverterSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverterSpec.groovy rename to grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverterSpec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverterSpec.groovy b/grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverterSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverterSpec.groovy rename to grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverterSpec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverterSpec.groovy b/grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverterSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverterSpec.groovy rename to grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverterSpec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverterSpec.groovy b/grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverterSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverterSpec.groovy rename to grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverterSpec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/PeriodBsonConverterSpec.groovy b/grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/PeriodBsonConverterSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/PeriodBsonConverterSpec.groovy rename to grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/PeriodBsonConverterSpec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverterSpec.groovy b/grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverterSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverterSpec.groovy rename to grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverterSpec.groovy diff --git a/grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/query/BsonQuerySpec.groovy b/grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/query/BsonQuerySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm-bson/src/test/groovy/org/grails/datastore/bson/query/BsonQuerySpec.groovy rename to grails-data-mongodb/bson/src/test/groovy/org/grails/datastore/bson/query/BsonQuerySpec.groovy diff --git a/grails-data-mongodb/gorm/build.gradle b/grails-data-mongodb/core/build.gradle similarity index 76% rename from grails-data-mongodb/gorm/build.gradle rename to grails-data-mongodb/core/build.gradle index f34114af48e..a68ca9219e1 100644 --- a/grails-data-mongodb/gorm/build.gradle +++ b/grails-data-mongodb/core/build.gradle @@ -4,12 +4,11 @@ plugins { } version = projectVersion -group = 'org.grails' +group = 'org.apache.grails.data' ext { apiDocs = true - snapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local' - pomArtifactId = 'grails-datastore-gorm-mongodb' + pomArtifactId = 'grails-data-mongodb-core' pomTitle = 'GORM for MongoDB' pomDescription = 'Provides a GORM Object Mapping implementations for the MongoDB Document Database' pomDevelopers = [ @@ -21,16 +20,16 @@ ext { dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") - api project(':mongodb-gorm-bson'), { + api project(':mongodb-bson'), { // api: BsonQuery, EmbeddedQueryEncoder // impl: CodecCustomTypeMarshaller if (excludeUnusedTransDeps) { - // API dependencies in grails-datastore-gorm-bson + // API dependencies in grails-data-mongodb-bson exclude group: 'org.mongodb', module: 'bson' - exclude group: 'org.grails', module: 'grails-datastore-core' - exclude group: 'org.grails', module: 'grails-datastore-gorm' + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm' } } api project(':grails-datastore-core'), { @@ -43,9 +42,9 @@ dependencies { //exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' // PreDestroy exclude group: 'jakarta.inject', module: 'jakarta.inject-api' exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' - exclude group: 'org.grails', module: 'grails-bootstrap' - exclude group: 'org.grails', module: 'grails-datastore-core' - exclude group: 'org.grails', module: 'grails-spring' + exclude group: 'org.apache.grails.bootstrap', module: 'grails-bootstrap' + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + exclude group: 'org.apache.grails', module: 'grails-spring' exclude group: 'org.springframework', module: 'spring-beans' exclude group: 'org.springframework', module: 'spring-context' exclude group: 'org.springframework', module: 'spring-core' @@ -60,21 +59,21 @@ dependencies { // API dependencies in grails-datastore-gorm //exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' // PreDestroy exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' - exclude group: 'org.grails', module: 'grails-datastore-core' - //exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // ConstraintRegistry + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + //exclude group: 'org.apache.grails.data', module: 'grails-datamapping-validation' // ConstraintRegistry exclude group: 'org.springframework', module: 'spring-context' exclude group: 'org.springframework', module: 'spring-jdbc' exclude group: 'org.springframework', module: 'spring-tx' } } - api project(':grails-datastore-gorm-support'), { + api project(':grails-datamapping-support'), { // api: AbstractDatastorePersistenceContextInterceptor // impl: DatastorePersistenceContextInterceptor if (excludeUnusedTransDeps) { - // API dependencies in grails-datastore-gorm-support - exclude group: 'org.grails', module: 'grails-core' - exclude group: 'org.grails', module: 'grails-datastore-core' - exclude group: 'org.grails', module: 'grails-datastore-gorm' + // API dependencies in grails-datamapping-support + exclude group: 'org.apache.grails', module: 'grails-core' + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm' exclude group: 'org.springframework', module: 'spring-context' exclude group: 'org.springframework', module: 'spring-core' } @@ -95,16 +94,16 @@ dependencies { // api: ApplicationEventPublisher } - implementation 'org.grails:grails-core', { + implementation 'org.apache.grails:grails-core', { // impl: GrailsMessageSourceUtils if (excludeUnusedTransDeps) { // API dependencies in grails-core exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' exclude group: 'jakarta.inject', module: 'jakarta.inject-api' //exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' // FetchType - //exclude group: 'org.grails', module: 'grails-bootstrap' // Resource - exclude group: 'org.grails', module: 'grails-datastore-core' - exclude group: 'org.grails', module: 'grails-spring' + //exclude group: 'org.apache.grails.data', module: 'grails-bootstrap' // Resource + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + exclude group: 'org.apache.grails', module: 'grails-spring' exclude group: 'org.springframework', module: 'spring-beans' exclude group: 'org.springframework', module: 'spring-context' exclude group: 'org.springframework', module: 'spring-core' @@ -124,7 +123,7 @@ dependencies { testImplementation 'jakarta.validation:jakarta.validation-api' testImplementation 'junit:junit' // JUnit 4 - testImplementation 'org.grails:grails-testing-support' + testImplementation 'org.apache.grails.testing:grails-testing-support-core' testImplementation 'org.spockframework:spock-core' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/MongoEntity.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/MongoEntity.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/MongoEntity.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/MongoEntity.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/api/MongoAllOperations.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/api/MongoAllOperations.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/api/MongoAllOperations.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/api/MongoAllOperations.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/api/MongoInstanceOperations.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/api/MongoInstanceOperations.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/api/MongoInstanceOperations.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/api/MongoInstanceOperations.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/api/MongoStaticOperations.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/api/MongoStaticOperations.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/api/MongoStaticOperations.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/api/MongoStaticOperations.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/bootstrap/MongoDbDataStoreSpringInitializer.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/bootstrap/MongoDbDataStoreSpringInitializer.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/bootstrap/MongoDbDataStoreSpringInitializer.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/bootstrap/MongoDbDataStoreSpringInitializer.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/Box.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/Box.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/Box.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/Box.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/Circle.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/Circle.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/Circle.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/Circle.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/Distance.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/Distance.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/Distance.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/Distance.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/GeoJSON.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/GeoJSON.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/GeoJSON.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/GeoJSON.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/GeometryCollection.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/GeometryCollection.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/GeometryCollection.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/GeometryCollection.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/LineString.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/LineString.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/LineString.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/LineString.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/Metric.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/Metric.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/Metric.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/Metric.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/MultiLineString.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/MultiLineString.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/MultiLineString.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/MultiLineString.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/MultiPoint.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/MultiPoint.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/MultiPoint.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/MultiPoint.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/MultiPolygon.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/MultiPolygon.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/MultiPolygon.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/MultiPolygon.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/Point.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/Point.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/Point.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/Point.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/Polygon.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/Polygon.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/Polygon.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/Polygon.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/Shape.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/Shape.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/Shape.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/Shape.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/Sphere.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/Sphere.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/geo/Sphere.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/geo/Sphere.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/mapping/MappingBuilder.groovy b/grails-data-mongodb/core/src/main/groovy/grails/mongodb/mapping/MappingBuilder.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/grails/mongodb/mapping/MappingBuilder.groovy rename to grails-data-mongodb/core/src/main/groovy/grails/mongodb/mapping/MappingBuilder.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/GeoIntersects.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/GeoIntersects.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/GeoIntersects.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/GeoIntersects.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/GeoWithin.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/GeoWithin.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/GeoWithin.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/GeoWithin.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/MongoCriteriaBuilder.java b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/MongoCriteriaBuilder.java similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/MongoCriteriaBuilder.java rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/MongoCriteriaBuilder.java diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/MongoEntityTraitProvider.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/MongoEntityTraitProvider.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/MongoEntityTraitProvider.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/MongoEntityTraitProvider.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/MongoGormEnhancer.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/MongoGormEnhancer.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/MongoGormEnhancer.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/MongoGormEnhancer.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/Near.java b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/Near.java similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/Near.java rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/Near.java diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/NearSphere.java b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/NearSphere.java similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/NearSphere.java rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/NearSphere.java diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/WithinBox.java b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/WithinBox.java similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/WithinBox.java rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/WithinBox.java diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/WithinCircle.java b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/WithinCircle.java similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/WithinCircle.java rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/WithinCircle.java diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/WithinPolygon.java b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/WithinPolygon.java similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/WithinPolygon.java rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/WithinPolygon.java diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/api/MongoStaticApi.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/api/MongoStaticApi.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/api/MongoStaticApi.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/api/MongoStaticApi.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/AbstractShapeCoordsType.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/AbstractShapeCoordsType.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/AbstractShapeCoordsType.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/AbstractShapeCoordsType.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/BoxType.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/BoxType.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/BoxType.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/BoxType.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/CircleType.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/CircleType.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/CircleType.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/CircleType.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/GeoJSONType.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/GeoJSONType.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/GeoJSONType.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/GeoJSONType.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/GeometryCollectionType.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/GeometryCollectionType.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/GeometryCollectionType.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/GeometryCollectionType.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/LineStringType.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/LineStringType.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/LineStringType.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/LineStringType.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/MultiLineStringType.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/MultiLineStringType.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/MultiLineStringType.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/MultiLineStringType.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/MultiPointType.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/MultiPointType.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/MultiPointType.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/MultiPointType.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/MultiPolygonType.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/MultiPolygonType.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/MultiPolygonType.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/MultiPolygonType.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/PointType.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/PointType.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/PointType.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/PointType.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/PolygonType.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/PolygonType.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/PolygonType.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/PolygonType.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/ShapeType.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/ShapeType.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/geo/ShapeType.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/geo/ShapeType.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/simple/EnumType.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/simple/EnumType.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/gorm/mongo/simple/EnumType.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/simple/EnumType.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/AbstractMongoSession.java b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/AbstractMongoSession.java similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/AbstractMongoSession.java rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/AbstractMongoSession.java diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/MongoCodecSession.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/MongoCodecSession.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/MongoCodecSession.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/MongoCodecSession.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/MongoConstants.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/MongoConstants.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/MongoConstants.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/MongoConstants.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/MongoDatastore.java b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/MongoDatastore.java similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/MongoDatastore.java rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/MongoDatastore.java diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/MongoSession.java b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/MongoSession.java similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/MongoSession.java rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/MongoSession.java diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoAttribute.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoAttribute.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoAttribute.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoAttribute.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoClientOptionsBuilder.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoClientOptionsBuilder.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoClientOptionsBuilder.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoClientOptionsBuilder.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoCollection.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoCollection.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoCollection.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoCollection.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoMappingContext.java b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoMappingContext.java similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoMappingContext.java rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoMappingContext.java diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoSettings.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoSettings.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoSettings.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoSettings.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/connections/AbstractMongoConnectionSourceSettings.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/connections/AbstractMongoConnectionSourceSettings.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/connections/AbstractMongoConnectionSourceSettings.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/connections/AbstractMongoConnectionSourceSettings.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/connections/MongoConnectionSourceFactory.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/connections/MongoConnectionSourceFactory.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/connections/MongoConnectionSourceFactory.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/connections/MongoConnectionSourceFactory.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/connections/MongoConnectionSourceSettings.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/connections/MongoConnectionSourceSettings.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/connections/MongoConnectionSourceSettings.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/connections/MongoConnectionSourceSettings.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/connections/MongoConnectionSourceSettingsBuilder.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/connections/MongoConnectionSourceSettingsBuilder.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/connections/MongoConnectionSourceSettingsBuilder.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/connections/MongoConnectionSourceSettingsBuilder.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/connections/MongoConnectionSources.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/connections/MongoConnectionSources.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/connections/MongoConnectionSources.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/connections/MongoConnectionSources.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/engine/AbstractMongoObectEntityPersister.java b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/engine/AbstractMongoObectEntityPersister.java similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/engine/AbstractMongoObectEntityPersister.java rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/engine/AbstractMongoObectEntityPersister.java diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/engine/MongoCodecEntityPersister.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/engine/MongoCodecEntityPersister.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/engine/MongoCodecEntityPersister.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/engine/MongoCodecEntityPersister.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/engine/MongoEntityPersister.java b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/engine/MongoEntityPersister.java similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/engine/MongoEntityPersister.java rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/engine/MongoEntityPersister.java diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/engine/codecs/PersistentEntityCodec.groovy b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/engine/codecs/PersistentEntityCodec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/engine/codecs/PersistentEntityCodec.groovy rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/engine/codecs/PersistentEntityCodec.groovy diff --git a/grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/query/MongoQuery.java b/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/query/MongoQuery.java similarity index 100% rename from grails-data-mongodb/gorm/src/main/groovy/org/grails/datastore/mapping/mongo/query/MongoQuery.java rename to grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/query/MongoQuery.java diff --git a/grails-data-mongodb/gorm/src/main/resources/META-INF/services/org.grails.compiler.gorm.GormEntityTraitProvider b/grails-data-mongodb/core/src/main/resources/META-INF/services/org.grails.compiler.gorm.GormEntityTraitProvider similarity index 100% rename from grails-data-mongodb/gorm/src/main/resources/META-INF/services/org.grails.compiler.gorm.GormEntityTraitProvider rename to grails-data-mongodb/core/src/main/resources/META-INF/services/org.grails.compiler.gorm.GormEntityTraitProvider diff --git a/grails-data-mongodb/gorm/src/test/groovy/grails/gorm/tests/DirtyCheckEmbeddedCollectionSpec.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/DirtyCheckEmbeddedCollectionSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/grails/gorm/tests/DirtyCheckEmbeddedCollectionSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/DirtyCheckEmbeddedCollectionSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/grails/gorm/tests/Face.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Face.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/grails/gorm/tests/Face.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Face.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/grails/gorm/tests/FindNativeSpec.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/FindNativeSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/grails/gorm/tests/FindNativeSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/FindNativeSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/grails/gorm/tests/GormDatastoreSpec.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/GormDatastoreSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/grails/gorm/tests/GormDatastoreSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/GormDatastoreSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/grails/gorm/tests/Nose.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Nose.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/grails/gorm/tests/Nose.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Nose.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/grails/gorm/tests/Person.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Person.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/grails/gorm/tests/Person.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Person.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/grails/gorm/tests/Pet.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Pet.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/grails/gorm/tests/Pet.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Pet.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/grails/gorm/tests/Plant.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Plant.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/grails/gorm/tests/Plant.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Plant.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/grails/gorm/tests/listener/PersistenceEventListenerSpec.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/listener/PersistenceEventListenerSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/grails/gorm/tests/listener/PersistenceEventListenerSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/listener/PersistenceEventListenerSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/grails/mongodb/bootstrap/EventsSetupSpec.groovy b/grails-data-mongodb/core/src/test/groovy/grails/mongodb/bootstrap/EventsSetupSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/grails/mongodb/bootstrap/EventsSetupSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/mongodb/bootstrap/EventsSetupSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/grails/mongodb/bootstrap/FailOnErrorSetupSpec.groovy b/grails-data-mongodb/core/src/test/groovy/grails/mongodb/bootstrap/FailOnErrorSetupSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/grails/mongodb/bootstrap/FailOnErrorSetupSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/mongodb/bootstrap/FailOnErrorSetupSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/grails/mongodb/bootstrap/MongoDbDataStoreSpringInitializerSpec.groovy b/grails-data-mongodb/core/src/test/groovy/grails/mongodb/bootstrap/MongoDbDataStoreSpringInitializerSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/grails/mongodb/bootstrap/MongoDbDataStoreSpringInitializerSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/mongodb/bootstrap/MongoDbDataStoreSpringInitializerSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/grails/mongodb/cascade/MongoCascadeSpec.groovy b/grails-data-mongodb/core/src/test/groovy/grails/mongodb/cascade/MongoCascadeSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/grails/mongodb/cascade/MongoCascadeSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/mongodb/cascade/MongoCascadeSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/grails/mongodb/cascade/Product.groovy b/grails-data-mongodb/core/src/test/groovy/grails/mongodb/cascade/Product.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/grails/mongodb/cascade/Product.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/mongodb/cascade/Product.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/grails/mongodb/cascade/ProductLine.groovy b/grails-data-mongodb/core/src/test/groovy/grails/mongodb/cascade/ProductLine.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/grails/mongodb/cascade/ProductLine.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/mongodb/cascade/ProductLine.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/Setup.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/Setup.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/Setup.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/Setup.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/AggregateMethodSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/AggregateMethodSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/AggregateMethodSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/AggregateMethodSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/AssignedIdentifierSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/AssignedIdentifierSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/AssignedIdentifierSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/AssignedIdentifierSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/AutowireServicesSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/AutowireServicesSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/AutowireServicesSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/AutowireServicesSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/BasicArraySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BasicArraySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/BasicArraySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BasicArraySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/BasicCollectionTypeSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BasicCollectionTypeSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/BasicCollectionTypeSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BasicCollectionTypeSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/BasicCollectionsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BasicCollectionsSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/BasicCollectionsSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BasicCollectionsSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/BatchUpdateDeleteSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BatchUpdateDeleteSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/BatchUpdateDeleteSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BatchUpdateDeleteSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/BeforeInsertUpdateSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BeforeInsertUpdateSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/BeforeInsertUpdateSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BeforeInsertUpdateSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/BigDecimalSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BigDecimalSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/BigDecimalSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BigDecimalSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/BrokenManyToManyAssociationSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BrokenManyToManyAssociationSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/BrokenManyToManyAssociationSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BrokenManyToManyAssociationSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteOneToOneSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteOneToOneSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteOneToOneSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteOneToOneSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CircularBidirectionalOneToManySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CircularBidirectionalOneToManySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CircularBidirectionalOneToManySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CircularBidirectionalOneToManySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CircularEmbeddedListSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CircularEmbeddedListSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CircularEmbeddedListSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CircularEmbeddedListSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CircularOneToManySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CircularOneToManySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CircularOneToManySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CircularOneToManySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/ClearCollectionSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ClearCollectionSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/ClearCollectionSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ClearCollectionSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CountMethodSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CountMethodSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CountMethodSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CountMethodSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CustomCodecSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomCodecSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CustomCodecSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomCodecSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CustomCollectionAndAttributeMappingSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomCollectionAndAttributeMappingSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CustomCollectionAndAttributeMappingSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomCollectionAndAttributeMappingSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CustomIdProxySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomIdProxySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CustomIdProxySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomIdProxySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CustomMongoEventListenerSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomMongoEventListenerSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CustomMongoEventListenerSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomMongoEventListenerSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CustomTypeMarshallingSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomTypeMarshallingSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/CustomTypeMarshallingSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomTypeMarshallingSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/DBObjectConversionSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DBObjectConversionSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/DBObjectConversionSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DBObjectConversionSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/DbRefWithEmbeddedSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DbRefWithEmbeddedSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/DbRefWithEmbeddedSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DbRefWithEmbeddedSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/DefaultSortOrderSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DefaultSortOrderSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/DefaultSortOrderSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DefaultSortOrderSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/DirtyCheckUpdateSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DirtyCheckUpdateSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/DirtyCheckUpdateSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DirtyCheckUpdateSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/DisableVersionSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DisableVersionSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/DisableVersionSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DisableVersionSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/DisjunctionQuerySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DisjunctionQuerySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/DisjunctionQuerySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DisjunctionQuerySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/DistinctPropertySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DistinctPropertySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/DistinctPropertySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DistinctPropertySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/DocumentMappingSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DocumentMappingSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/DocumentMappingSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DocumentMappingSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedAssociationSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedAssociationSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedAssociationSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedAssociationSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedBiDirectionalSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedBiDirectionalSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedBiDirectionalSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedBiDirectionalSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionAndInheritanceSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionAndInheritanceSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionAndInheritanceSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionAndInheritanceSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionWithIdSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionWithIdSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionWithIdSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionWithIdSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionWithOneToOneSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionWithOneToOneSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionWithOneToOneSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionWithOneToOneSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedHasManyWithBeforeUpdateSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedHasManyWithBeforeUpdateSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedHasManyWithBeforeUpdateSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedHasManyWithBeforeUpdateSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedListWithCustomTypeSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedListWithCustomTypeSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedListWithCustomTypeSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedListWithCustomTypeSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedMapSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedMapSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedMapSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedMapSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedSetAssignedIdSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedSetAssignedIdSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedSetAssignedIdSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedSetAssignedIdSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedSimpleObjectSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedSimpleObjectSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedSimpleObjectSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedSimpleObjectSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedStringListInsideEmbeddedCollectionSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedStringListInsideEmbeddedCollectionSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedStringListInsideEmbeddedCollectionSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedStringListInsideEmbeddedCollectionSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedUnsetSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedUnsetSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedUnsetSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedUnsetSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWhereClauseSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWhereClauseSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWhereClauseSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWhereClauseSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithCustomFieldMappingSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithCustomFieldMappingSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithCustomFieldMappingSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithCustomFieldMappingSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithIdSpecifiedSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithIdSpecifiedSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithIdSpecifiedSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithIdSpecifiedSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithNonEmbeddedAssociationsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithNonEmbeddedAssociationsSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithNonEmbeddedAssociationsSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithNonEmbeddedAssociationsSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithNonEmbeddedCollectionsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithNonEmbeddedCollectionsSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithNonEmbeddedCollectionsSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithNonEmbeddedCollectionsSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithinEmbeddedAssociationSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithinEmbeddedAssociationSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithinEmbeddedAssociationSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithinEmbeddedAssociationSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EnumCollectionSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EnumCollectionSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EnumCollectionSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EnumCollectionSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EnumTypeSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EnumTypeSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EnumTypeSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EnumTypeSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EventsWithAbstractInheritanceSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EventsWithAbstractInheritanceSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/EventsWithAbstractInheritanceSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EventsWithAbstractInheritanceSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/FindOrCreateWhereSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/FindOrCreateWhereSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/FindOrCreateWhereSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/FindOrCreateWhereSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/GeoJSONTypePersistenceSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GeoJSONTypePersistenceSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/GeoJSONTypePersistenceSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GeoJSONTypePersistenceSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/GeospacialQuerySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GeospacialQuerySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/GeospacialQuerySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GeospacialQuerySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllWithStringIdSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllWithStringIdSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllWithStringIdSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllWithStringIdSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/GreaterThanAndLessThanCriteriaSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GreaterThanAndLessThanCriteriaSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/GreaterThanAndLessThanCriteriaSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GreaterThanAndLessThanCriteriaSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/HasOneSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/HasOneSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/HasOneSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/HasOneSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/HintQueryArgumentSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/HintQueryArgumentSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/HintQueryArgumentSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/HintQueryArgumentSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/InListQuerySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InListQuerySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/InListQuerySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InListQuerySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/IndexAttributesAndCompoundKeySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/IndexAttributesAndCompoundKeySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/IndexAttributesAndCompoundKeySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/IndexAttributesAndCompoundKeySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/IndexWithInheritanceSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/IndexWithInheritanceSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/IndexWithInheritanceSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/IndexWithInheritanceSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/InheritanceQueryingSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InheritanceQueryingSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/InheritanceQueryingSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InheritanceQueryingSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/InheritanceWithSingleEndedAssociationSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InheritanceWithSingleEndedAssociationSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/InheritanceWithSingleEndedAssociationSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InheritanceWithSingleEndedAssociationSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/InnerEnumSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InnerEnumSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/InnerEnumSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InnerEnumSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/IsNullSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/IsNullSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/IsNullSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/IsNullSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/JakartaValidationSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/JakartaValidationSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/JakartaValidationSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/JakartaValidationSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/LastUpdatedSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/LastUpdatedSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/LastUpdatedSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/LastUpdatedSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/LikeQuerySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/LikeQuerySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/LikeQuerySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/LikeQuerySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/ListOneToManyOrderingSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ListOneToManyOrderingSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/ListOneToManyOrderingSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ListOneToManyOrderingSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/MapOfDomainsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MapOfDomainsSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/MapOfDomainsSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MapOfDomainsSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/MarkDirtyFalseSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MarkDirtyFalseSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/MarkDirtyFalseSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MarkDirtyFalseSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/MongoDynamicPropertyOnEmbeddedSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoDynamicPropertyOnEmbeddedSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/MongoDynamicPropertyOnEmbeddedSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoDynamicPropertyOnEmbeddedSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/MongoEntityConfigSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoEntityConfigSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/MongoEntityConfigSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoEntityConfigSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/MongoGormEnhancerSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoGormEnhancerSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/MongoGormEnhancerSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoGormEnhancerSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/MongoResultsListIndexSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoResultsListIndexSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/MongoResultsListIndexSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoResultsListIndexSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/MongoTypesSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoTypesSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/MongoTypesSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoTypesSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/MultipleConnectionsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MultipleConnectionsSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/MultipleConnectionsSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MultipleConnectionsSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/MultiplePropertySetterSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MultiplePropertySetterSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/MultiplePropertySetterSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MultiplePropertySetterSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/NegateInListSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NegateInListSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/NegateInListSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NegateInListSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/NegationEnumSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NegationEnumSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/NegationEnumSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NegationEnumSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/NullifyPropertySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NullifyPropertySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/NullifyPropertySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NullifyPropertySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/NullsAreNotStoredSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NullsAreNotStoredSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/NullsAreNotStoredSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NullsAreNotStoredSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/ObjectIdPersistenceSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ObjectIdPersistenceSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/ObjectIdPersistenceSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ObjectIdPersistenceSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/ObjectIdPropertySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ObjectIdPropertySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/ObjectIdPropertySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ObjectIdPropertySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/OneToManyWithInheritanceSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToManyWithInheritanceSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/OneToManyWithInheritanceSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToManyWithInheritanceSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneIntegritySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneIntegritySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneIntegritySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneIntegritySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneNoReferenceSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneNoReferenceSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneNoReferenceSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneNoReferenceSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/OptimisticLockingWithExceptionSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OptimisticLockingWithExceptionSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/OptimisticLockingWithExceptionSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OptimisticLockingWithExceptionSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/OrderWithPaginationSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OrderWithPaginationSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/OrderWithPaginationSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OrderWithPaginationSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/ProjectionsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ProjectionsSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/ProjectionsSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ProjectionsSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/QueriesWithIdenticallyNamedPartsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/QueriesWithIdenticallyNamedPartsSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/QueriesWithIdenticallyNamedPartsSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/QueriesWithIdenticallyNamedPartsSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/ReadConcernArgumentSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ReadConcernArgumentSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/ReadConcernArgumentSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ReadConcernArgumentSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/ReadManyObjectsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ReadManyObjectsSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/ReadManyObjectsSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ReadManyObjectsSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/ResultsWithGroovyCollectionMethodsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ResultsWithGroovyCollectionMethodsSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/ResultsWithGroovyCollectionMethodsSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ResultsWithGroovyCollectionMethodsSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/SchemalessSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SchemalessSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/SchemalessSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SchemalessSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/SessionCachingSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SessionCachingSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/SessionCachingSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SessionCachingSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/SetRetrievalSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SetRetrievalSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/SetRetrievalSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SetRetrievalSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/SimpleHasManySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SimpleHasManySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/SimpleHasManySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SimpleHasManySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/StatelessSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/StatelessSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/StatelessSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/StatelessSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/SwitchDatabaseAtRuntimeSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SwitchDatabaseAtRuntimeSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/SwitchDatabaseAtRuntimeSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SwitchDatabaseAtRuntimeSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/TestSearchSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/TestSearchSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/TestSearchSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/TestSearchSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/TransientPropertySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/TransientPropertySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/TransientPropertySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/TransientPropertySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/WhereQueryInCriteriaSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/WhereQueryInCriteriaSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/WhereQueryInCriteriaSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/WhereQueryInCriteriaSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/WriteConcernSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/WriteConcernSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/WriteConcernSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/WriteConcernSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/bugs/GPMongoDB295Spec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/bugs/GPMongoDB295Spec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/bugs/GPMongoDB295Spec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/bugs/GPMongoDB295Spec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/connections/MongoConnectionSourcesSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/connections/MongoConnectionSourcesSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/connections/MongoConnectionSourcesSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/connections/MongoConnectionSourcesSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/connections/MultiTenancySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/connections/MultiTenancySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/connections/MultiTenancySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/connections/MultiTenancySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/connections/MultipleDataSourceConnectionsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/connections/MultipleDataSourceConnectionsSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/connections/MultipleDataSourceConnectionsSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/connections/MultipleDataSourceConnectionsSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/connections/SchemaBasedMultiTenancySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/connections/SchemaBasedMultiTenancySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/connections/SchemaBasedMultiTenancySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/connections/SchemaBasedMultiTenancySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/connections/SingleTenancySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/connections/SingleTenancySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/connections/SingleTenancySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/connections/SingleTenancySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/java/MongoResultListJavaForEachTest.java b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/java/MongoResultListJavaForEachTest.java similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/java/MongoResultListJavaForEachTest.java rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/java/MongoResultListJavaForEachTest.java diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/multitenancy/MongoStaticApiMultiTenancySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/multitenancy/MongoStaticApiMultiTenancySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/gorm/mongo/multitenancy/MongoStaticApiMultiTenancySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/multitenancy/MongoStaticApiMultiTenancySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/mapping/mongo/AbstractMongoTest.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/mapping/mongo/AbstractMongoTest.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/mapping/mongo/AbstractMongoTest.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/mapping/mongo/AbstractMongoTest.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/mapping/mongo/config/MongoClientOptionsBuilderSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/mapping/mongo/config/MongoClientOptionsBuilderSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/mapping/mongo/config/MongoClientOptionsBuilderSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/mapping/mongo/config/MongoClientOptionsBuilderSpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/mapping/mongo/config/MongoConnectionSourceFactorySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/mapping/mongo/config/MongoConnectionSourceFactorySpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/mapping/mongo/config/MongoConnectionSourceFactorySpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/mapping/mongo/config/MongoConnectionSourceFactorySpec.groovy diff --git a/grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/mapping/mongo/config/MongoConnectionSourceSettingsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/mapping/mongo/config/MongoConnectionSourceSettingsSpec.groovy similarity index 100% rename from grails-data-mongodb/gorm/src/test/groovy/org/grails/datastore/mapping/mongo/config/MongoConnectionSourceSettingsSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/org/grails/datastore/mapping/mongo/config/MongoConnectionSourceSettingsSpec.groovy diff --git a/grails-data-mongodb/docs/build.gradle b/grails-data-mongodb/docs/build.gradle index 32c521c8433..c88816f460f 100644 --- a/grails-data-mongodb/docs/build.gradle +++ b/grails-data-mongodb/docs/build.gradle @@ -36,14 +36,14 @@ tasks.register('resolveMongodbVersion') { dependencies { - documentation platform("org.grails:grails-bom:$grailsVersion") + documentation platform("org.apache.grails:grails-bom:$grailsVersion") documentation 'org.fusesource.jansi:jansi' documentation 'org.apache.groovy:groovy' documentation 'org.apache.groovy:groovy-templates' documentation 'org.apache.groovy:groovy-dateutil' documentation 'com.github.javaparser:javaparser-core' coreProjects.each { - documentation "org.grails:$it" + documentation "org.apache.grails:$it" } rootProject.subprojects .findAll { it.findProperty('apiDocs') } @@ -51,7 +51,7 @@ dependencies { // These are added to be able to resolve the mongo version from grails-bom // in the resolveMongodbVersion task - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation 'org.mongodb:mongodb-driver-sync' } diff --git a/grails-data-mongodb/docs/src/docs/asciidoc/gettingStarted/springBoot.adoc b/grails-data-mongodb/docs/src/docs/asciidoc/gettingStarted/springBoot.adoc index 28616e9175a..3576ef92092 100644 --- a/grails-data-mongodb/docs/src/docs/asciidoc/gettingStarted/springBoot.adoc +++ b/grails-data-mongodb/docs/src/docs/asciidoc/gettingStarted/springBoot.adoc @@ -3,7 +3,7 @@ To use GORM for MongoDB in Spring Boot add the necessary dependencies to your Bo [source,groovy,subs="attributes"] ---- -compile("org.grails:gorm-mongodb-spring-boot:{version}") +compile("org.apache.grails:grails-data-mongodb-spring-boot:{version}") ---- Ensure your Boot `Application` class is annotated with `ComponentScan`, example: diff --git a/grails-data-mongodb/examples/base/build.gradle b/grails-data-mongodb/examples/base/build.gradle index 72e649b4a7e..2b7b9c209a1 100644 --- a/grails-data-mongodb/examples/base/build.gradle +++ b/grails-data-mongodb/examples/base/build.gradle @@ -2,22 +2,30 @@ version = projectVersion group = 'examples' apply plugin: 'groovy' -apply plugin: 'org.grails.grails-web' +apply plugin: 'org.apache.grails.gradle.grails-web' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") + integrationTestImplementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':mongodb-grails-plugin') - implementation 'org.grails:grails-core' - implementation 'org.grails:grails-plugin-rest' - implementation 'org.grails:grails-web-boot' + implementation 'org.apache.grails:grails-core', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } + implementation 'org.apache.grails:grails-rest-transforms', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } + implementation 'org.apache.grails.web:grails-web-boot' implementation 'org.grails.plugins:gsp' runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails' runtimeOnly 'org.fusesource.jansi:jansi' - runtimeOnly 'org.grails:grails-plugin-i18n' - runtimeOnly 'org.grails:grails-plugin-url-mappings' + runtimeOnly 'org.apache.grails:grails-i18n' + runtimeOnly 'org.apache.grails:grails-url-mappings' runtimeOnly 'org.grails.plugins:scaffolding' runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure' runtimeOnly 'org.springframework.boot:spring-boot-starter-logging' @@ -27,7 +35,7 @@ dependencies { testImplementation 'org.spockframework:spock-core' testImplementation "org.testcontainers:mongodb:$testcontainersMongodbVersion" - integrationTestImplementation testFixtures('org.grails.plugins:geb') + integrationTestImplementation testFixtures('org.apache.grails:grails-geb') } apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle') diff --git a/grails-data-mongodb/examples/database-per-tenant/build.gradle b/grails-data-mongodb/examples/database-per-tenant/build.gradle index f203e7655a4..769f7df8dc6 100644 --- a/grails-data-mongodb/examples/database-per-tenant/build.gradle +++ b/grails-data-mongodb/examples/database-per-tenant/build.gradle @@ -2,27 +2,34 @@ version = projectVersion group = 'examples' apply plugin: 'groovy' -apply plugin: 'org.grails.grails-web' +apply plugin: 'org.apache.grails.gradle.grails-web' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':mongodb-grails-plugin') - implementation 'org.grails:grails-core' - implementation 'org.grails:grails-plugin-rest' - implementation 'org.grails:grails-web-boot' + implementation 'org.apache.grails:grails-core', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } + implementation 'org.apache.grails:grails-rest-transforms', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } + implementation 'org.apache.grails.web:grails-web-boot' implementation 'org.grails.plugins:gsp' runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails' runtimeOnly 'org.fusesource.jansi:jansi' - runtimeOnly 'org.grails:grails-plugin-i18n' - runtimeOnly 'org.grails:grails-plugin-url-mappings' + runtimeOnly 'org.apache.grails:grails-i18n' + runtimeOnly 'org.apache.grails:grails-url-mappings' runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure' runtimeOnly 'org.springframework.boot:spring-boot-starter-logging' runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat' - testImplementation 'org.grails:grails-testing-support' + testImplementation 'org.apache.grails.testing:grails-testing-support-core' testImplementation 'org.spockframework:spock-core' } diff --git a/grails-data-mongodb/examples/gson-templates/build.gradle b/grails-data-mongodb/examples/gson-templates/build.gradle index 2a8433d0fa9..cc1e1bd186b 100644 --- a/grails-data-mongodb/examples/gson-templates/build.gradle +++ b/grails-data-mongodb/examples/gson-templates/build.gradle @@ -2,29 +2,53 @@ version = projectVersion group = 'examples' apply plugin: 'groovy' -apply plugin: 'org.grails.grails-web' +apply plugin: 'org.apache.grails.gradle.grails-web' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") - implementation 'org.grails:grails-core' - implementation 'org.grails:grails-web-boot' - implementation 'org.grails.plugins:views-json' + implementation 'org.apache.grails:grails-core', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } + implementation 'org.apache.grails.web:grails-web-boot' + implementation 'org.grails.plugins:views-json', { + exclude group: 'org.grails', module: 'grails-plugin-rest' // TODO: remove when views published + exclude group: 'org.grails', module: 'grails-plugin-mimetypes' // TODO: remove when views published + exclude group: 'org.grails', module: 'grails-web-url-mappings' // TODO: remove when views published + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + } + implementation 'org.apache.grails:grails-mimetypes', { // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } + implementation 'org.apache.grails.web:grails-web-url-mappings', { // TODO: Remove views published + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } implementation 'org.grails.plugins:views-markup' implementation 'org.grails.plugins:gsp' - implementation 'org.grails:grails-plugin-databinding' - implementation 'org.grails:grails-plugin-rest' - implementation 'org.grails:grails-plugin-url-mappings' - implementation project(':mongodb-gorm') + implementation 'org.apache.grails:grails-databinding' + implementation 'org.apache.grails:grails-rest-transforms', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } + implementation 'org.apache.grails:grails-url-mappings' + implementation project(':mongodb-core') runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure' runtimeOnly 'org.springframework.boot:spring-boot-starter-logging' runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat' - runtimeOnly project(':mongodb-views-json-templates') + runtimeOnly project(':mongodb-gson-templates') runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails' - integrationTestImplementation 'org.grails:grails-testing-support' + integrationTestImplementation 'org.apache.grails.testing:grails-testing-support-core' } apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle') diff --git a/grails-data-mongodb/examples/hibernate5/build.gradle b/grails-data-mongodb/examples/hibernate5/build.gradle index 57f621343ef..57201152369 100644 --- a/grails-data-mongodb/examples/hibernate5/build.gradle +++ b/grails-data-mongodb/examples/hibernate5/build.gradle @@ -2,16 +2,24 @@ version = projectVersion group = 'examples' apply plugin: 'groovy' -apply plugin: 'org.grails.grails-web' +apply plugin: 'org.apache.grails.gradle.grails-web' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") + integrationTestImplementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':mongodb-grails-plugin') - implementation 'org.grails:grails-core' - implementation 'org.grails:grails-plugin-rest' - implementation 'org.grails:grails-web-boot' + implementation 'org.apache.grails:grails-core', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } + implementation 'org.apache.grails:grails-rest-transforms', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } + implementation 'org.apache.grails.web:grails-web-boot' implementation 'org.grails.plugins:gsp' implementation project(':hibernate5-grails-plugin') @@ -20,8 +28,8 @@ dependencies { runtimeOnly 'com.zaxxer:HikariCP' runtimeOnly 'org.fusesource.jansi:jansi' runtimeOnly 'org.grails.plugins:scaffolding' - runtimeOnly 'org.grails:grails-plugin-i18n' - runtimeOnly 'org.grails:grails-plugin-url-mappings' + runtimeOnly 'org.apache.grails:grails-i18n' + runtimeOnly 'org.apache.grails:grails-url-mappings' runtimeOnly "org.hibernate:hibernate-ehcache:$hibernateVersion", { // exclude javax variant of hibernate-core exclude group: "org.hibernate", module: "hibernate-core" @@ -34,11 +42,11 @@ dependencies { runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat' testImplementation testFixtures(project(':mongodb-grails-plugin')) - testImplementation 'org.grails:grails-testing-support' + testImplementation 'org.apache.grails.testing:grails-testing-support-core' testImplementation 'org.spockframework:spock-core' testImplementation "org.testcontainers:mongodb:$testcontainersMongodbVersion" - integrationTestImplementation testFixtures('org.grails.plugins:geb') + integrationTestImplementation testFixtures('org.apache.grails:grails-geb') } apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle') diff --git a/grails-data-mongodb/examples/springboot/build.gradle b/grails-data-mongodb/examples/springboot/build.gradle index a729cce2690..8a401174df2 100644 --- a/grails-data-mongodb/examples/springboot/build.gradle +++ b/grails-data-mongodb/examples/springboot/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'org.springframework.boot' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':mongodb-boot-plugin') implementation 'org.apache.groovy:groovy' diff --git a/grails-data-mongodb/examples/test-data-service/build.gradle b/grails-data-mongodb/examples/test-data-service/build.gradle index 0582af08bd4..f731d03dbc7 100644 --- a/grails-data-mongodb/examples/test-data-service/build.gradle +++ b/grails-data-mongodb/examples/test-data-service/build.gradle @@ -2,30 +2,76 @@ version = projectVersion group = 'examples' apply plugin: 'groovy' -apply plugin: 'org.grails.grails-web' +apply plugin: 'org.apache.grails.gradle.grails-web' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':mongodb-grails-plugin') - implementation 'org.grails:grails-core' - implementation 'org.grails:grails-plugin-rest' - implementation 'org.grails:grails-plugin-services' - implementation 'org.grails:grails-web-boot' - implementation "org.grails.plugins:spring-security-core:$grailsSpringSecurityVersion" - implementation "org.grails.plugins:spring-security-rest:$grailsSpringSecurityVersion" - implementation 'org.grails.plugins:views-json' - - runtimeOnly 'org.grails:grails-plugin-i18n' - runtimeOnly 'org.grails:grails-plugin-url-mappings' - runtimeOnly 'org.grails.plugins:events' + implementation 'org.apache.grails:grails-core', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } + implementation 'org.apache.grails:grails-rest-transforms', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } + implementation 'org.apache.grails:grails-services' + implementation 'org.apache.grails.web:grails-web-boot' + implementation "org.grails.plugins:spring-security-core:$grailsSpringSecurityVersion", { + exclude group: 'org.grails.plugins', module: 'async' // TODO: remove when spring security is updated + exclude group: 'org.grails', module: 'grails-web-common' // TODO: remove when spring security is updated + exclude group: 'org.grails', module: 'grails-web-url-mappings' // TODO: remove when spring security is updated + exclude group: 'org.grails', module: 'grails-events-transform' // TODO: remove when spring security is updated + exclude group: 'org.grails', module: 'grails-plugin-mimetypes' // TODO: remove when spring security is updated + } + implementation 'org.apache.grails.events:grails-events-transforms' // TODO: Remove when spring security is updated + implementation 'org.apache.grails:grails-async' // TODO: Remove when spring security is updated + implementation 'org.apache.grails.web:grails-web-common' // TODO: Remove when spring security is updated + implementation 'org.apache.grails:grails-mimetypes', { // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } + implementation 'org.apache.grails.web:grails-web-url-mappings', { // TODO: Remove spring security is published published + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when gorm published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when gorm published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when gorm published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when gorm published + } + + implementation "org.grails.plugins:spring-security-rest:$grailsSpringSecurityVersion", { + exclude group: 'org.grails.plugins', module: 'async' // TODO: remove when spring security is updated + exclude group: 'org.grails', module: 'grails-web-common' // TODO: remove when spring security is updated + exclude group: 'org.grails', module: 'grails-web-url-mappings' // TODO: remove when spring security is updated + exclude group: 'org.grails', module: 'grails-events-transform' // TODO: remove when spring security is updated + exclude group: 'org.grails', module: 'grails-plugin-mimetypes' // TODO: remove when spring security is updated + } + implementation 'org.grails.plugins:views-json', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-plugin-rest' // TODO: remove when views published + exclude group: 'org.grails', module: 'grails-plugin-mimetypes' // TODO: remove when views published + exclude group: 'org.grails', module: 'grails-web-url-mappings' // TODO: remove when views published + } + implementation 'org.apache.grails:grails-rest-transforms', { // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } + + runtimeOnly 'org.apache.grails:grails-i18n' + runtimeOnly 'org.apache.grails:grails-url-mappings' + runtimeOnly 'org.apache.grails:grails-events' runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure' runtimeOnly 'org.springframework.boot:spring-boot-starter-logging' runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat' - integrationTestImplementation 'org.grails:grails-gorm-testing-support' + integrationTestImplementation project(':grails-testing-support-datamapping') integrationTestImplementation 'org.spockframework:spock-core' } diff --git a/grails-data-mongodb/gorm-ext/build.gradle b/grails-data-mongodb/ext/build.gradle similarity index 73% rename from grails-data-mongodb/gorm-ext/build.gradle rename to grails-data-mongodb/ext/build.gradle index 602e64d6494..4d8d4c5de94 100644 --- a/grails-data-mongodb/gorm-ext/build.gradle +++ b/grails-data-mongodb/ext/build.gradle @@ -4,12 +4,11 @@ plugins { } version = projectVersion -group = 'org.grails' +group = 'org.apache.grails.data' ext { apiDocs = true - snapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local' - pomArtifactId = 'grails-datastore-gorm-mongodb-ext' + pomArtifactId = 'grails-data-mongodb-ext' pomTitle = 'GORM for MongoDB' pomDescription = 'Provides a GORM Object Mapping implementations for the MongoDB Document Database' pomDevelopers = [ @@ -21,7 +20,7 @@ ext { dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") api 'org.mongodb:bson', { // api: Document, ObjectId @@ -32,15 +31,15 @@ dependencies { // impl: BasicDBObject } - implementation project(':mongodb-gorm'), { + implementation project(':mongodb-core'), { // impl: AbstractMongoObectEntityPersister, AbstractMongoSession, MongoConstants, MongoEntityPersister, // MongoQuery if (excludeUnusedTransDeps) { // API dependencies in grails-datastore-gorm-mongodb - //exclude group: 'org.grails', module: 'grails-datastore-core' // NativeEntryEntityPersister - exclude group: 'org.grails', module: 'grails-datastore-gorm' - exclude group: 'org.grails', module: 'grails-datastore-gorm-bson' - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' + //exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' // NativeEntryEntityPersister + exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm' + exclude group: 'org.apache.grails.data', module: 'grails-data-mongodb-bson' + exclude group: 'org.apache.grails.data', module: 'grails-datamapping-support' //exclude group: 'org.mongodb', module: 'bson' // Document exclude group: 'org.mongodb', module: 'mongodb-driver-core' //exclude group: 'org.mongodb', module: 'mongodb-driver-sync' // FindIterable @@ -53,9 +52,9 @@ dependencies { // API dependencies in grails-datastore-gorm exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' //exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' // Entity - exclude group: 'org.grails', module: 'grails-core' - exclude group: 'org.grails', module: 'grails-datastore-core' - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' + exclude group: 'org.apache.grails', module: 'grails-core' + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + exclude group: 'org.apache.grails.data', module: 'grails-datamapping-validation' //exclude group: 'org.springframework', module: 'spring-context' // ApplicationEventPublisher exclude group: 'org.springframework', module: 'spring-jdbc' //exclude group: 'org.springframework', module: 'spring-tx' // PlatformTransactionManager diff --git a/grails-data-mongodb/gorm-ext/src/main/groovy/org/grails/datastore/gorm/mongo/extensions/MongoExtensions.groovy b/grails-data-mongodb/ext/src/main/groovy/org/grails/datastore/gorm/mongo/extensions/MongoExtensions.groovy similarity index 100% rename from grails-data-mongodb/gorm-ext/src/main/groovy/org/grails/datastore/gorm/mongo/extensions/MongoExtensions.groovy rename to grails-data-mongodb/ext/src/main/groovy/org/grails/datastore/gorm/mongo/extensions/MongoExtensions.groovy diff --git a/grails-data-mongodb/gorm-ext/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/grails-data-mongodb/ext/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule similarity index 100% rename from grails-data-mongodb/gorm-ext/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule rename to grails-data-mongodb/ext/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule diff --git a/grails-data-mongodb/grails-plugin/build.gradle b/grails-data-mongodb/grails-plugin/build.gradle index 5dc51f0ad51..0ea2b14eebc 100644 --- a/grails-data-mongodb/grails-plugin/build.gradle +++ b/grails-data-mongodb/grails-plugin/build.gradle @@ -5,14 +5,13 @@ plugins { } version = projectVersion -group = 'org.grails.plugins' +group = 'org.apache.grails' -apply plugin: 'org.grails.grails-plugin' +apply plugin: 'org.apache.grails.gradle.grails-plugin' ext { apiDocs = true - snapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local' - pomArtifactId = 'mongodb' + pomArtifactId = 'grails-data-mongodb' pomTitle = 'GORM for MongoDB' pomDescription = 'Provides a GORM Object Mapping implementations for the MongoDB Document Database' pomDevelopers = [ @@ -24,17 +23,18 @@ ext { dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") + testFixturesCompileOnly platform("org.apache.grails:grails-bom:$grailsVersion") - api project(':mongodb-gorm'), { + api project(':mongodb-core'), { // api: needed as classes should also be available when compiling apps. eg. MongoEntity // impl: MongoDatastore, MongoDbDataStoreSpringInitializer if (excludeUnusedTransDeps) { // API dependencies in grails-datastore-gorm-mongodb - //exclude group: 'org.grails', module: 'grails-datastore-gorm-bson' // Needed at runtime downstream (BsonPersistentEntityCodec) - exclude group: 'org.grails', module: 'grails-datastore-core' - exclude group: 'org.grails', module: 'grails-datastore-gorm' - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' + //exclude group: 'org.apache.grails.data', module: 'grails-data-mongodb-bson' // Needed at runtime downstream (BsonPersistentEntityCodec) + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm' + exclude group: 'org.apache.grails.data', module: 'grails-datamapping-support' //exclude group: 'org.mongodb', module: 'bson' // Needed downstream for compiling MongoEntity //exclude group: 'org.mongodb', module: 'mongodb-driver-core' // MongoClientSettings //exclude group: 'org.mongodb', module: 'mongodb-driver-sync' // MongoClient @@ -42,13 +42,13 @@ dependencies { } } - implementation project(':grails-datastore-gorm-support'), { + implementation project(':grails-datamapping-support'), { // impl: ConfigSupport if (excludeUnusedTransDeps) { - // API dependencies in grails-datastore-gorm-support - exclude group: 'org.grails', module: 'grails-datastore-core' - //exclude group: 'org.grails', module: 'grails-datastore-gorm' // AbstractDatastorePersistenceContextInterceptor - exclude group: 'org.grails', module: 'grails-core' + // API dependencies in grails-datamapping-support + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + //exclude group: 'org.apache.grails.data, module: 'grails-datastore-gorm' // AbstractDatastorePersistenceContextInterceptor + exclude group: 'org.apache.grails', module: 'grails-core' exclude group: 'org.springframework', module: 'spring-context' exclude group: 'org.springframework', module: 'spring-core' } @@ -67,20 +67,20 @@ dependencies { } compileOnly 'org.apache.groovy:groovy' // Provided as this is a Grails plugin - compileOnly 'org.grails:grails-core', { // Provided as this is a Grails plugin + compileOnly 'org.apache.grails:grails-core', { // Provided as this is a Grails plugin // api: GrailsPlugin // impl: DomainClassArtefactHandler, GrailsClass, GrailsPlugin, Metadata } - runtimeOnly project(':mongodb-gorm-ext'), { + runtimeOnly project(':mongodb-ext'), { // Include MongoDB groovy extensions for applications } - testFixturesApi 'org.grails:grails-core', { + testFixturesApi 'org.apache.grails:grails-core', { // api: Config // impl: PropertySourcesConfig } - testFixturesApi project(':mongodb-gorm'), { + testFixturesApi project(':mongodb-core'), { // api: MongoDatastore } testFixturesApi 'org.mongodb:mongodb-driver-sync', { diff --git a/grails-data-mongodb/gson-templates/build.gradle b/grails-data-mongodb/gson-templates/build.gradle new file mode 100644 index 00000000000..cdb8967b6b8 --- /dev/null +++ b/grails-data-mongodb/gson-templates/build.gradle @@ -0,0 +1,85 @@ +plugins { + id 'groovy' + id 'java-library' +} + +version = projectVersion +group = 'org.apache.grails' + +ext { + pomArtifactId = 'grails-data-mongodb-gson-templates' + pomTitle = 'Grails MongoDB JSON Views' + pomDescription = 'Provides JSON Views for MongoDB to the Grails framework.' + pomDevelopers = ['puneetbehl': 'Puneet Behl'] +} + +dependencies { + + implementation(platform("org.apache.grails:grails-bom:$grailsVersion")) + + api 'org.grails.plugins:views-json', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-plugin-mimetypes' // TODO: Remove when views is published + exclude group: 'org.grails', module: 'grails-web-url-mappings' // TODO: Remove when views is published + exclude group: 'org.grails', module: 'grails-plugin-rest' // TODO: Remove when views is published + } + + // TODO: BEGIN remove when views is published + api 'org.apache.grails:grails-mimetypes', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } + api 'org.apache.grails.web:grails-web-url-mappings', { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } + api 'org.apache.grails:grails-rest-transforms', { // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published + exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published + } + // TODO: END remove when views is published + + implementation project(':mongodb-core') + implementation project(':mongodb-bson') + + compileOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during compileGsonViews task +} + +def templateSourceDir = layout.projectDirectory.dir('src/templates') +def compilationOutputDir = layout.buildDirectory.dir('classes/groovy/main') +sourceSets { + main { + groovy { + // Add templates as source dir + srcDirs = [templateSourceDir] + } + } +} + +tasks.register('compileViews', JavaExec) { + inputs.dir(templateSourceDir) + outputs.dir(compilationOutputDir) + mainClass = 'grails.plugin.json.view.JsonViewCompiler' + classpath = configurations.compileClasspath + args(templateSourceDir.asFile, compilationOutputDir.get().asFile, '17', ' ', ' ', 'none', 'UTF-8') +} + +// This is needed to trigger compilation of the views +tasks.named('classes') { + dependsOn 'compileViews' +} + +// There are no javadocs for this project. +// This is a workaround as a javadoc jar is required for publishing. +tasks.register('javadocJar', Jar) { + from 'src/templates' +} + +apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle') +apply from: rootProject.layout.projectDirectory.file('gradle/publish-config.gradle') \ No newline at end of file diff --git a/grails-data-mongodb/json-templates/src/templates/grails/mongodb/geo/_geometryCollection.gson b/grails-data-mongodb/gson-templates/src/templates/grails/mongodb/geo/_geometryCollection.gson similarity index 100% rename from grails-data-mongodb/json-templates/src/templates/grails/mongodb/geo/_geometryCollection.gson rename to grails-data-mongodb/gson-templates/src/templates/grails/mongodb/geo/_geometryCollection.gson diff --git a/grails-data-mongodb/json-templates/src/templates/grails/mongodb/geo/_lineString.gson b/grails-data-mongodb/gson-templates/src/templates/grails/mongodb/geo/_lineString.gson similarity index 100% rename from grails-data-mongodb/json-templates/src/templates/grails/mongodb/geo/_lineString.gson rename to grails-data-mongodb/gson-templates/src/templates/grails/mongodb/geo/_lineString.gson diff --git a/grails-data-mongodb/json-templates/src/templates/grails/mongodb/geo/_multiLineString.gson b/grails-data-mongodb/gson-templates/src/templates/grails/mongodb/geo/_multiLineString.gson similarity index 100% rename from grails-data-mongodb/json-templates/src/templates/grails/mongodb/geo/_multiLineString.gson rename to grails-data-mongodb/gson-templates/src/templates/grails/mongodb/geo/_multiLineString.gson diff --git a/grails-data-mongodb/json-templates/src/templates/grails/mongodb/geo/_multiPoint.gson b/grails-data-mongodb/gson-templates/src/templates/grails/mongodb/geo/_multiPoint.gson similarity index 100% rename from grails-data-mongodb/json-templates/src/templates/grails/mongodb/geo/_multiPoint.gson rename to grails-data-mongodb/gson-templates/src/templates/grails/mongodb/geo/_multiPoint.gson diff --git a/grails-data-mongodb/json-templates/src/templates/grails/mongodb/geo/_multiPolygon.gson b/grails-data-mongodb/gson-templates/src/templates/grails/mongodb/geo/_multiPolygon.gson similarity index 100% rename from grails-data-mongodb/json-templates/src/templates/grails/mongodb/geo/_multiPolygon.gson rename to grails-data-mongodb/gson-templates/src/templates/grails/mongodb/geo/_multiPolygon.gson diff --git a/grails-data-mongodb/json-templates/src/templates/grails/mongodb/geo/_point.gson b/grails-data-mongodb/gson-templates/src/templates/grails/mongodb/geo/_point.gson similarity index 100% rename from grails-data-mongodb/json-templates/src/templates/grails/mongodb/geo/_point.gson rename to grails-data-mongodb/gson-templates/src/templates/grails/mongodb/geo/_point.gson diff --git a/grails-data-mongodb/json-templates/src/templates/grails/mongodb/geo/_polygon.gson b/grails-data-mongodb/gson-templates/src/templates/grails/mongodb/geo/_polygon.gson similarity index 100% rename from grails-data-mongodb/json-templates/src/templates/grails/mongodb/geo/_polygon.gson rename to grails-data-mongodb/gson-templates/src/templates/grails/mongodb/geo/_polygon.gson diff --git a/grails-data-mongodb/json-templates/src/templates/org/bson/types/_objectId.gson b/grails-data-mongodb/gson-templates/src/templates/org/bson/types/_objectId.gson similarity index 100% rename from grails-data-mongodb/json-templates/src/templates/org/bson/types/_objectId.gson rename to grails-data-mongodb/gson-templates/src/templates/org/bson/types/_objectId.gson diff --git a/grails-data-mongodb/json-templates/build.gradle b/grails-data-mongodb/json-templates/build.gradle deleted file mode 100644 index 16502119197..00000000000 --- a/grails-data-mongodb/json-templates/build.gradle +++ /dev/null @@ -1,60 +0,0 @@ -plugins { - id 'groovy' - id 'java-library' -} - -version = projectVersion -group = 'org.grails.plugins' - -ext { - pomArtifactId = 'views-json-templates' - pomTitle = 'Grails MongoDB JSON Views' - pomDescription = 'Provides JSON Views for MongoDB to the Grails framework.' - pomDevelopers = ['puneetbehl': 'Puneet Behl'] - snapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local' -} - -dependencies { - - implementation(platform("org.grails:grails-bom:$grailsVersion")) - - api 'org.grails.plugins:views-json' - - implementation project(':mongodb-gorm') - implementation project(':mongodb-gorm-bson') - - compileOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during compileGsonViews task -} - -def templateSourceDir = layout.projectDirectory.dir('src/templates') -def compilationOutputDir = layout.buildDirectory.dir('classes/groovy/main') -sourceSets { - main { - groovy { - // Add templates as source dir - srcDirs = [templateSourceDir] - } - } -} - -tasks.register('compileViews', JavaExec) { - inputs.dir(templateSourceDir) - outputs.dir(compilationOutputDir) - mainClass = 'grails.plugin.json.view.JsonViewCompiler' - classpath = configurations.compileClasspath - args(templateSourceDir.asFile, compilationOutputDir.get().asFile, '17', ' ', ' ', 'none', 'UTF-8') -} - -// This is needed to trigger compilation of the views -tasks.named('classes') { - dependsOn 'compileViews' -} - -// There are no javadocs for this project. -// This is a workaround as a javadoc jar is required for publishing. -tasks.register('javadocJar', Jar) { - from 'src/templates' -} - -apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle') -apply from: rootProject.layout.projectDirectory.file('gradle/publish-config.gradle') \ No newline at end of file diff --git a/grails-data-neo4j/build.gradle b/grails-data-neo4j/build.gradle index 80a454d1dc9..ec500424d91 100644 --- a/grails-data-neo4j/build.gradle +++ b/grails-data-neo4j/build.gradle @@ -6,10 +6,9 @@ buildscript { dependencies { classpath "org.codehaus.groovy.modules.http-builder:http-builder:0.7.2" classpath "io.github.gradle-nexus:publish-plugin:1.3.0" - classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" + classpath "org.apache.grails:grails-gradle-plugins:$grailsGradlePluginVersion" classpath "org.asciidoctor:asciidoctor-gradle-jvm:4.0.2" classpath "com.github.erdi:webdriver-binaries-gradle-plugin:3.2" - classpath "org.grails.plugins:views-gradle:3.1.2" } } @@ -95,15 +94,15 @@ subprojects { subproject -> apply plugin: 'groovy' if (isGrails3Example) { - apply plugin:"org.grails.grails-web" + apply plugin: 'org.apache.grails.gradle.grails-web' apply plugin:"org.grails.grails-gsp" if (usesGeb) { apply plugin:"com.github.erdi.webdriver-binaries" } } else if (subproject.name == "examples-test-data-service") { - apply plugin:"org.grails.grails-web" - apply plugin:"org.grails.plugins.views-json" + apply plugin: 'org.apache.grails.gradle.grails-web' + apply plugin: 'org.apache.grails.gradle.grails-gson' } configurations.all { @@ -114,7 +113,7 @@ subprojects { subproject -> details.useVersion(springVersion) } else if (details.requested.group == 'org.springframework.boot') { details.useVersion(springBootVersion) - } else if (details.requested.name in ['grails-testing-support', 'grails-web-testing-support', 'grails-gorm-testing-support']) { + } else if (details.requested.name in ['grails-testing-support', 'grails-web-testing-support', 'grails-testing-support-datamapping']) { details.useVersion(testingSupportVersion) } } @@ -199,7 +198,7 @@ subprojects { subproject -> apply plugin: 'signing' if(isGrails3PluginProject) { - apply plugin: "org.grails.grails-plugin" + apply plugin: 'org.apache.grails.gradle.grails-plugin' } else { apply plugin:"groovy" } @@ -219,12 +218,14 @@ subprojects { subproject -> details.requested.name in ['grails-datastore-core', 'grails-datastore-async', 'grails-datastore-gorm', - 'grails-datastore-gorm-async', + 'grails-datamapping-async', 'grails-datastore-gorm-rx', - 'grails-datastore-gorm-support', - 'grails-datastore-gorm-tck', + 'grails-datamapping-support', + 'grails-datamapping-tck-tests', + 'grails-datamapping-tck-base', + 'grails-datamapping-tck-domains', 'grails-datastore-gorm-test', - 'grails-datastore-gorm-validation', + 'grails-datamapping-validation', 'grails-datastore-web'] ) { details.useVersion(datastoreVersion) diff --git a/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle b/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle index 65fb52975e4..a3811160649 100644 --- a/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle +++ b/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle @@ -9,12 +9,14 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-starter-tomcat" implementation "javax.servlet:javax.servlet-api:$servletApiVersion" - implementation "org.grails:grails-core:$grailsVersion" - implementation "org.grails:grails-dependencies:$grailsVersion" - implementation "org.grails:grails-web-boot:$grailsVersion" + implementation "org.apache.grails:grails-core:$grailsVersion", { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } + implementation "org.apache.grails:grails-dependencies:$grailsVersion" + implementation "org.apache.grails.web:grails-web-boot:$grailsVersion" implementation project(':grails-plugin') - implementation "org.grails.plugins:hibernate5:$hibernateDatastoreVersion" + implementation "org.apache.grails:grails-data-hibernate5:$hibernateDatastoreVersion" implementation "org.hibernate:hibernate-ehcache:$hibernateEhcacheVersion" runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion" @@ -22,14 +24,12 @@ dependencies { runtimeOnly "org.grails.plugins:fields:$fieldsVersion" runtimeOnly "org.apache.tomcat:tomcat-jdbc:9.0.36" - testImplementation ("org.grails:grails-gorm-testing-support:$testingSupportVersion") { - exclude group: "org.spockframework", module: "spock-core" - } + testImplementation project(':grails-testing-support-datamapping') testImplementation ("org.grails:grails-web-testing-support:$testingSupportVersion") { exclude group: "org.spockframework", module: "spock-core" } - testImplementation("org.grails.plugins:geb") { + testImplementation("org.apache.grails:grails-geb") { exclude group: 'org.gebish', module: 'geb-spock' exclude group: 'org.codehaus.groovy', module: 'groovy-all' } diff --git a/grails-data-neo4j/examples/grails3-neo4j/build.gradle b/grails-data-neo4j/examples/grails3-neo4j/build.gradle index 30a951ee2c1..2fb3f2afa73 100644 --- a/grails-data-neo4j/examples/grails3-neo4j/build.gradle +++ b/grails-data-neo4j/examples/grails3-neo4j/build.gradle @@ -9,28 +9,27 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-starter-tomcat" implementation "javax.servlet:javax.servlet-api:$servletApiVersion" - implementation "org.grails:grails-core:$grailsVersion" - implementation "org.grails:grails-dependencies:$grailsVersion" - implementation "org.grails:grails-web-boot:$grailsVersion" + implementation "org.apache.grails:grails-core:$grailsVersion", { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } + implementation "org.apache.grails:grails-dependencies:$grailsVersion" + implementation "org.apache.grails.web:grails-web-boot:$grailsVersion" - // in a real app this would be org.grails.plugins:neo4j implementation project(":grails-plugin") runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion" runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion" runtimeOnly "org.grails.plugins:fields:$fieldsVersion" - testImplementation ("org.grails:grails-testing-support:$testingSupportVersion") { - exclude group: "org.spockframework", module: "spock-core" - } - testImplementation ("org.grails:grails-gorm-testing-support:$testingSupportVersion") { + testImplementation ("org.apache.grails.testing:grails-testing-support-core:$testingSupportVersion") { exclude group: "org.spockframework", module: "spock-core" } + testImplementation project(':grails-testing-support-datamapping') testImplementation ("org.grails:grails-web-testing-support:$testingSupportVersion") { exclude group: "org.spockframework", module: "spock-core" } - testImplementation("org.grails.plugins:geb") { + testImplementation("org.apache.grails:grails-geb") { exclude group: 'org.gebish', module: 'geb-spock' exclude group: 'org.codehaus.groovy', module: 'groovy-all' } diff --git a/grails-data-neo4j/examples/test-data-service/build.gradle b/grails-data-neo4j/examples/test-data-service/build.gradle index 96c3a65a433..50d5eaf6a64 100644 --- a/grails-data-neo4j/examples/test-data-service/build.gradle +++ b/grails-data-neo4j/examples/test-data-service/build.gradle @@ -3,25 +3,27 @@ group "examples" dependencies { implementation "org.springframework.boot:spring-boot-starter-logging" implementation "org.springframework.boot:spring-boot-autoconfigure" - implementation "org.grails:grails-core" + implementation "org.apache.grails:grails-core", { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-starter-tomcat" - implementation ("org.grails:grails-dependencies") { + implementation ("org.apache.grails:grails-dependencies") { exclude module:'grails-datastore-simple' } - implementation "org.grails:grails-plugin-codecs" - implementation "org.grails:grails-plugin-services" - implementation "org.grails:grails-plugin-datasource" - implementation "org.grails:grails-web-boot" - implementation "org.grails:grails-logging" + implementation "org.apache.grails:grails-codecs" + implementation "org.apache.grails:grails-services" + implementation "org.apache.grails:grails-datasource" + implementation "org.apache.grails.web:grails-web-boot" + implementation "org.apache.grails:grails-logging" implementation "org.grails.plugins:cache" - implementation "org.grails.plugins:events" + implementation "org.apache.grails:grails-events" implementation project(":grails-plugin") implementation "org.grails.plugins:views-json" - implementation "org.grails.plugins:views-json-templates" + implementation "org.apache.grails:grails-data-mongodb-gson-templates" implementation 'org.grails.plugins:spring-security-rest:3.0.1' profile "org.grails.profiles:rest-api" - testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion" + testImplementation project(':grails-testing-support-datamapping') testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion" testRuntimeOnly "org.neo4j.test:neo4j-harness:$neo4jVersion" } diff --git a/grails-data-neo4j/grails-datastore-gorm-neo4j/build.gradle b/grails-data-neo4j/grails-datastore-gorm-neo4j/build.gradle index 1e14b758687..7ad1a15c3fa 100644 --- a/grails-data-neo4j/grails-datastore-gorm-neo4j/build.gradle +++ b/grails-data-neo4j/grails-datastore-gorm-neo4j/build.gradle @@ -3,17 +3,17 @@ sourceSets.main.groovy.srcDirs += ["src/main/java"] dependencies { api "org.neo4j.driver:neo4j-java-driver:$neo4jDriverVersion" - api "org.grails:grails-datastore-gorm-validation:$datastoreVersion" - api "org.grails:grails-datastore-gorm:$datastoreVersion" + api "org.apache.grails.data:grails-datamapping-validation:$datastoreVersion" + api "org.apache.grails.data:grails-datamapping-core:$datastoreVersion" // only needed for web dependencies - compileOnly "org.grails:grails-datastore-web:$datastoreVersion" + compileOnly "org.apache.grails.data:grails-datastore-web:$datastoreVersion" compileOnly "org.neo4j.test:neo4j-harness:$neo4jVersion" implementation "org.javassist:javassist:$javassistVersion" testImplementation "org.neo4j.test:neo4j-harness:$neo4jVersion" - testImplementation "org.grails:grails-datastore-gorm-test:$datastoreVersion", - "org.grails:grails-datastore-gorm-tck:$datastoreVersion" + testImplementation "org.apache.grails.data:grails-datastore-gorm-test:$datastoreVersion" + testImplementation "org.apache.grails.data:grails-datamapping-tck-tests:$datastoreVersion" testImplementation "org.hibernate:hibernate-validator:$hibernateValidatorVersion" testImplementation "org.codehaus.gpars:gpars:$gparsVersion" testImplementation "cglib:cglib-nodep:$cglibNodepVersion" @@ -63,7 +63,7 @@ test.doFirst { .resolvedConfiguration .getResolvedArtifacts() .find { resolved -> - resolved.moduleVersion.id.name == 'grails-datastore-gorm-tck' + resolved.moduleVersion.id.name == 'grails-datamapping-tck-tests' }.file def tckClassesDir = project.file("${project.buildDir}/tck") diff --git a/grails-data-neo4j/grails-plugin/build.gradle b/grails-data-neo4j/grails-plugin/build.gradle index e28715bed0a..a8ec1cd99bb 100644 --- a/grails-data-neo4j/grails-plugin/build.gradle +++ b/grails-data-neo4j/grails-plugin/build.gradle @@ -3,7 +3,7 @@ targetCompatibility = "1.11" dependencyManagement { imports { - mavenBom "org.grails:grails-bom:$pluginGrailsVersion" + mavenBom "org.apache.grails:grails-bom:$pluginGrailsVersion" } applyMavenExclusions false } @@ -25,17 +25,19 @@ configurations.all { } dependencies { - compileOnly "org.grails:grails-core" - compileOnly "org.grails:grails-bootstrap" + compileOnly "org.apache.grails:grails-core", { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } + compileOnly "org.apache.grails.bootstrap:grails-bootstrap" compileOnly "org.spockframework:spock-core:$spockVersion", { exclude group: "junit", module: "junit-dep" exclude group: 'org.codehaus.groovy', module: 'groovy-all' exclude group: 'org.hamcrest', module: 'hamcrest-core' } - runtimeOnly "org.grails:grails-datastore-web:$datastoreVersion" + runtimeOnly "org.apache.grails.data:grails-datastore-web:$datastoreVersion" - api "org.grails:grails-datastore-gorm-support:$datastoreVersion", { + api "org.apache.grails.data:grails-datamapping-support:$datastoreVersion", { exclude group:'org.springframework', module:'spring-context' exclude group:'org.springframework', module:'spring-core' exclude group:'org.springframework', module:'spring-beans' @@ -56,8 +58,10 @@ dependencies { exclude group:'javax.transaction', module:'jta' } - testImplementation "org.grails:grails-core" - testImplementation "org.grails:grails-bootstrap" + testImplementation "org.apache.grails:grails-core", { + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated + } + testImplementation "org.apache.grails.bootstrap:grails-bootstrap" testImplementation "org.neo4j.test:neo4j-harness:$neo4jVersion" } diff --git a/grails-data-simple/build.gradle b/grails-data-simple/build.gradle index 838e7ab6cd0..736a6eff466 100644 --- a/grails-data-simple/build.gradle +++ b/grails-data-simple/build.gradle @@ -4,15 +4,11 @@ plugins { } version = projectVersion -group = 'org.grails' - -ext { - pomArtifactId = 'grails-datastore-gorm-simple' -} +group = 'org.apache.grails.data' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") api project(':grails-datastore-core'), { // api: AbstractDatastore, AbstractKeyValueEntityPersister, AbstractSession, AssociationIndexer, @@ -38,8 +34,8 @@ dependencies { // API dependencies in grails-datastore-gorm //exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' // PostConstruct exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' - exclude group: 'org.grails', module: 'grails-datastore-core' - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + exclude group: 'org.apache.grails.data', module: 'grails-datamapping-validation' exclude group: 'org.springframework', module: 'spring-context' exclude group: 'org.springframework', module: 'spring-jdbc' exclude group: 'org.springframework', module: 'spring-tx' diff --git a/grails-datastore-gorm-async/build.gradle b/grails-datamapping-async/build.gradle similarity index 76% rename from grails-datastore-gorm-async/build.gradle rename to grails-datamapping-async/build.gradle index fc378fcd9be..61e5f922fa9 100644 --- a/grails-datastore-gorm-async/build.gradle +++ b/grails-datamapping-async/build.gradle @@ -4,11 +4,11 @@ plugins { } version = projectVersion -group = 'org.grails' +group = 'org.apache.grails.data' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") api project(':grails-datastore-gorm'), { // api: GormEntity, GormStaticApi, GormOperations, GormStaticOperations @@ -17,14 +17,14 @@ dependencies { // API dependencies in grails-datastore-gorm exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' //exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' // Entity - //exclude group: 'org.grails', module: 'grails-datastore-core' // DirtyCheckable - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' + //exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' // DirtyCheckable + exclude group: 'org.apache.grails.data', module: 'grails-datamapping-validation' //exclude group: 'org.springframework', module: 'spring-context' // Errors exclude group: 'org.springframework', module: 'spring-jdbc' //exclude group: 'org.springframework', module: 'spring-tx' // TransactionDefinition } } - api 'org.grails:grails-async', { + api 'org.apache.grails.async:grails-async-core', { // api: Promise, PromiseDecorator, PromiseDecoratorProvider // impl: Promises } @@ -33,7 +33,7 @@ dependencies { // AST (source retention annotation): DelegateAsync if (excludeUnusedTransDeps) { // API dependencies in grails-datastore-async - exclude group: 'org.grails', module: 'grails-async' + exclude group: 'org.apache.grails.async', module: 'grails-async' } } diff --git a/grails-datastore-gorm-async/src/main/groovy/grails/gorm/async/AsyncEntity.groovy b/grails-datamapping-async/src/main/groovy/grails/gorm/async/AsyncEntity.groovy similarity index 100% rename from grails-datastore-gorm-async/src/main/groovy/grails/gorm/async/AsyncEntity.groovy rename to grails-datamapping-async/src/main/groovy/grails/gorm/async/AsyncEntity.groovy diff --git a/grails-datastore-gorm-async/src/main/groovy/org/grails/datastore/gorm/async/AsyncQuery.groovy b/grails-datamapping-async/src/main/groovy/org/grails/datastore/gorm/async/AsyncQuery.groovy similarity index 100% rename from grails-datastore-gorm-async/src/main/groovy/org/grails/datastore/gorm/async/AsyncQuery.groovy rename to grails-datamapping-async/src/main/groovy/org/grails/datastore/gorm/async/AsyncQuery.groovy diff --git a/grails-datastore-gorm-async/src/main/groovy/org/grails/datastore/gorm/async/GormAsyncStaticApi.groovy b/grails-datamapping-async/src/main/groovy/org/grails/datastore/gorm/async/GormAsyncStaticApi.groovy similarity index 100% rename from grails-datastore-gorm-async/src/main/groovy/org/grails/datastore/gorm/async/GormAsyncStaticApi.groovy rename to grails-datamapping-async/src/main/groovy/org/grails/datastore/gorm/async/GormAsyncStaticApi.groovy diff --git a/grails-datastore-gorm-support/build.gradle b/grails-datamapping-support/build.gradle similarity index 80% rename from grails-datastore-gorm-support/build.gradle rename to grails-datamapping-support/build.gradle index 0dc69f5596d..ef9791aee4d 100644 --- a/grails-datastore-gorm-support/build.gradle +++ b/grails-datamapping-support/build.gradle @@ -4,11 +4,12 @@ plugins { } version = projectVersion -group = 'org.grails' +group = 'org.apache.grails.data' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") + api platform("org.apache.grails:grails-bom:$grailsVersion") api project(':grails-datastore-core'), { // api: AssociationQueryExecutor, Datastore, GrailsArtefactClassInjector, ProxyFactory, ProxyHandler, Session @@ -29,14 +30,14 @@ dependencies { // API dependencies in grails-datastore-gorm exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' //exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' // Entity (test) - exclude group: 'org.grails', module: 'grails-datastore-core' - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + exclude group: 'org.apache.grails.data', module: 'grails-datamapping-validation' exclude group: 'org.springframework', module: 'spring-context' exclude group: 'org.springframework', module: 'spring-jdbc' //exclude group: 'org.springframework', module: 'spring-tx' // TransactionDefinition in GormEntity$Trait$Helper (test) } } - api 'org.grails:grails-core', { + api 'org.apache.grails:grails-core', { // api: AstTransformer, EntityProxyHandler, PersistenceContextInterceptor // impl: PropertySourcesConfig if (excludeUnusedTransDeps) { @@ -44,9 +45,9 @@ dependencies { exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' exclude group: 'jakarta.inject', module: 'jakarta.inject-api' exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' - //exclude group: 'org.grails', module: 'grails-bootstrap' // Resource - exclude group: 'org.grails', module: 'grails-datastore-core' - exclude group: 'org.grails', module: 'grails-spring' + //exclude group: 'org.apache.grails.bootstrap', module: 'grails-bootstrap' // Resource + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + exclude group: 'org.apache.grails', module: 'grails-spring' exclude group: 'org.springframework', module: 'spring-beans' exclude group: 'org.springframework', module: 'spring-context' exclude group: 'org.springframework', module: 'spring-core' @@ -54,6 +55,7 @@ dependencies { exclude group: 'org.springframework.boot', module: 'spring-boot' exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure' } + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated } api 'org.springframework:spring-context', { // api: ConfigurableApplicationContext @@ -63,7 +65,7 @@ dependencies { // impl: ConfigurableConversionService, Converter } - implementation 'org.grails:grails-bootstrap', { + implementation 'org.apache.grails.bootstrap:grails-bootstrap', { // impl: GrailsResourceUtils if (excludeUnusedTransDeps) { // API dependencies in grails-bootstrap diff --git a/grails-datastore-gorm-support/src/main/groovy/org/grails/compiler/gorm/EntityTraitInjector.groovy b/grails-datamapping-support/src/main/groovy/org/grails/compiler/gorm/EntityTraitInjector.groovy similarity index 100% rename from grails-datastore-gorm-support/src/main/groovy/org/grails/compiler/gorm/EntityTraitInjector.groovy rename to grails-datamapping-support/src/main/groovy/org/grails/compiler/gorm/EntityTraitInjector.groovy diff --git a/grails-datastore-gorm-support/src/main/groovy/org/grails/compiler/gorm/GormTransformer.java b/grails-datamapping-support/src/main/groovy/org/grails/compiler/gorm/GormTransformer.java similarity index 100% rename from grails-datastore-gorm-support/src/main/groovy/org/grails/compiler/gorm/GormTransformer.java rename to grails-datamapping-support/src/main/groovy/org/grails/compiler/gorm/GormTransformer.java diff --git a/grails-datastore-gorm-support/src/main/groovy/org/grails/datastore/gorm/plugin/support/ConfigSupport.groovy b/grails-datamapping-support/src/main/groovy/org/grails/datastore/gorm/plugin/support/ConfigSupport.groovy similarity index 100% rename from grails-datastore-gorm-support/src/main/groovy/org/grails/datastore/gorm/plugin/support/ConfigSupport.groovy rename to grails-datamapping-support/src/main/groovy/org/grails/datastore/gorm/plugin/support/ConfigSupport.groovy diff --git a/grails-datastore-gorm-support/src/main/groovy/org/grails/datastore/gorm/proxy/EntityProxyHandlerAdapter.java b/grails-datamapping-support/src/main/groovy/org/grails/datastore/gorm/proxy/EntityProxyHandlerAdapter.java similarity index 100% rename from grails-datastore-gorm-support/src/main/groovy/org/grails/datastore/gorm/proxy/EntityProxyHandlerAdapter.java rename to grails-datamapping-support/src/main/groovy/org/grails/datastore/gorm/proxy/EntityProxyHandlerAdapter.java diff --git a/grails-datastore-gorm-support/src/main/groovy/org/grails/datastore/gorm/proxy/ProxyHandlerAdapter.java b/grails-datamapping-support/src/main/groovy/org/grails/datastore/gorm/proxy/ProxyHandlerAdapter.java similarity index 100% rename from grails-datastore-gorm-support/src/main/groovy/org/grails/datastore/gorm/proxy/ProxyHandlerAdapter.java rename to grails-datamapping-support/src/main/groovy/org/grails/datastore/gorm/proxy/ProxyHandlerAdapter.java diff --git a/grails-datastore-gorm-support/src/main/groovy/org/grails/datastore/gorm/support/AggregatePersistenceContextInterceptor.java b/grails-datamapping-support/src/main/groovy/org/grails/datastore/gorm/support/AggregatePersistenceContextInterceptor.java similarity index 100% rename from grails-datastore-gorm-support/src/main/groovy/org/grails/datastore/gorm/support/AggregatePersistenceContextInterceptor.java rename to grails-datamapping-support/src/main/groovy/org/grails/datastore/gorm/support/AggregatePersistenceContextInterceptor.java diff --git a/grails-datastore-gorm-support/src/main/groovy/org/grails/datastore/gorm/support/DatastorePersistenceContextInterceptor.java b/grails-datamapping-support/src/main/groovy/org/grails/datastore/gorm/support/DatastorePersistenceContextInterceptor.java similarity index 100% rename from grails-datastore-gorm-support/src/main/groovy/org/grails/datastore/gorm/support/DatastorePersistenceContextInterceptor.java rename to grails-datamapping-support/src/main/groovy/org/grails/datastore/gorm/support/DatastorePersistenceContextInterceptor.java diff --git a/grails-datastore-gorm-support/src/main/resources/META-INF/grails.factories b/grails-datamapping-support/src/main/resources/META-INF/grails.factories similarity index 100% rename from grails-datastore-gorm-support/src/main/resources/META-INF/grails.factories rename to grails-datamapping-support/src/main/resources/META-INF/grails.factories diff --git a/grails-datastore-gorm-support/src/test/groovy/org/grails/datastore/gorm/GormEntityTraitSpec.groovy b/grails-datamapping-support/src/test/groovy/org/grails/datastore/gorm/GormEntityTraitSpec.groovy similarity index 100% rename from grails-datastore-gorm-support/src/test/groovy/org/grails/datastore/gorm/GormEntityTraitSpec.groovy rename to grails-datamapping-support/src/test/groovy/org/grails/datastore/gorm/GormEntityTraitSpec.groovy diff --git a/grails-datastore-gorm-support/src/test/groovy/org/grails/datastore/mapping/core/grailsversion/GrailsVersionSpec.groovy b/grails-datamapping-support/src/test/groovy/org/grails/datastore/mapping/core/grailsversion/GrailsVersionSpec.groovy similarity index 100% rename from grails-datastore-gorm-support/src/test/groovy/org/grails/datastore/mapping/core/grailsversion/GrailsVersionSpec.groovy rename to grails-datamapping-support/src/test/groovy/org/grails/datastore/mapping/core/grailsversion/GrailsVersionSpec.groovy diff --git a/grails-datastore-gorm-tck-base/build.gradle b/grails-datamapping-tck-base/build.gradle similarity index 67% rename from grails-datastore-gorm-tck-base/build.gradle rename to grails-datamapping-tck-base/build.gradle index 078c2462a1e..91c0379eaeb 100644 --- a/grails-datastore-gorm-tck-base/build.gradle +++ b/grails-datamapping-tck-base/build.gradle @@ -4,11 +4,11 @@ plugins { } version = projectVersion -group = 'org.grails.tck.base' +group = 'org.apache.grails.data' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") - compileOnly project(':grails-datastore-gorm-tck-domains') + implementation platform("org.apache.grails:grails-bom:$grailsVersion") + compileOnly project(':grails-datamapping-tck-domains') compileOnly 'org.apache.groovy:groovy' compileOnly 'org.spockframework:spock-core' } diff --git a/grails-datastore-gorm-tck-base/src/main/groovy/grails/gorm/tests/GormDatastoreSpec.groovy b/grails-datamapping-tck-base/src/main/groovy/grails/gorm/tests/GormDatastoreSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck-base/src/main/groovy/grails/gorm/tests/GormDatastoreSpec.groovy rename to grails-datamapping-tck-base/src/main/groovy/grails/gorm/tests/GormDatastoreSpec.groovy diff --git a/grails-datastore-gorm-tck-domains/build.gradle b/grails-datamapping-tck-domains/build.gradle similarity index 73% rename from grails-datastore-gorm-tck-domains/build.gradle rename to grails-datamapping-tck-domains/build.gradle index 02fc47af8a9..890651b8c19 100644 --- a/grails-datastore-gorm-tck-domains/build.gradle +++ b/grails-datamapping-tck-domains/build.gradle @@ -4,11 +4,11 @@ plugins { } version = projectVersion -group = 'org.grails.tck.domains' +group = 'org.apache.grails.data' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") api project(':grails-datastore-core'), { // api: AbstractPersistenceEvent, AbstractPersistenceEventListener, AbstractQueryEvent, Datastore, // DirtyCheckable, ProxyHandler, Session @@ -32,31 +32,31 @@ dependencies { // API dependencies in grails-datastore-gorm exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' - exclude group: 'org.grails', module: 'grails-datastore-core' - //exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // CascadingValidator + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + //exclude group: 'org.apache.grails.data', module: 'grails-datamapping-validation' // CascadingValidator exclude group: 'org.springframework', module: 'spring-context' exclude group: 'org.springframework', module: 'spring-jdbc' exclude group: 'org.springframework', module: 'spring-tx' } } - api project(':grails-datastore-gorm-async'), { + api project(':grails-datamapping-async'), { // api: AsyncEntity if (excludeUnusedTransDeps) { - // API dependencies in grails-datastore-gorm-async - exclude group: 'org.grails', module: 'grails-datastore-gorm' - //exclude group: 'org.grails', module: 'grails-async' // PromiseDecoratorProvider + // API dependencies in grails-datamapping-async + exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm' + //exclude group: 'org.apache.grails.async', module: 'grails-async' // PromiseDecoratorProvider } } - api 'org.grails:grails-core', { + api 'org.apache.grails:grails-core', { // impl: Entity, ValidationException if (excludeUnusedTransDeps) { // API dependencies in grails-core exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' exclude group: 'jakarta.inject', module: 'jakarta.inject-api' exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' - //exclude group: 'org.grails', module: 'grails-bootstrap' // Resource - exclude group: 'org.grails', module: 'grails-datastore-core' - exclude group: 'org.grails', module: 'grails-spring' + //exclude group: 'org.apache.grails.bootstrap', module: 'grails-bootstrap' // Resource + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + exclude group: 'org.apache.grails', module: 'grails-spring' exclude group: 'org.springframework', module: 'spring-beans' exclude group: 'org.springframework', module: 'spring-context' exclude group: 'org.springframework', module: 'spring-core' @@ -64,9 +64,10 @@ dependencies { exclude group: 'org.springframework.boot', module: 'spring-boot' exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure' } + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated } - compileOnlyApi project(':grails-datastore-gorm-support'), { + compileOnlyApi project(':grails-datamapping-support'), { // ast transforms } compileOnly 'org.apache.groovy:groovy' diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Book.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Book.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Book.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Book.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Card.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Card.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Card.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Card.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/CardProfile.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/CardProfile.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/CardProfile.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/CardProfile.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Child.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Child.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Child.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Child.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/ChildEntity.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/ChildEntity.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/ChildEntity.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/ChildEntity.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/City.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/City.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/City.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/City.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/ClassWithHungarianNotation.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/ClassWithHungarianNotation.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/ClassWithHungarianNotation.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/ClassWithHungarianNotation.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/ClassWithListArgBeforeValidate.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/ClassWithListArgBeforeValidate.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/ClassWithListArgBeforeValidate.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/ClassWithListArgBeforeValidate.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/ClassWithNoArgBeforeValidate.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/ClassWithNoArgBeforeValidate.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/ClassWithNoArgBeforeValidate.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/ClassWithNoArgBeforeValidate.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/ClassWithOverloadedBeforeValidate.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/ClassWithOverloadedBeforeValidate.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/ClassWithOverloadedBeforeValidate.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/ClassWithOverloadedBeforeValidate.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/CommonTypes.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/CommonTypes.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/CommonTypes.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/CommonTypes.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/ContactDetails.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/ContactDetails.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/ContactDetails.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/ContactDetails.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Country.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Country.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Country.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Country.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Dog.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Dog.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Dog.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Dog.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/EnumThing.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/EnumThing.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/EnumThing.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/EnumThing.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Face.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Face.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Face.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Face.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/GroupWithin.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/GroupWithin.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/GroupWithin.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/GroupWithin.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Highway.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Highway.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Highway.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Highway.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Location.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Location.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Location.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Location.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/ModifyPerson.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/ModifyPerson.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/ModifyPerson.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/ModifyPerson.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Nose.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Nose.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Nose.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Nose.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/OptLockNotVersioned.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/OptLockNotVersioned.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/OptLockNotVersioned.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/OptLockNotVersioned.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/OptLockVersioned.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/OptLockVersioned.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/OptLockVersioned.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/OptLockVersioned.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Parent.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Parent.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Parent.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Parent.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Patient.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Patient.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Patient.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Patient.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Person.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Person.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Person.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Person.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/PersonEvent.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/PersonEvent.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/PersonEvent.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/PersonEvent.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/PersonWithCompositeKey.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/PersonWithCompositeKey.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/PersonWithCompositeKey.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/PersonWithCompositeKey.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Pet.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Pet.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Pet.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Pet.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/PetType.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/PetType.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/PetType.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/PetType.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Plant.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Plant.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Plant.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Plant.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/PlantCategory.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/PlantCategory.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/PlantCategory.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/PlantCategory.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Practice.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Practice.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Practice.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Practice.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Product.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Product.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Product.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Product.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Publication.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Publication.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Publication.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Publication.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Record.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Record.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Record.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Record.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/SimpleWidget.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/SimpleWidget.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/SimpleWidget.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/SimpleWidget.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/SimpleWidgetWithNonStandardId.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/SimpleWidgetWithNonStandardId.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/SimpleWidgetWithNonStandardId.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/SimpleWidgetWithNonStandardId.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Simples.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Simples.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Simples.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Simples.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Task.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Task.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/Task.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/Task.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/TestAuthor.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/TestAuthor.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/TestAuthor.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/TestAuthor.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/TestBook.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/TestBook.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/TestBook.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/TestBook.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/TestEntity.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/TestEntity.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/TestEntity.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/TestEntity.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/TestEnum.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/TestEnum.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/TestEnum.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/TestEnum.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/TestPlayer.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/TestPlayer.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/TestPlayer.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/TestPlayer.groovy diff --git a/grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/UniqueGroup.groovy b/grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/UniqueGroup.groovy similarity index 100% rename from grails-datastore-gorm-tck-domains/src/main/groovy/grails/gorm/tck/UniqueGroup.groovy rename to grails-datamapping-tck-domains/src/main/groovy/grails/gorm/tck/UniqueGroup.groovy diff --git a/grails-datastore-gorm-tck/build.gradle b/grails-datamapping-tck-tests/build.gradle similarity index 74% rename from grails-datastore-gorm-tck/build.gradle rename to grails-datamapping-tck-tests/build.gradle index 883bd78ba8f..8bba6653fcf 100644 --- a/grails-datastore-gorm-tck/build.gradle +++ b/grails-datamapping-tck-tests/build.gradle @@ -4,23 +4,23 @@ plugins { } version = projectVersion -group = 'org.grails.tck.tests' +group = 'org.apache.grails.data' ext { pomPublishTestSources = true } dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") - compileOnly project(':grails-datastore-gorm-tck-base') - compileOnly project(':grails-datastore-gorm-tck-domains') + implementation platform("org.apache.grails:grails-bom:$grailsVersion") + compileOnly project(':grails-datamapping-tck-base') + compileOnly project(':grails-datamapping-tck-domains') implementation 'org.springframework:spring-tx', { // impl: DataIntegrityViolationException } implementation 'org.spockframework:spock-core' - compileOnlyApi project(':grails-datastore-gorm-support'), { + compileOnlyApi project(':grails-datamapping-support'), { // ast transforms } compileOnly 'org.apache.groovy:groovy' diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/AttachMethodSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/AttachMethodSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/AttachMethodSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/AttachMethodSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/BuiltinUniqueConstraintWorksWithTargetProxiesConstraintsSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/BuiltinUniqueConstraintWorksWithTargetProxiesConstraintsSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/BuiltinUniqueConstraintWorksWithTargetProxiesConstraintsSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/BuiltinUniqueConstraintWorksWithTargetProxiesConstraintsSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/CircularOneToManySpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/CircularOneToManySpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/CircularOneToManySpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/CircularOneToManySpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/CommonTypesPersistenceSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/CommonTypesPersistenceSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/CommonTypesPersistenceSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/CommonTypesPersistenceSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/ConstraintsSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/ConstraintsSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/ConstraintsSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/ConstraintsSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/CriteriaBuilderSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/CriteriaBuilderSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/CriteriaBuilderSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/CriteriaBuilderSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/CrudOperationsSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/CrudOperationsSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/CrudOperationsSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/CrudOperationsSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/DeleteAllSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/DeleteAllSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/DeleteAllSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/DeleteAllSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/DetachedCriteriaSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/DetachedCriteriaSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/DetachedCriteriaSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/DetachedCriteriaSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/DirtyCheckingAfterListenerSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/DirtyCheckingAfterListenerSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/DirtyCheckingAfterListenerSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/DirtyCheckingAfterListenerSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/DirtyCheckingSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/DirtyCheckingSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/DirtyCheckingSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/DirtyCheckingSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/DisableAutotimeStampSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/DisableAutotimeStampSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/DisableAutotimeStampSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/DisableAutotimeStampSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/DomainEventsSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/DomainEventsSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/DomainEventsSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/DomainEventsSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/EnumSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/EnumSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/EnumSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/EnumSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/FindByExampleSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/FindByExampleSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/FindByExampleSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/FindByExampleSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/FindByMethodSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/FindByMethodSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/FindByMethodSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/FindByMethodSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/FindOrCreateWhereSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/FindOrCreateWhereSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/FindOrCreateWhereSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/FindOrCreateWhereSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/FindOrSaveWhereSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/FindOrSaveWhereSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/FindOrSaveWhereSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/FindOrSaveWhereSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/FindWhereSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/FindWhereSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/FindWhereSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/FindWhereSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/FirstAndLastMethodSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/FirstAndLastMethodSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/FirstAndLastMethodSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/FirstAndLastMethodSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/GormEnhancerSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/GormEnhancerSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/GormEnhancerSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/GormEnhancerSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/GroovyProxySpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/GroovyProxySpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/GroovyProxySpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/GroovyProxySpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/InheritanceSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/InheritanceSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/InheritanceSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/InheritanceSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/ListOrderBySpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/ListOrderBySpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/ListOrderBySpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/ListOrderBySpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/NamedQuerySpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/NamedQuerySpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/NamedQuerySpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/NamedQuerySpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/NegationSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/NegationSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/NegationSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/NegationSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/NotInListSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/NotInListSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/NotInListSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/NotInListSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/NullValueEqualSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/NullValueEqualSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/NullValueEqualSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/NullValueEqualSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/OneToManySpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/OneToManySpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/OneToManySpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/OneToManySpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/OneToOneSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/OneToOneSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/OneToOneSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/OneToOneSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/OptimisticLockingSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/OptimisticLockingSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/OptimisticLockingSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/OptimisticLockingSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/OrderBySpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/OrderBySpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/OrderBySpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/OrderBySpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/PagedResultSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/PagedResultSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/PagedResultSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/PagedResultSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/PersistenceEventListenerSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/PersistenceEventListenerSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/PersistenceEventListenerSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/PersistenceEventListenerSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/PropertyComparisonQuerySpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/PropertyComparisonQuerySpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/PropertyComparisonQuerySpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/PropertyComparisonQuerySpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/ProxyInitializationSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/ProxyInitializationSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/ProxyInitializationSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/ProxyInitializationSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/ProxyLoadingSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/ProxyLoadingSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/ProxyLoadingSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/ProxyLoadingSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/QueryAfterPropertyChangeSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/QueryAfterPropertyChangeSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/QueryAfterPropertyChangeSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/QueryAfterPropertyChangeSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/QueryByAssociationSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/QueryByAssociationSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/QueryByAssociationSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/QueryByAssociationSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/QueryByNullSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/QueryByNullSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/QueryByNullSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/QueryByNullSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/QueryEventsSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/QueryEventsSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/QueryEventsSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/QueryEventsSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/RangeQuerySpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/RangeQuerySpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/RangeQuerySpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/RangeQuerySpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/SaveAllSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/SaveAllSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/SaveAllSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/SaveAllSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/SessionCreationEventSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/SessionCreationEventSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/SessionCreationEventSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/SessionCreationEventSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/SessionPropertiesSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/SessionPropertiesSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/SessionPropertiesSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/SessionPropertiesSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/SizeQuerySpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/SizeQuerySpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/SizeQuerySpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/SizeQuerySpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/UniqueConstraintSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/UniqueConstraintSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/UniqueConstraintSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/UniqueConstraintSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/UpdateWithProxyPresentSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/UpdateWithProxyPresentSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/UpdateWithProxyPresentSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/UpdateWithProxyPresentSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/ValidationSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/ValidationSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/ValidationSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/ValidationSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/WhereLazySpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/WhereLazySpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/WhereLazySpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/WhereLazySpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/WithTransactionSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/WithTransactionSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/WithTransactionSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/grails/gorm/tck/WithTransactionSpec.groovy diff --git a/grails-datastore-gorm-tck/src/main/groovy/org/grails/datastore/gorm/GormValidateableSpec.groovy b/grails-datamapping-tck-tests/src/main/groovy/org/grails/datastore/gorm/GormValidateableSpec.groovy similarity index 100% rename from grails-datastore-gorm-tck/src/main/groovy/org/grails/datastore/gorm/GormValidateableSpec.groovy rename to grails-datamapping-tck-tests/src/main/groovy/org/grails/datastore/gorm/GormValidateableSpec.groovy diff --git a/grails-datastore-gorm-validation/build.gradle b/grails-datamapping-validation/build.gradle similarity index 95% rename from grails-datastore-gorm-validation/build.gradle rename to grails-datamapping-validation/build.gradle index 65b142592a1..fe5443adb56 100644 --- a/grails-datastore-gorm-validation/build.gradle +++ b/grails-datamapping-validation/build.gradle @@ -4,11 +4,11 @@ plugins { } version = projectVersion -group = 'org.grails' +group = 'org.apache.grails.data' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") api project(':grails-datastore-core'), { // api: MappingContext, PersistentProperty diff --git a/grails-datastore-gorm-validation/src/main/groovy/grails/gorm/validation/CascadingValidator.java b/grails-datamapping-validation/src/main/groovy/grails/gorm/validation/CascadingValidator.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/grails/gorm/validation/CascadingValidator.java rename to grails-datamapping-validation/src/main/groovy/grails/gorm/validation/CascadingValidator.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/grails/gorm/validation/Constrained.groovy b/grails-datamapping-validation/src/main/groovy/grails/gorm/validation/Constrained.groovy similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/grails/gorm/validation/Constrained.groovy rename to grails-datamapping-validation/src/main/groovy/grails/gorm/validation/Constrained.groovy diff --git a/grails-datastore-gorm-validation/src/main/groovy/grails/gorm/validation/ConstrainedEntity.groovy b/grails-datamapping-validation/src/main/groovy/grails/gorm/validation/ConstrainedEntity.groovy similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/grails/gorm/validation/ConstrainedEntity.groovy rename to grails-datamapping-validation/src/main/groovy/grails/gorm/validation/ConstrainedEntity.groovy diff --git a/grails-datastore-gorm-validation/src/main/groovy/grails/gorm/validation/ConstrainedProperty.groovy b/grails-datamapping-validation/src/main/groovy/grails/gorm/validation/ConstrainedProperty.groovy similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/grails/gorm/validation/ConstrainedProperty.groovy rename to grails-datamapping-validation/src/main/groovy/grails/gorm/validation/ConstrainedProperty.groovy diff --git a/grails-datastore-gorm-validation/src/main/groovy/grails/gorm/validation/Constraint.java b/grails-datamapping-validation/src/main/groovy/grails/gorm/validation/Constraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/grails/gorm/validation/Constraint.java rename to grails-datamapping-validation/src/main/groovy/grails/gorm/validation/Constraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/grails/gorm/validation/DefaultConstrainedProperty.groovy b/grails-datamapping-validation/src/main/groovy/grails/gorm/validation/DefaultConstrainedProperty.groovy similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/grails/gorm/validation/DefaultConstrainedProperty.groovy rename to grails-datamapping-validation/src/main/groovy/grails/gorm/validation/DefaultConstrainedProperty.groovy diff --git a/grails-datastore-gorm-validation/src/main/groovy/grails/gorm/validation/PersistentEntityValidator.groovy b/grails-datamapping-validation/src/main/groovy/grails/gorm/validation/PersistentEntityValidator.groovy similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/grails/gorm/validation/PersistentEntityValidator.groovy rename to grails-datamapping-validation/src/main/groovy/grails/gorm/validation/PersistentEntityValidator.groovy diff --git a/grails-datastore-gorm-validation/src/main/groovy/grails/gorm/validation/VetoingConstraint.java b/grails-datamapping-validation/src/main/groovy/grails/gorm/validation/VetoingConstraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/grails/gorm/validation/VetoingConstraint.java rename to grails-datamapping-validation/src/main/groovy/grails/gorm/validation/VetoingConstraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/grails/gorm/validation/exceptions/ValidationConfigurationException.groovy b/grails-datamapping-validation/src/main/groovy/grails/gorm/validation/exceptions/ValidationConfigurationException.groovy similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/grails/gorm/validation/exceptions/ValidationConfigurationException.groovy rename to grails-datamapping-validation/src/main/groovy/grails/gorm/validation/exceptions/ValidationConfigurationException.groovy diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/support/BeforeValidateHelper.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/support/BeforeValidateHelper.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/support/BeforeValidateHelper.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/support/BeforeValidateHelper.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/support/EventTriggerCaller.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/support/EventTriggerCaller.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/support/EventTriggerCaller.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/support/EventTriggerCaller.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/AbstractConstraint.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/AbstractConstraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/AbstractConstraint.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/AbstractConstraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/AbstractVetoingConstraint.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/AbstractVetoingConstraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/AbstractVetoingConstraint.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/AbstractVetoingConstraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/BlankConstraint.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/BlankConstraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/BlankConstraint.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/BlankConstraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/CreditCardConstraint.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/CreditCardConstraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/CreditCardConstraint.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/CreditCardConstraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/EmailConstraint.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/EmailConstraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/EmailConstraint.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/EmailConstraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/InListConstraint.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/InListConstraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/InListConstraint.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/InListConstraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MatchesConstraint.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MatchesConstraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MatchesConstraint.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MatchesConstraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MaxConstraint.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MaxConstraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MaxConstraint.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MaxConstraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MaxSizeConstraint.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MaxSizeConstraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MaxSizeConstraint.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MaxSizeConstraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MinConstraint.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MinConstraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MinConstraint.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MinConstraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MinSizeConstraint.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MinSizeConstraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MinSizeConstraint.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MinSizeConstraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/NotEqualConstraint.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/NotEqualConstraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/NotEqualConstraint.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/NotEqualConstraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/NullableConstraint.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/NullableConstraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/NullableConstraint.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/NullableConstraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/RangeConstraint.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/RangeConstraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/RangeConstraint.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/RangeConstraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/ScaleConstraint.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/ScaleConstraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/ScaleConstraint.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/ScaleConstraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/SizeConstraint.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/SizeConstraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/SizeConstraint.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/SizeConstraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/UrlConstraint.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/UrlConstraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/UrlConstraint.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/UrlConstraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/ValidatorConstraint.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/ValidatorConstraint.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/ValidatorConstraint.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/ValidatorConstraint.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/builder/ConstrainedPropertyBuilder.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/builder/ConstrainedPropertyBuilder.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/builder/ConstrainedPropertyBuilder.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/builder/ConstrainedPropertyBuilder.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/eval/ConstraintsEvaluator.groovy b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/eval/ConstraintsEvaluator.groovy similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/eval/ConstraintsEvaluator.groovy rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/eval/ConstraintsEvaluator.groovy diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/eval/DefaultConstraintEvaluator.java b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/eval/DefaultConstraintEvaluator.java similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/eval/DefaultConstraintEvaluator.java rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/eval/DefaultConstraintEvaluator.java diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/factory/ConstraintFactory.groovy b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/factory/ConstraintFactory.groovy similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/factory/ConstraintFactory.groovy rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/factory/ConstraintFactory.groovy diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/factory/DefaultConstraintFactory.groovy b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/factory/DefaultConstraintFactory.groovy similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/factory/DefaultConstraintFactory.groovy rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/factory/DefaultConstraintFactory.groovy diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/registry/ConstraintRegistry.groovy b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/registry/ConstraintRegistry.groovy similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/registry/ConstraintRegistry.groovy rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/registry/ConstraintRegistry.groovy diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/registry/DefaultConstraintRegistry.groovy b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/registry/DefaultConstraintRegistry.groovy similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/registry/DefaultConstraintRegistry.groovy rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/registry/DefaultConstraintRegistry.groovy diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/registry/DefaultValidatorRegistry.groovy b/grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/registry/DefaultValidatorRegistry.groovy similarity index 100% rename from grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/registry/DefaultValidatorRegistry.groovy rename to grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/registry/DefaultValidatorRegistry.groovy diff --git a/grails-datastore-gorm-validation/src/main/resources/grails/gorm/validation/DefaultErrorMessages.properties b/grails-datamapping-validation/src/main/resources/grails/gorm/validation/DefaultErrorMessages.properties similarity index 100% rename from grails-datastore-gorm-validation/src/main/resources/grails/gorm/validation/DefaultErrorMessages.properties rename to grails-datamapping-validation/src/main/resources/grails/gorm/validation/DefaultErrorMessages.properties diff --git a/grails-datastore-gorm-validation/src/test/groovy/grails/gorm/validation/ImportFromSpec.groovy b/grails-datamapping-validation/src/test/groovy/grails/gorm/validation/ImportFromSpec.groovy similarity index 100% rename from grails-datastore-gorm-validation/src/test/groovy/grails/gorm/validation/ImportFromSpec.groovy rename to grails-datamapping-validation/src/test/groovy/grails/gorm/validation/ImportFromSpec.groovy diff --git a/grails-datastore-gorm-validation/src/test/groovy/grails/gorm/validation/PersistentEntityValidatorSpec.groovy b/grails-datamapping-validation/src/test/groovy/grails/gorm/validation/PersistentEntityValidatorSpec.groovy similarity index 100% rename from grails-datastore-gorm-validation/src/test/groovy/grails/gorm/validation/PersistentEntityValidatorSpec.groovy rename to grails-datamapping-validation/src/test/groovy/grails/gorm/validation/PersistentEntityValidatorSpec.groovy diff --git a/grails-datastore-gorm-validation/src/test/groovy/grails/gorm/validation/ValidatorRegistrySpec.groovy b/grails-datamapping-validation/src/test/groovy/grails/gorm/validation/ValidatorRegistrySpec.groovy similarity index 100% rename from grails-datastore-gorm-validation/src/test/groovy/grails/gorm/validation/ValidatorRegistrySpec.groovy rename to grails-datamapping-validation/src/test/groovy/grails/gorm/validation/ValidatorRegistrySpec.groovy diff --git a/grails-datastore-gorm-validation/src/test/groovy/grails/gorm/validation/cascade/NoDuplicateCascadeSpec.groovy b/grails-datamapping-validation/src/test/groovy/grails/gorm/validation/cascade/NoDuplicateCascadeSpec.groovy similarity index 100% rename from grails-datastore-gorm-validation/src/test/groovy/grails/gorm/validation/cascade/NoDuplicateCascadeSpec.groovy rename to grails-datamapping-validation/src/test/groovy/grails/gorm/validation/cascade/NoDuplicateCascadeSpec.groovy diff --git a/grails-datastore-gorm-validation/src/test/groovy/org/grails/datastore/gorm/validation/constraints/BlankConstraintSpec.groovy b/grails-datamapping-validation/src/test/groovy/org/grails/datastore/gorm/validation/constraints/BlankConstraintSpec.groovy similarity index 100% rename from grails-datastore-gorm-validation/src/test/groovy/org/grails/datastore/gorm/validation/constraints/BlankConstraintSpec.groovy rename to grails-datamapping-validation/src/test/groovy/org/grails/datastore/gorm/validation/constraints/BlankConstraintSpec.groovy diff --git a/grails-datastore-gorm-validation/src/test/groovy/org/grails/datastore/gorm/validation/constraints/BlankConstraintsSpec.groovy b/grails-datamapping-validation/src/test/groovy/org/grails/datastore/gorm/validation/constraints/BlankConstraintsSpec.groovy similarity index 100% rename from grails-datastore-gorm-validation/src/test/groovy/org/grails/datastore/gorm/validation/constraints/BlankConstraintsSpec.groovy rename to grails-datamapping-validation/src/test/groovy/org/grails/datastore/gorm/validation/constraints/BlankConstraintsSpec.groovy diff --git a/grails-datastore-gorm-validation/src/test/groovy/org/grails/datastore/gorm/validation/constraints/eval/DefaultConstraintEvaluatorSpec.groovy b/grails-datamapping-validation/src/test/groovy/org/grails/datastore/gorm/validation/constraints/eval/DefaultConstraintEvaluatorSpec.groovy similarity index 100% rename from grails-datastore-gorm-validation/src/test/groovy/org/grails/datastore/gorm/validation/constraints/eval/DefaultConstraintEvaluatorSpec.groovy rename to grails-datamapping-validation/src/test/groovy/org/grails/datastore/gorm/validation/constraints/eval/DefaultConstraintEvaluatorSpec.groovy diff --git a/grails-datastore-async/build.gradle b/grails-datastore-async/build.gradle index 14372e497cf..8dabeb199b3 100644 --- a/grails-datastore-async/build.gradle +++ b/grails-datastore-async/build.gradle @@ -4,13 +4,13 @@ plugins { } version = projectVersion -group = 'org.grails' +group = 'org.apache.grails.data' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") - api 'org.grails:grails-async', { + api 'org.apache.grails.async:grails-async-core', { // ast: DelegateAsyncUtils, Promise, Promises } diff --git a/grails-datastore-core/build.gradle b/grails-datastore-core/build.gradle index b9464975381..e8e3d29ed01 100644 --- a/grails-datastore-core/build.gradle +++ b/grails-datastore-core/build.gradle @@ -4,11 +4,11 @@ plugins { } version = projectVersion -group = 'org.grails' +group = 'org.apache.grails.data' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") api 'jakarta.persistence:jakarta.persistence-api', { // api: FlushModeType, AccessType, CascadeType, EnumType, FetchType, LockModeType, JoinType diff --git a/grails-datastore-gorm-rx/build.gradle b/grails-datastore-gorm-rx/build.gradle index 4af34465380..a66660a81b3 100644 --- a/grails-datastore-gorm-rx/build.gradle +++ b/grails-datastore-gorm-rx/build.gradle @@ -4,16 +4,16 @@ plugins { } version = projectVersion -group = 'org.grails' +group = 'org.apache.grails.data' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation 'org.apache.groovy:groovy' api "io.reactivex:rxjava" api project(":grails-datastore-gorm"), { - exclude group:"org.grails", module:'grails-async' - exclude group:"org.grails", module:'grails-datastore-core' + exclude group:"org.apache.grails.async", module:'grails-async' + exclude group:"org.apache.grails.data", module:'grails-datastore-core' } api project(":grails-datastore-core") implementation "org.javassist:javassist:$javassistVersion" diff --git a/grails-datastore-gorm-test/build.gradle b/grails-datastore-gorm-test/build.gradle index 363b863a765..ea9c0969c8f 100644 --- a/grails-datastore-gorm-test/build.gradle +++ b/grails-datastore-gorm-test/build.gradle @@ -4,16 +4,16 @@ plugins { } version = projectVersion -group = 'org.grails' +group = 'org.apache.grails.data' ext { includeBaseTckClass = true - //TODO: We could publish the test classes once https://github.com/grails/grails-gradle-plugin/pull/425 is merged + //TODO: We could publish the test classes once https://github.com/apache/grails-gradle-plugin/pull/425 is merged } dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") api project(':grails-datastore-core'), { // api: AbstractDatastore, AbstractKeyValueEntityPersister, AbstractSession, AssociationIndexer, @@ -39,8 +39,8 @@ dependencies { // API dependencies in grails-datastore-gorm //exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' // PostConstruct exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' - exclude group: 'org.grails', module: 'grails-datastore-core' - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + exclude group: 'org.apache.grails.data', module: 'grails-datamapping-validation' exclude group: 'org.springframework', module: 'spring-context' exclude group: 'org.springframework', module: 'spring-jdbc' exclude group: 'org.springframework', module: 'spring-tx' @@ -69,16 +69,16 @@ dependencies { testImplementation 'org.junit.platform:junit-platform-suite', { // api: SelectClasses, Suite } - testImplementation 'org.grails:grails-core', { + testImplementation 'org.apache.grails:grails-core', { // impl: Entity. ValidationException if (excludeUnusedTransDeps) { // API dependencies in grails-core exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' exclude group: 'jakarta.inject', module: 'jakarta.inject-api' exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' - //exclude group: 'org.grails', module: 'grails-bootstrap' // Resource - exclude group: 'org.grails', module: 'grails-datastore-core' - exclude group: 'org.grails', module: 'grails-spring' + //exclude group: 'org.apache.grails.bootstrap', module: 'grails-bootstrap' // Resource + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + exclude group: 'org.apache.grails.data', module: 'grails-spring' exclude group: 'org.springframework', module: 'spring-beans' exclude group: 'org.springframework', module: 'spring-context' exclude group: 'org.springframework', module: 'spring-core' @@ -86,6 +86,7 @@ dependencies { exclude group: 'org.springframework.boot', module: 'spring-boot' exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure' } + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated } testImplementation 'org.spockframework:spock-core' diff --git a/grails-datastore-gorm/build.gradle b/grails-datastore-gorm/build.gradle index 1f1c8f56cd9..f808f3bca5a 100644 --- a/grails-datastore-gorm/build.gradle +++ b/grails-datastore-gorm/build.gradle @@ -4,11 +4,11 @@ plugins { } version = projectVersion -group = 'org.grails' +group = 'org.apache.grails.data' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") api project(':grails-datastore-core'), { // api: BuildableCriteria, ConnectionSourcesProvider, Criteria, Datastore, MappingContext, PersistentEntity, @@ -25,12 +25,12 @@ dependencies { exclude group: 'org.springframework', module: 'spring-tx' } } - api project(':grails-datastore-gorm-validation'), { + api project(':grails-datamapping-validation'), { // api: BeforeValidateHelper, CascadingValidator, DefaultValidatorRegistry if (excludeUnusedTransDeps) { - // API dependencies in grails-datastore-gorm-validation + // API dependencies in grails-datamapping-validation exclude group: 'commons-validator', module: 'commons-validator' - exclude group: 'org.grails', module: 'grails-datastore-core' + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' exclude group: 'org.springframework', module: 'spring-context' } } @@ -72,8 +72,9 @@ dependencies { compileOnly 'org.slf4j:slf4j-api' - testImplementation 'org.grails:grails-core', { + testImplementation 'org.apache.grails:grails-core', { // impl: ValidationException + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated } testImplementation 'org.junit.jupiter:junit-jupiter-api' testImplementation 'org.spockframework:spock-core' diff --git a/grails-datastore-web/build.gradle b/grails-datastore-web/build.gradle index 4e82613b138..95bc257f6fd 100644 --- a/grails-datastore-web/build.gradle +++ b/grails-datastore-web/build.gradle @@ -4,11 +4,11 @@ plugins { } version = projectVersion -group = 'org.grails' +group = 'org.apache.grails.data' dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") api project(':grails-datastore-core'), { // api: Datastore diff --git a/grails-gorm-testing-support/build.gradle b/grails-testing-support-datamapping/build.gradle similarity index 76% rename from grails-gorm-testing-support/build.gradle rename to grails-testing-support-datamapping/build.gradle index 1c3ae60559c..8222589efc1 100755 --- a/grails-gorm-testing-support/build.gradle +++ b/grails-testing-support-datamapping/build.gradle @@ -4,7 +4,7 @@ plugins { } version = projectVersion -group = 'org.grails' +group = 'org.apache.grails' ext { pomTitle = 'Grails Web Testing Support' @@ -14,7 +14,7 @@ ext { dependencies { - implementation platform("org.grails:grails-bom:$grailsVersion") + implementation platform("org.apache.grails:grails-bom:$grailsVersion") api project(':grails-datastore-core'), { // api: AbstractDatastore, PersistentEntity, Session @@ -28,25 +28,25 @@ dependencies { exclude group: 'org.springframework', module: 'spring-tx' } } - api project(':grails-datastore-gorm-validation'), { + api project(':grails-datamapping-validation'), { // api: CascadingValidator, ConstraintsEvaluator, PersistentEntityValidator // impl: ConstraintRegistry, DefaultConstraintEvaluator, DefaultConstraintRegistry, PersistentEntityValidator if (excludeUnusedTransDeps) { - // API dependencies in grails-datastore-gorm-validation + // API dependencies in grails-datamapping-validation exclude group: 'commons-validator', module: 'commons-validator' - exclude group: 'org.grails', module: 'grails-datastore-core' + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' exclude group: 'org.springframework', module: 'spring-context' } } - api 'org.grails:grails-testing-support', { + api 'org.apache.grails.testing:grails-testing-support-core', { // api: GrailsUnitTest if (excludeUnusedTransDeps) { // API dependencies in grails-testing-support exclude group: 'org.springframework', module: 'spring-test' - exclude group: 'org.grails', module: 'grails-plugin-codecs' - exclude group: 'org.grails', module: 'grails-plugin-databinding' - exclude group: 'org.grails', module: 'grails-datastore-gorm' - exclude group: 'org.grails', module: 'grails-test' + exclude group: 'org.apache.grails', module: 'grails-codecs' + exclude group: 'org.apache.grails', module: 'grails-databinding' + exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm' + exclude group: 'org.apache.grails', module: 'grails-test-core' exclude group: 'org.springframework.boot', module: 'spring-boot-test' exclude group: 'org.spockframework', module: 'spock-spring' exclude group: 'org.spockframework', module: 'spock-core' @@ -73,8 +73,8 @@ dependencies { // API dependencies in grails-datastore-gorm exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' //exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' // Entity - exclude group: 'org.grails', module: 'grails-datastore-core' - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + exclude group: 'org.apache.grails.data', module: 'grails-datamapping-validation' exclude group: 'org.springframework', module: 'spring-context' exclude group: 'org.springframework', module: 'spring-jdbc' exclude group: 'org.springframework', module: 'spring-tx' @@ -84,23 +84,23 @@ dependencies { // impl: SimpleMapDatastore if (excludeUnusedTransDeps) { // API dependencies in grails-datastore-gorm-test - exclude group: 'org.grails', module: 'grails-datastore-core' - exclude group: 'org.grails', module: 'grails-datastore-gorm' + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm' exclude group: 'org.springframework', module: 'spring-context' exclude group: 'org.springframework', module: 'spring-core' exclude group: 'org.springframework', module: 'spring-tx' } } - implementation 'org.grails:grails-core', { + implementation 'org.apache.grails:grails-core', { // impl: ConstraintEvalUtils, DomainClassArtefactHandler, GrailsClass if (excludeUnusedTransDeps) { // API dependencies in grails-core exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' exclude group: 'jakarta.inject', module: 'jakarta.inject-api' exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' - //exclude group: 'org.grails', module: 'grails-bootstrap' // Resource - exclude group: 'org.grails', module: 'grails-datastore-core' - exclude group: 'org.grails', module: 'grails-spring' + //exclude group: 'org.apache.grails.bootstrap', module: 'grails-bootstrap' // Resource + exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' + exclude group: 'org.apache.grails', module: 'grails-spring' exclude group: 'org.springframework', module: 'spring-beans' exclude group: 'org.springframework', module: 'spring-context' exclude group: 'org.springframework', module: 'spring-core' @@ -108,6 +108,7 @@ dependencies { exclude group: 'org.springframework.boot', module: 'spring-boot' exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure' } + exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated } compileOnly 'org.apache.groovy:groovy', { diff --git a/grails-gorm-testing-support/src/main/groovy/grails/testing/gorm/DataTest.groovy b/grails-testing-support-datamapping/src/main/groovy/grails/testing/gorm/DataTest.groovy similarity index 100% rename from grails-gorm-testing-support/src/main/groovy/grails/testing/gorm/DataTest.groovy rename to grails-testing-support-datamapping/src/main/groovy/grails/testing/gorm/DataTest.groovy diff --git a/grails-gorm-testing-support/src/main/groovy/grails/testing/gorm/DomainUnitTest.groovy b/grails-testing-support-datamapping/src/main/groovy/grails/testing/gorm/DomainUnitTest.groovy similarity index 100% rename from grails-gorm-testing-support/src/main/groovy/grails/testing/gorm/DomainUnitTest.groovy rename to grails-testing-support-datamapping/src/main/groovy/grails/testing/gorm/DomainUnitTest.groovy diff --git a/grails-gorm-testing-support/src/main/groovy/org/grails/testing/gorm/MockCascadingDomainClassValidator.groovy b/grails-testing-support-datamapping/src/main/groovy/org/grails/testing/gorm/MockCascadingDomainClassValidator.groovy similarity index 100% rename from grails-gorm-testing-support/src/main/groovy/org/grails/testing/gorm/MockCascadingDomainClassValidator.groovy rename to grails-testing-support-datamapping/src/main/groovy/org/grails/testing/gorm/MockCascadingDomainClassValidator.groovy diff --git a/grails-gorm-testing-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestCleanupInterceptor.groovy b/grails-testing-support-datamapping/src/main/groovy/org/grails/testing/gorm/spock/DataTestCleanupInterceptor.groovy similarity index 100% rename from grails-gorm-testing-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestCleanupInterceptor.groovy rename to grails-testing-support-datamapping/src/main/groovy/org/grails/testing/gorm/spock/DataTestCleanupInterceptor.groovy diff --git a/grails-gorm-testing-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestCleanupSpecInterceptor.groovy b/grails-testing-support-datamapping/src/main/groovy/org/grails/testing/gorm/spock/DataTestCleanupSpecInterceptor.groovy similarity index 100% rename from grails-gorm-testing-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestCleanupSpecInterceptor.groovy rename to grails-testing-support-datamapping/src/main/groovy/org/grails/testing/gorm/spock/DataTestCleanupSpecInterceptor.groovy diff --git a/grails-gorm-testing-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestSetupInterceptor.groovy b/grails-testing-support-datamapping/src/main/groovy/org/grails/testing/gorm/spock/DataTestSetupInterceptor.groovy similarity index 100% rename from grails-gorm-testing-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestSetupInterceptor.groovy rename to grails-testing-support-datamapping/src/main/groovy/org/grails/testing/gorm/spock/DataTestSetupInterceptor.groovy diff --git a/grails-gorm-testing-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestSetupSpecInterceptor.groovy b/grails-testing-support-datamapping/src/main/groovy/org/grails/testing/gorm/spock/DataTestSetupSpecInterceptor.groovy similarity index 100% rename from grails-gorm-testing-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestSetupSpecInterceptor.groovy rename to grails-testing-support-datamapping/src/main/groovy/org/grails/testing/gorm/spock/DataTestSetupSpecInterceptor.groovy diff --git a/grails-gorm-testing-support/src/main/groovy/org/grails/testing/gorm/spock/GormTestingSupportExtension.groovy b/grails-testing-support-datamapping/src/main/groovy/org/grails/testing/gorm/spock/GormTestingSupportExtension.groovy similarity index 100% rename from grails-gorm-testing-support/src/main/groovy/org/grails/testing/gorm/spock/GormTestingSupportExtension.groovy rename to grails-testing-support-datamapping/src/main/groovy/org/grails/testing/gorm/spock/GormTestingSupportExtension.groovy diff --git a/grails-gorm-testing-support/src/main/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension b/grails-testing-support-datamapping/src/main/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension similarity index 100% rename from grails-gorm-testing-support/src/main/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension rename to grails-testing-support-datamapping/src/main/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension diff --git a/settings.gradle b/settings.gradle index ad0d193f378..0c254de9bba 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,7 +5,7 @@ plugins { def isCI = System.getenv('CI') != null def isLocal = !isCI -def isAuthenticated = System.getenv('DEVELOCITY_ACCESS_KEY') != null +def isAuthenticated = System.getenv('GRAILS_DEVELOCITY_ACCESS_KEY') != null develocity { server = 'https://ge.grails.org' @@ -34,13 +34,13 @@ include( // Core GORM Implementation projects 'grails-datastore-gorm', 'grails-datastore-async', - 'grails-datastore-gorm-async', - 'grails-datastore-gorm-validation', - 'grails-datastore-gorm-support', + 'grails-datamapping-async', + 'grails-datamapping-validation', + 'grails-datamapping-support', // the tck is split into domains -> base -> tck so that the base class can be swapped out or reused - 'grails-datastore-gorm-tck', - 'grails-datastore-gorm-tck-base', - 'grails-datastore-gorm-tck-domains', + 'grails-datamapping-tck-tests', + 'grails-datamapping-tck-base', + 'grails-datamapping-tck-domains', 'grails-datastore-gorm-test', // RX projects @@ -48,7 +48,7 @@ include( //'grails-datastore-gorm-rx', // Testing Support - 'grails-gorm-testing-support', + 'grails-testing-support-datamapping', // Test Report 'test-report' @@ -71,8 +71,8 @@ findProject(':simple-gorm').projectDir = file('grails-data-simple') // Hibernate 5 // Core -include "hibernate5-gorm" -findProject(':hibernate5-gorm').projectDir = file('grails-data-hibernate5/gorm') +include "hibernate5-core" +findProject(':hibernate5-core').projectDir = file('grails-data-hibernate5/core') // Documentation include 'hibernate5-docs' @@ -88,45 +88,46 @@ findProject(':hibernate5-database-migration').projectDir = new File(settingsDir, include 'hibernate5-boot-plugin' findProject(':hibernate5-boot-plugin').projectDir = new File(settingsDir, 'grails-data-hibernate5/boot-plugin') -include "hibernate5-examples-grails-hibernate" -project(":hibernate5-examples-grails-hibernate").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-hibernate") - -include "hibernate5-examples-grails-multiple-datasources" -project(":hibernate5-examples-grails-multiple-datasources").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-multiple-datasources") - -include "hibernate5-examples-grails-database-per-tenant" -project(":hibernate5-examples-grails-database-per-tenant").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-database-per-tenant") - -include "hibernate5-examples-grails-schema-per-tenant" -project(":hibernate5-examples-grails-schema-per-tenant").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-schema-per-tenant") - -include "hibernate5-examples-grails-partitioned-multi-tenancy" -project(":hibernate5-examples-grails-partitioned-multi-tenancy").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-partitioned-multi-tenancy") - -include "hibernate5-examples-standalone-hibernate" -project(":hibernate5-examples-standalone-hibernate").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/standalone-hibernate") - -include "hibernate5-examples-spring-boot-hibernate" -project(":hibernate5-examples-spring-boot-hibernate").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/spring-boot-hibernate") - -include "hibernate5-examples-grails-data-service" -project(":hibernate5-examples-grails-data-service").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-data-service") - -include "hibernate5-examples-grails-hibernate-groovy-proxy" -project(":hibernate5-examples-grails-hibernate-groovy-proxy").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-hibernate-groovy-proxy") - -include 'hibernate5-examples-issue450' -project(':hibernate5-examples-issue450').projectDir = new File(settingsDir, 'grails-data-hibernate5/examples/issue450') +// Hibernate5 examples +//include "hibernate5-examples-grails-hibernate" +//project(":hibernate5-examples-grails-hibernate").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-hibernate") +// +//include "hibernate5-examples-grails-multiple-datasources" +//project(":hibernate5-examples-grails-multiple-datasources").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-multiple-datasources") +// +//include "hibernate5-examples-grails-database-per-tenant" +//project(":hibernate5-examples-grails-database-per-tenant").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-database-per-tenant") +// +//include "hibernate5-examples-grails-schema-per-tenant" +//project(":hibernate5-examples-grails-schema-per-tenant").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-schema-per-tenant") +// +//include "hibernate5-examples-grails-partitioned-multi-tenancy" +//project(":hibernate5-examples-grails-partitioned-multi-tenancy").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-partitioned-multi-tenancy") +// +//include "hibernate5-examples-standalone-hibernate" +//project(":hibernate5-examples-standalone-hibernate").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/standalone-hibernate") +// +//include "hibernate5-examples-spring-boot-hibernate" +//project(":hibernate5-examples-spring-boot-hibernate").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/spring-boot-hibernate") +// +//include "hibernate5-examples-grails-data-service" +//project(":hibernate5-examples-grails-data-service").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-data-service") +// +//include "hibernate5-examples-grails-hibernate-groovy-proxy" +//project(":hibernate5-examples-grails-hibernate-groovy-proxy").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-hibernate-groovy-proxy") +// +//include 'hibernate5-examples-issue450' +//project(':hibernate5-examples-issue450').projectDir = new File(settingsDir, 'grails-data-hibernate5/examples/issue450') // core -include "mongodb-gorm-bson" -project(":mongodb-gorm-bson").projectDir = new File(settingsDir, 'grails-data-mongodb/gorm-bson') +include "mongodb-bson" +project(":mongodb-bson").projectDir = new File(settingsDir, 'grails-data-mongodb/bson') -include "mongodb-gorm" -project(":mongodb-gorm").projectDir = new File(settingsDir, 'grails-data-mongodb/gorm') +include "mongodb-core" +project(":mongodb-core").projectDir = new File(settingsDir, 'grails-data-mongodb/core') -include "mongodb-gorm-ext" -project(":mongodb-gorm-ext").projectDir = new File(settingsDir, 'grails-data-mongodb/gorm-ext') +include "mongodb-ext" +project(":mongodb-ext").projectDir = new File(settingsDir, 'grails-data-mongodb/ext') // documentation include 'mongodb-docs' @@ -139,25 +140,26 @@ project(':mongodb-boot-plugin').projectDir = new File(settingsDir, 'grails-data- include 'mongodb-grails-plugin' project(':mongodb-grails-plugin').projectDir = new File(settingsDir, 'grails-data-mongodb/grails-plugin') -include 'mongodb-views-json-templates' -project(':mongodb-views-json-templates').projectDir = new File(settingsDir, 'grails-data-mongodb/json-templates') +include 'mongodb-gson-templates' +project(':mongodb-gson-templates').projectDir = new File(settingsDir, 'grails-data-mongodb/gson-templates') // mongodb examples -include 'mongodb-examples-base' -project(":mongodb-examples-base").projectDir = new File(settingsDir, "grails-data-mongodb/examples/base") - -include 'mongodb-examples-database-per-tenant' -project(":mongodb-examples-database-per-tenant").projectDir = new File(settingsDir, "grails-data-mongodb/examples/database-per-tenant") - -include 'mongodb-hibernate5-examples' -project(":mongodb-hibernate5-examples").projectDir = new File(settingsDir, "grails-data-mongodb/examples/hibernate5") - -include 'mongodb-examples-springboot' -project(":mongodb-examples-springboot").projectDir = new File(settingsDir, "grails-data-mongodb/examples/springboot") - -include 'mongodb-examples-test-data-service' -project(":mongodb-examples-test-data-service").projectDir = new File(settingsDir, "grails-data-mongodb/examples/test-data-service") - -include 'mongodb-examples-gson-templates' -project(":mongodb-examples-gson-templates").projectDir = new File(settingsDir, "grails-data-mongodb/examples/gson-templates") +//include 'mongodb-examples-base' +//project(":mongodb-examples-base").projectDir = new File(settingsDir, "grails-data-mongodb/examples/base") +// +//include 'mongodb-examples-database-per-tenant' +//project(":mongodb-examples-database-per-tenant").projectDir = new File(settingsDir, "grails-data-mongodb/examples/database-per-tenant") +// +//include 'mongodb-examples-hibernate5' +//project(":mongodb-examples-hibernate5").projectDir = new File(settingsDir, "grails-data-mongodb/examples/hibernate5") +// +//include 'mongodb-examples-springboot' +//project(":mongodb-examples-springboot").projectDir = new File(settingsDir, "grails-data-mongodb/examples/springboot") +// +//include 'mongodb-examples-test-data-service' +//project(":mongodb-examples-test-data-service").projectDir = new File(settingsDir, "grails-data-mongodb/examples/test-data-service") + +//TODO: Circular dependency, can't run this until views are published +//include 'mongodb-examples-gson-templates' +//project(":mongodb-examples-gson-templates").projectDir = new File(settingsDir, "grails-data-mongodb/examples/gson-templates") diff --git a/test-report/build.gradle b/test-report/build.gradle index 20cac9237b6..93c99b33b1f 100644 --- a/test-report/build.gradle +++ b/test-report/build.gradle @@ -7,10 +7,10 @@ dependencies { testReportAggregation project(':grails-datastore-async') testReportAggregation project(':grails-datastore-core') testReportAggregation project(':grails-datastore-gorm') - testReportAggregation project(':grails-datastore-gorm-async') - testReportAggregation project(':grails-datastore-gorm-support') + testReportAggregation project(':grails-datamapping-async') + testReportAggregation project(':grails-datamapping-support') testReportAggregation project(':grails-datastore-gorm-test') - testReportAggregation project(':grails-datastore-gorm-validation') + testReportAggregation project(':grails-datamapping-validation') testReportAggregation project(':grails-datastore-web') }