diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index e19d975521d..3399b77606c 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -11,7 +11,6 @@ permissions:
   packages: read
 jobs:
   datastore-build:
-    if: false # remove after publishing
     name: "Build Datastore Project"
     runs-on: ubuntu-24.04
     strategy:
@@ -35,38 +34,42 @@ jobs:
         env:
           GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew cleanTest build --continue -PonlyDatastoreTests
-#  mongodb-build:
-#    if: false # TODO: Remove once we can run mongo
-#    name: "Build Mongodb Project"
-#    runs-on: ubuntu-24.04
-#    strategy:
-#      fail-fast: false
-#      matrix:
-#        java: [ 17, 21 ]
-#        mongodb-version: [ '4', '5', '6', '7', '8' ]
-#    steps:
-#      - name: "📥 Checkout the repository"
-#        uses: actions/checkout@v4
-#      - name: "☕️ Setup JDK"
-#        uses: actions/setup-java@v4
-#        with:
-#          java-version: ${{ matrix.java }}
-#          distribution: liberica
-#      - name: "🐘 Setup Gradle"
-#        uses: gradle/actions/setup-gradle@v4
-#        with:
-#          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:
-#          mongodb-version: ${{ matrix.mongodb-version }}
-#      - name: "🔨 Run Build"
-#        id: build
-#        env:
-#          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-#        run: ./gradlew cleanTest build --continue -PonlyMongodbTests
+  mongodb-build:
+    name: "Build Mongodb Project"
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 17, 21 ]
+        mongodb-version: [ '5', '6', '7', '8' ]
+    services:
+      mongodb:
+        image: mongo:${{ matrix.mongodb-version }}
+        ports:
+          - 27017:27017
+        options: >-
+          --health-cmd "mongosh --eval 'db.adminCommand(\"ping\")'"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    steps:
+      - name: "📥 Checkout the repository"
+        uses: actions/checkout@v4
+      - name: "☕️ Setup JDK"
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: liberica
+      - name: "🐘 Setup Gradle"
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
+      - name: "🔨 Run Build"
+        id: build
+        env:
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew cleanTest build --continue -PonlyMongodbTests
   hibernate5-build:
-    if: false # TODO: Remove after publishing to core
     name: "Build Hibernate5 Project"
     runs-on: ubuntu-24.04
     strategy:
@@ -93,7 +96,7 @@ jobs:
   publish:
     if: github.event_name == 'push'
     name: "Publish Snapshot"
-    #needs: [datastore-build, hibernate5-build, mongodb-build] # Fix once mongo db action is added
+    needs: [datastore-build, hibernate5-build, mongodb-build]
     runs-on: ubuntu-24.04
     steps:
       - name: "📥 Checkout the repository"
@@ -107,10 +110,10 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
         with:
           develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
-      - name: "📤 Publish Snapshot to repo.grails.org"
+      - name: "📤 Publish Snapshot artifacts"
         env:
           GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-          GRADLE_PUBLISH_RELEASE: 'false'
+          GRAILS_PUBLISH_RELEASE: 'false'
           MAVEN_PUBLISH_URL: ${{ secrets.GRAILS_NEXUS_PUBLISH_SNAPSHOT_URL }}
           MAVEN_PUBLISH_USERNAME: ${{ secrets.NEXUS_USER }}
           MAVEN_PUBLISH_PASSWORD: ${{ secrets.NEXUS_PW  }}
diff --git a/.github/workflows/groovy-joint-workflow.yml b/.github/workflows/groovy-joint-workflow.yml
index bc125c1c7a9..045a93af7bf 100644
--- a/.github/workflows/groovy-joint-workflow.yml
+++ b/.github/workflows/groovy-joint-workflow.yml
@@ -108,6 +108,16 @@ jobs:
     name: "Build Project"
     needs: build_groovy
     runs-on: ubuntu-latest
+    services:
+      mongodb:
+        image: mongo:8
+        ports:
+          - 27017:27017
+        options: >-
+          --health-cmd "mongosh --eval 'db.adminCommand(\"ping\")'"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
     steps:
       - name: "📥 Checkout project"
         uses: actions/checkout@v4
@@ -127,10 +137,6 @@ jobs:
           key: cache-local-maven-${{ github.sha }}
       - name: "🪶 Add mavenLocal repository to build"
         run: sed -i 's|// mavenLocal() // Keep|mavenLocal() // Keep|' build.gradle
-      - 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:
-          mongodb-version: '8'
       - name: "🔨 Build and test the project using the locally built Groovy snapshot"
         env:
           GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
diff --git a/gradle/example-config.gradle b/gradle/example-config.gradle
index c94729090f4..44ab77b17be 100644
--- a/gradle/example-config.gradle
+++ b/gradle/example-config.gradle
@@ -1,3 +1,17 @@
 tasks.withType(Groovydoc).configureEach {
     enabled = false
+}
+
+tasks.matching { 'bootJar' == it.name }.configureEach {
+    // Workaround for:
+    // Execution failed for task ':core-examples-functional-test-app:bootJar'.
+    // > Entry BOOT-INF/lib/grails-web-databinding-7.0.0-SNAPSHOT.jar is a duplicate but no duplicate handling strategy has been set. Please refer to https://docs.gradle.org/8.12.1/dsl/org.gradle.api.tasks.Copy.html#org.gradle.api.tasks.Copy:duplicatesStrategy for details.
+    enabled = false
+}
+
+tasks.matching { 'assetCompile' == it.name }.configureEach {
+    // Workaround for: https://github.com/bertramdev/asset-pipeline/issues/177
+    // Execution failed for task ':cas-examples-spring-security-cas-test1:assetCompile'.
+    // > java.util.ConcurrentModificationException (no error message)
+    outputs.dir rootProject.layout.buildDirectory.dir('asset-serialize')
 }
\ No newline at end of file
diff --git a/grails-data-graphql/core/build.gradle b/grails-data-graphql/core/build.gradle
index d187e330036..d1f961db10f 100644
--- a/grails-data-graphql/core/build.gradle
+++ b/grails-data-graphql/core/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     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.apache.grails:grails-views-gson:2.3.2'
     api 'org.javassist:javassist:3.29.2-GA'
 
     codenarc "org.codenarc:CodeNarc:$codenarcVersion"
diff --git a/grails-data-graphql/examples/grails-docs-app/build.gradle b/grails-data-graphql/examples/grails-docs-app/build.gradle
index e8f192d7e3e..4636e61a780 100644
--- a/grails-data-graphql/examples/grails-docs-app/build.gradle
+++ b/grails-data-graphql/examples/grails-docs-app/build.gradle
@@ -1,9 +1,7 @@
 dependencies {
     implementation "org.springframework.boot:spring-boot-starter-logging"
     implementation "org.springframework.boot:spring-boot-autoconfigure"
-    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-core"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
     implementation "org.apache.grails:grails-url-mappings"
@@ -15,21 +13,21 @@ dependencies {
     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.apache.grails:grails-cache"
     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.apache.grails:grails-views-gson"
     implementation "org.apache.grails:grails-data-mongodb-gson-templates"
     implementation 'io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.2.0'
     console "org.apache.grails:grails-console"
-    profile "org.grails.profiles:rest-api"
+    profile "org.apache.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 project(':grails-testing-support-datamapping')
-    testImplementation "org.grails:grails-web-testing-support"
+    testImplementation "org.apache.grails:grails-testing-support-web"
 
     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 6a3c17f84b3..f112b5aaa82 100644
--- a/grails-data-graphql/examples/grails-multi-datastore-app/build.gradle
+++ b/grails-data-graphql/examples/grails-multi-datastore-app/build.gradle
@@ -5,9 +5,7 @@ repositories {
 dependencies {
     implementation "org.springframework.boot:spring-boot-starter-logging"
     implementation "org.springframework.boot:spring-boot-autoconfigure"
-    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-core"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
     implementation "org.apache.grails:grails-url-mappings"
@@ -19,17 +17,17 @@ dependencies {
     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.apache.grails:grails-cache"
     implementation "org.apache.grails:grails-async"
     implementation "org.apache.grails:grails-data-hibernate5"
     implementation "org.hibernate:hibernate-core:$hibernateCoreVersion"
     implementation "org.apache.grails:grails-data-mongodb"
-    implementation "org.grails.plugins:views-json"
+    implementation "org.apache.grails:grails-views-gson"
     implementation 'io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.2.0'
     implementation "org.apache.grails:grails-data-mongodb-gson-templates"
     implementation "com.graphql-java:graphql-java:$graphqlJavaVersion"
     console "org.apache.grails:grails-console"
-    profile "org.grails.profiles:rest-api"
+    profile "org.apache.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"
@@ -37,7 +35,7 @@ dependencies {
     implementation "org.apache.tomcat:tomcat-jdbc"
     compileOnly "org.apache.grails:grails-testing-support-datamapping"
     compileOnly "org.apache.grails:grails-geb"
-    compileOnly "org.grails:grails-web-testing-support"
+    compileOnly "org.apache.grails:grails-testing-support-web"
     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"
diff --git a/grails-data-graphql/examples/grails-tenant-app/build.gradle b/grails-data-graphql/examples/grails-tenant-app/build.gradle
index bc86b9b3b4b..eb17f4a1d5e 100644
--- a/grails-data-graphql/examples/grails-tenant-app/build.gradle
+++ b/grails-data-graphql/examples/grails-tenant-app/build.gradle
@@ -1,9 +1,7 @@
 dependencies {
     implementation "org.springframework.boot:spring-boot-starter-logging"
     implementation "org.springframework.boot:spring-boot-autoconfigure"
-    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-core"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
     implementation "org.apache.grails:grails-url-mappings"
@@ -15,22 +13,22 @@ dependencies {
     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.apache.grails:grails-cache"
     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.apache.grails:grails-views-gson"
     implementation "org.apache.grails:grails-data-mongodb-gson-templates"
     implementation 'io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.2.0'
     console "org.apache.grails:grails-console"
-    profile "org.grails.profiles:rest-api"
+    profile "org.apache.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 project(':grails-testing-support-datamapping')
     testImplementation "org.apache.grails:grails-geb"
-    testImplementation "org.grails:grails-web-testing-support"
+    testImplementation "org.apache.grails:grails-testing-support-web"
     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"
diff --git a/grails-data-graphql/examples/grails-test-app/build.gradle b/grails-data-graphql/examples/grails-test-app/build.gradle
index 886158dd65e..2032051b0ef 100644
--- a/grails-data-graphql/examples/grails-test-app/build.gradle
+++ b/grails-data-graphql/examples/grails-test-app/build.gradle
@@ -1,9 +1,7 @@
 dependencies {
     implementation "org.springframework.boot:spring-boot-starter-logging"
     implementation "org.springframework.boot:spring-boot-autoconfigure"
-    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-core"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
     implementation "org.apache.grails:grails-url-mappings"
@@ -15,22 +13,22 @@ dependencies {
     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.apache.grails:grails-cache"
     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.apache.grails:grails-views-gson"
     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.apache.grails:grails-console"
-    profile "org.grails.profiles:rest-api"
+    profile "org.apache.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 project(':grails-testing-support-datamapping')
-    testImplementation "org.grails:grails-web-testing-support"
+    testImplementation "org.apache.grails:grails-testing-support-web"
     testImplementation "org.grails:grails-test-mixins:3.3.0"
 
     implementation project(":grails-plugin-gorm-graphql-plugin")
diff --git a/grails-data-graphql/examples/spring-boot-app/build.gradle b/grails-data-graphql/examples/spring-boot-app/build.gradle
index 5e83d9fb43b..c88c785594d 100644
--- a/grails-data-graphql/examples/spring-boot-app/build.gradle
+++ b/grails-data-graphql/examples/spring-boot-app/build.gradle
@@ -24,9 +24,7 @@ dependencies {
 		// exclude javax variant of hibernate-core
 		exclude group: 'org.hibernate', module: 'hibernate-core'
 	}
-	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-core"
 	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 1d4252250ff..e5a433bf984 100644
--- a/grails-data-graphql/plugin/build.gradle
+++ b/grails-data-graphql/plugin/build.gradle
@@ -1,26 +1,26 @@
 
 plugins {
-    id "org.grails.grails-plugin"
-    id "org.grails.plugins.views-json"
+    id "org.apache.grails.gradle.grails-plugin"
+    id "org.apache.grails.gradle.grails-gson"
 }
 
 dependencies {
     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'
+        exclude group: 'org.apache.grails', module: 'grails-converters'
     }
     api "org.apache.grails:grails-url-mappings"
-    api "org.grails.plugins:views-json:$viewsJsonVersion"
+    api "org.apache.grails:grails-views-gson:$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.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"
+    testImplementation "org.apache.grails:grails-testing-support-web"
     testImplementation "cglib:cglib-nodep:3.3.0"
-    profile "org.grails.profiles:web-plugin"
+    profile "org.apache.grails.profiles:web-plugin"
 
     api project(":gorm-graphql")
 }
diff --git a/grails-data-hibernate5/database-migration/build.gradle b/grails-data-hibernate5/database-migration/build.gradle
index a5cba94d094..b19506f8b4f 100644
--- a/grails-data-hibernate5/database-migration/build.gradle
+++ b/grails-data-hibernate5/database-migration/build.gradle
@@ -37,26 +37,15 @@ dependencies {
     compileOnly "org.springframework.boot:spring-boot-starter-logging"
     compileOnly "org.springframework.boot:spring-boot-autoconfigure"
     compileOnly project(":hibernate5-grails-plugin")
-    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:grails-core"
     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.apache.grails:grails-core", {
-        exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated
-    }
+    testImplementation "org.apache.grails:grails-core"
     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 "org.apache.grails:grails-testing-support-web"
     testImplementation "com.h2database:h2"
 }
 
diff --git a/grails-data-hibernate5/docs/build.gradle b/grails-data-hibernate5/docs/build.gradle
index 2c1de5b5019..a7298e42d07 100644
--- a/grails-data-hibernate5/docs/build.gradle
+++ b/grails-data-hibernate5/docs/build.gradle
@@ -27,9 +27,7 @@ dependencies {
     documentation 'org.apache.groovy:groovy-dateutil'
     documentation 'org.fusesource.jansi:jansi'
     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-core'
     documentation 'org.apache.grails:grails-spring'
     documentation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
     coreProjects.each {
diff --git a/grails-data-hibernate5/examples/grails-data-service/build.gradle b/grails-data-hibernate5/examples/grails-data-service/build.gradle
index a3c5284aa0b..e24c4007334 100644
--- a/grails-data-hibernate5/examples/grails-data-service/build.gradle
+++ b/grails-data-hibernate5/examples/grails-data-service/build.gradle
@@ -10,33 +10,8 @@ dependencies {
     implementation platform("org.apache.grails:grails-bom:$grailsVersion")
 
     implementation project(':hibernate5-grails-plugin')
-    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
-    }
+    implementation 'org.apache.grails:grails-core'
+    implementation 'org.apache.grails:grails-views-gson'
 
     compileOnly 'org.slf4j:slf4j-nop' // Remove warning during Gson views compilation
 
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 c5f76dc02df..90a36a8d51b 100644
--- a/grails-data-hibernate5/examples/grails-database-per-tenant/build.gradle
+++ b/grails-data-hibernate5/examples/grails-database-per-tenant/build.gradle
@@ -11,16 +11,9 @@ dependencies {
     implementation platform("org.apache.grails:grails-bom:$grailsVersion")
 
     implementation project(':hibernate5-grails-plugin')
-    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'
+    implementation 'org.apache.grails:grails-core'
+    implementation 'org.apache.grails:grails-rest-transforms'
+    implementation 'org.apache.grails:grails-gsp'
 
     runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
     runtimeOnly 'com.h2database:h2'
@@ -29,7 +22,7 @@ dependencies {
     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.apache.grails:grails-fields'
     runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
     runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
     runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
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 bf735c1a1f6..003f8bd97fe 100644
--- a/grails-data-hibernate5/examples/grails-hibernate-groovy-proxy/build.gradle
+++ b/grails-data-hibernate5/examples/grails-hibernate-groovy-proxy/build.gradle
@@ -9,9 +9,7 @@ dependencies {
     implementation platform("org.apache.grails:grails-bom:$grailsVersion")
 
     implementation project(':hibernate5-grails-plugin')
-    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-core'
     implementation "org.yakworks:hibernate-groovy-proxy:$yakworksHibernateGroovyProxyVersion", {
         exclude group: 'org.codehaus.groovy', module: 'groovy'
     }
diff --git a/grails-data-hibernate5/examples/grails-hibernate/build.gradle b/grails-data-hibernate5/examples/grails-hibernate/build.gradle
index 29571405989..bf575c42cd2 100644
--- a/grails-data-hibernate5/examples/grails-hibernate/build.gradle
+++ b/grails-data-hibernate5/examples/grails-hibernate/build.gradle
@@ -9,21 +9,13 @@ group = 'examples'
 
 dependencies {
     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.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'
+    implementation 'org.apache.grails:grails-core'
+    implementation 'org.apache.grails:grails-rest-transforms'
+    implementation 'org.apache.grails:grails-gsp'
 
     runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
     runtimeOnly 'com.h2database:h2'
@@ -32,7 +24,7 @@ dependencies {
     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.apache.grails:grails-fields'
     runtimeOnly "org.hibernate:hibernate-ehcache:$hibernateVersion", {
         // exclude javax variant of hibernate-core 5.6
         exclude group: 'org.hibernate', module: 'hibernate-core'
@@ -45,10 +37,7 @@ dependencies {
     runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
 
     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
+    testImplementation 'org.apache.grails:grails-testing-support-web'
 
     integrationTestImplementation testFixtures('org.apache.grails:grails-geb')
 }
diff --git a/grails-data-hibernate5/examples/grails-multiple-datasources/build.gradle b/grails-data-hibernate5/examples/grails-multiple-datasources/build.gradle
index 1a4ad05b0c6..708c2a6afec 100644
--- a/grails-data-hibernate5/examples/grails-multiple-datasources/build.gradle
+++ b/grails-data-hibernate5/examples/grails-multiple-datasources/build.gradle
@@ -17,9 +17,7 @@ dependencies {
     astTransformation 'org.apache.grails:grails-controllers'
 
     implementation project(':hibernate5-grails-plugin')
-    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-core'
     implementation 'org.apache.grails:grails-domain-class'
 
     runtimeOnly 'com.h2database:h2'
@@ -32,10 +30,7 @@ dependencies {
 
     testImplementation 'org.apache.grails.testing:grails-testing-support-core'
 
-    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
+    testRuntimeOnly 'org.apache.grails:grails-testing-support-web'
 }
 
 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 a0ecc0e9081..cec73b40c3c 100644
--- a/grails-data-hibernate5/examples/grails-partitioned-multi-tenancy/build.gradle
+++ b/grails-data-hibernate5/examples/grails-partitioned-multi-tenancy/build.gradle
@@ -11,16 +11,9 @@ dependencies {
     implementation platform("org.apache.grails:grails-bom:$grailsVersion")
 
     implementation project(':hibernate5-grails-plugin')
-    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'
+    implementation 'org.apache.grails:grails-core'
+    implementation 'org.apache.grails:grails-rest-transforms'
+    implementation 'org.apache.grails:grails-gsp'
 
     runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
     runtimeOnly 'com.h2database:h2'
@@ -29,7 +22,7 @@ dependencies {
     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.apache.grails:grails-fields'
     runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
     runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
     runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
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 a0ecc0e9081..cec73b40c3c 100644
--- a/grails-data-hibernate5/examples/grails-schema-per-tenant/build.gradle
+++ b/grails-data-hibernate5/examples/grails-schema-per-tenant/build.gradle
@@ -11,16 +11,9 @@ dependencies {
     implementation platform("org.apache.grails:grails-bom:$grailsVersion")
 
     implementation project(':hibernate5-grails-plugin')
-    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'
+    implementation 'org.apache.grails:grails-core'
+    implementation 'org.apache.grails:grails-rest-transforms'
+    implementation 'org.apache.grails:grails-gsp'
 
     runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
     runtimeOnly 'com.h2database:h2'
@@ -29,7 +22,7 @@ dependencies {
     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.apache.grails:grails-fields'
     runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
     runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
     runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
diff --git a/grails-data-hibernate5/examples/issue450/build.gradle b/grails-data-hibernate5/examples/issue450/build.gradle
index 5fbb9be075c..ffedc5716f1 100644
--- a/grails-data-hibernate5/examples/issue450/build.gradle
+++ b/grails-data-hibernate5/examples/issue450/build.gradle
@@ -11,16 +11,9 @@ dependencies {
     implementation platform("org.apache.grails:grails-bom:$grailsVersion")
 
     implementation project(':hibernate5-grails-plugin')
-    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'
+    implementation 'org.apache.grails:grails-core'
+    implementation 'org.apache.grails:grails-rest-transforms'
+    implementation 'org.apache.grails:grails-gsp'
 
     runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
     runtimeOnly 'com.h2database:h2'
@@ -29,7 +22,7 @@ dependencies {
     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.apache.grails:grails-fields'
     runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
     runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
     runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
diff --git a/grails-data-hibernate5/grails-plugin/build.gradle b/grails-data-hibernate5/grails-plugin/build.gradle
index 3ab7ca4f8aa..eb5b9884f1c 100644
--- a/grails-data-hibernate5/grails-plugin/build.gradle
+++ b/grails-data-hibernate5/grails-plugin/build.gradle
@@ -38,9 +38,7 @@ dependencies {
     }
 
     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.apache.grails:grails-core"
 
     compileOnly "org.spockframework:spock-core", {
         exclude group: "junit", module: "junit-dep"
diff --git a/grails-data-mongodb/examples/base/build.gradle b/grails-data-mongodb/examples/base/build.gradle
index 2b7b9c209a1..bd0566ed09d 100644
--- a/grails-data-mongodb/examples/base/build.gradle
+++ b/grails-data-mongodb/examples/base/build.gradle
@@ -10,23 +10,16 @@ dependencies {
     integrationTestImplementation platform("org.apache.grails:grails-bom:$grailsVersion")
 
     implementation project(':mongodb-grails-plugin')
-    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-core'
+    implementation 'org.apache.grails:grails-rest-transforms'
     implementation 'org.apache.grails.web:grails-web-boot'
-    implementation 'org.grails.plugins:gsp'
+    implementation 'org.apache.grails:grails-gsp'
 
     runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
     runtimeOnly 'org.fusesource.jansi:jansi'
     runtimeOnly 'org.apache.grails:grails-i18n'
     runtimeOnly 'org.apache.grails:grails-url-mappings'
-    runtimeOnly 'org.grails.plugins:scaffolding'
+    runtimeOnly 'org.apache.grails:grails-scaffolding'
     runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
     runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
     runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
@@ -38,5 +31,8 @@ dependencies {
     integrationTestImplementation testFixtures('org.apache.grails:grails-geb')
 }
 
-apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
-apply from: rootProject.layout.projectDirectory.file('gradle/mongodb-test-config.gradle')
+apply {
+    from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
+    from rootProject.layout.projectDirectory.file('gradle/mongodb-test-config.gradle')
+    from rootProject.layout.projectDirectory.file('gradle/example-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 769f7df8dc6..f51bdf20823 100644
--- a/grails-data-mongodb/examples/database-per-tenant/build.gradle
+++ b/grails-data-mongodb/examples/database-per-tenant/build.gradle
@@ -9,17 +9,10 @@ dependencies {
     implementation platform("org.apache.grails:grails-bom:$grailsVersion")
 
     implementation project(':mongodb-grails-plugin')
-    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-core'
+    implementation 'org.apache.grails:grails-rest-transforms'
     implementation 'org.apache.grails.web:grails-web-boot'
-    implementation 'org.grails.plugins:gsp'
+    implementation 'org.apache.grails:grails-gsp'
 
     runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
     runtimeOnly 'org.fusesource.jansi:jansi'
@@ -33,5 +26,8 @@ dependencies {
     testImplementation 'org.spockframework:spock-core'
 }
 
-apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
-apply from: rootProject.layout.projectDirectory.file('gradle/mongodb-test-config.gradle')
+apply {
+    from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
+    from rootProject.layout.projectDirectory.file('gradle/mongodb-test-config.gradle')
+    from rootProject.layout.projectDirectory.file('gradle/example-config.gradle')
+}
diff --git a/grails-data-mongodb/examples/gson-templates/build.gradle b/grails-data-mongodb/examples/gson-templates/build.gradle
index cc1e1bd186b..1c3c7d9b1aa 100644
--- a/grails-data-mongodb/examples/gson-templates/build.gradle
+++ b/grails-data-mongodb/examples/gson-templates/build.gradle
@@ -7,37 +7,13 @@ apply plugin: 'org.apache.grails.gradle.grails-web'
 dependencies {
     implementation platform("org.apache.grails:grails-bom:$grailsVersion")
 
-    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-core'
     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.apache.grails:grails-views-gson'
+    implementation 'org.apache.grails:grails-views-markup'
+    implementation 'org.apache.grails:grails-gsp'
     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-rest-transforms'
     implementation 'org.apache.grails:grails-url-mappings'
     implementation project(':mongodb-core')
 
@@ -51,5 +27,8 @@ dependencies {
     integrationTestImplementation 'org.apache.grails.testing:grails-testing-support-core'
 }
 
-apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
-apply from: rootProject.layout.projectDirectory.file('gradle/mongodb-test-config.gradle')
+apply {
+    from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
+    from rootProject.layout.projectDirectory.file('gradle/mongodb-test-config.gradle')
+    from rootProject.layout.projectDirectory.file('gradle/example-config.gradle')
+}
diff --git a/grails-data-mongodb/examples/hibernate5/build.gradle b/grails-data-mongodb/examples/hibernate5/build.gradle
index 57201152369..eed1609845e 100644
--- a/grails-data-mongodb/examples/hibernate5/build.gradle
+++ b/grails-data-mongodb/examples/hibernate5/build.gradle
@@ -10,29 +10,22 @@ dependencies {
     integrationTestImplementation platform("org.apache.grails:grails-bom:$grailsVersion")
 
     implementation project(':mongodb-grails-plugin')
-    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-core'
+    implementation 'org.apache.grails:grails-rest-transforms'
     implementation 'org.apache.grails.web:grails-web-boot'
-    implementation 'org.grails.plugins:gsp'
+    implementation 'org.apache.grails:grails-gsp'
     implementation project(':hibernate5-grails-plugin')
 
     runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.zaxxer:HikariCP'
     runtimeOnly 'org.fusesource.jansi:jansi'
-    runtimeOnly 'org.grails.plugins:scaffolding'
+    runtimeOnly 'org.apache.grails:grails-scaffolding'
     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"
+        exclude group: 'org.hibernate', module: 'hibernate-core'
     }
     runtimeOnly "org.jboss.spec.javax.transaction:jboss-transaction-api_1.3_spec:$jbossTransactionApiVersion", {
         // required for hibernate-ehcache to work with javax variant of hibernate-core excluded
@@ -49,5 +42,8 @@ dependencies {
     integrationTestImplementation testFixtures('org.apache.grails:grails-geb')
 }
 
-apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
-apply from: rootProject.layout.projectDirectory.file('gradle/mongodb-test-config.gradle')
\ No newline at end of file
+apply {
+    from rootProject.layout.projectDirectory.file('gradle/example-config.gradle')
+    from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
+    from rootProject.layout.projectDirectory.file('gradle/mongodb-test-config.gradle')
+}
\ No newline at end of file
diff --git a/grails-data-mongodb/examples/springboot/build.gradle b/grails-data-mongodb/examples/springboot/build.gradle
index 8a401174df2..03d59a09334 100644
--- a/grails-data-mongodb/examples/springboot/build.gradle
+++ b/grails-data-mongodb/examples/springboot/build.gradle
@@ -13,5 +13,8 @@ dependencies {
     testImplementation 'org.spockframework:spock-core'
 }
 
-apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
-apply from: rootProject.layout.projectDirectory.file('gradle/mongodb-test-config.gradle')
+apply {
+    from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
+    from rootProject.layout.projectDirectory.file('gradle/mongodb-test-config.gradle')
+    from rootProject.layout.projectDirectory.file('gradle/example-config.gradle')
+}
diff --git a/grails-data-mongodb/examples/test-data-service/build.gradle b/grails-data-mongodb/examples/test-data-service/build.gradle
index f731d03dbc7..bbe4d8b85a4 100644
--- a/grails-data-mongodb/examples/test-data-service/build.gradle
+++ b/grails-data-mongodb/examples/test-data-service/build.gradle
@@ -10,59 +10,13 @@ dependencies {
 
     implementation project(':mongodb-grails-plugin')
 
-    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-core'
+    implementation 'org.apache.grails:grails-rest-transforms'
     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
-    }
+    implementation "org.apache.grails:grails-spring-security:$grailsSpringSecurityVersion"
+    implementation "org.apache.grails:grails-spring-security-rest:$grailsSpringSecurityVersion"
+    implementation 'org.apache.grails:grails-views-gson'
 
     runtimeOnly 'org.apache.grails:grails-i18n'
     runtimeOnly 'org.apache.grails:grails-url-mappings'
@@ -75,5 +29,8 @@ dependencies {
     integrationTestImplementation 'org.spockframework:spock-core'
 }
 
-apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
-apply from: rootProject.layout.projectDirectory.file('gradle/mongodb-test-config.gradle')
+apply {
+    from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
+    from rootProject.layout.projectDirectory.file('gradle/mongodb-test-config.gradle')
+    from rootProject.layout.projectDirectory.file('gradle/example-config.gradle')
+}
diff --git a/grails-data-mongodb/gson-templates/build.gradle b/grails-data-mongodb/gson-templates/build.gradle
index cdb8967b6b8..35848ce7859 100644
--- a/grails-data-mongodb/gson-templates/build.gradle
+++ b/grails-data-mongodb/gson-templates/build.gradle
@@ -17,33 +17,7 @@ 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
+    api 'org.apache.grails:grails-views-gson'
 
     implementation project(':mongodb-core')
     implementation project(':mongodb-bson')
diff --git a/grails-data-neo4j/build.gradle b/grails-data-neo4j/build.gradle
index 5ad59289440..926fe2cec07 100644
--- a/grails-data-neo4j/build.gradle
+++ b/grails-data-neo4j/build.gradle
@@ -12,7 +12,7 @@ buildscript {
     }
 }
 
-group "org.grails"
+group "org.apache.grails"
 version project.projectVersion
 println "GORM VERSION = ${project.datastoreVersion}"
 
@@ -95,7 +95,7 @@ subprojects { subproject ->
 
         if (isGrails3Example) {
             apply plugin: 'org.apache.grails.gradle.grails-web'
-            apply plugin:"org.grails.grails-gsp"
+            apply plugin:"org.apache.grails.gradle.grails-gsp"
 
             if (usesGeb) {
                 apply plugin:"com.github.erdi.webdriver-binaries"
@@ -182,10 +182,10 @@ subprojects { subproject ->
     }
        
     if (isPluginProject) {
-        group "org.grails.plugins"
+        group "org.apache.grails"
         version( rootProject.version )
     } else {
-        group "org.grails"
+        group "org.apache.grails.data"
         version rootProject.version
     }
 
@@ -214,7 +214,7 @@ subprojects { subproject ->
     configurations.all {
         resolutionStrategy.eachDependency { DependencyResolveDetails details ->
             def dependencyName = details.requested.name
-            if (details.requested.group == 'org.grails' &&
+            if (details.requested.group == 'org.apache.grails.data' &&
                     details.requested.name in ['grails-datastore-core',
                                                'grails-datastore-async',
                                                'grails-datamapping-core',
diff --git a/grails-data-neo4j/docs/build.gradle b/grails-data-neo4j/docs/build.gradle
index 11b0f4ccf6e..facf36d8e7e 100644
--- a/grails-data-neo4j/docs/build.gradle
+++ b/grails-data-neo4j/docs/build.gradle
@@ -40,7 +40,7 @@ dependencies {
     documentation "org.codehaus.groovy:groovy-dateutil:$groovyVersion"
     documentation "com.github.javaparser:javaparser-core:$javaParserCoreVersion"
     for (p in coreProjects) {
-        documentation "org.grails:grails-datastore-$p:$datastoreVersion"
+        documentation "org.apache.grails:grails-datastore-$p:$datastoreVersion"
     }
     project.rootProject.subprojects.each { subproject ->
         if (subproject.name != "docs" && !subproject.name.startsWith('examples')) {
diff --git a/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle b/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle
index a3811160649..c2a86f54558 100644
--- a/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle
+++ b/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle
@@ -1,6 +1,6 @@
 group "examples"
-configurations.all { Configuration c ->
-    c.exclude(group:'org.grails',module:'grails-datastore-simple')
+configurations.configureEach {
+    exclude group: 'org.apache.grails', module: 'grails-data-simple'
 }
 
 dependencies {
@@ -9,9 +9,7 @@ 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.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-core:$grailsVersion"
     implementation "org.apache.grails:grails-dependencies:$grailsVersion"
     implementation "org.apache.grails.web:grails-web-boot:$grailsVersion"
 
@@ -20,12 +18,12 @@ dependencies {
     implementation "org.hibernate:hibernate-ehcache:$hibernateEhcacheVersion"
 
     runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
-    runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
-    runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
+    runtimeOnly "org.apache.grails:grails-scaffolding:$scaffoldingVersion"
+    runtimeOnly "org.apache.grails:grails-fields:$fieldsVersion"
     runtimeOnly "org.apache.tomcat:tomcat-jdbc:9.0.36"
 
     testImplementation project(':grails-testing-support-datamapping')
-    testImplementation ("org.grails:grails-web-testing-support:$testingSupportVersion") {
+    testImplementation ("org.apache.grails:grails-testing-support-web:$testingSupportVersion") {
         exclude group: "org.spockframework", module: "spock-core"
     }
 
diff --git a/grails-data-neo4j/examples/grails3-neo4j/build.gradle b/grails-data-neo4j/examples/grails3-neo4j/build.gradle
index 2fb3f2afa73..9f89dc4c865 100644
--- a/grails-data-neo4j/examples/grails3-neo4j/build.gradle
+++ b/grails-data-neo4j/examples/grails3-neo4j/build.gradle
@@ -1,6 +1,6 @@
 group "examples"
-configurations.all { Configuration c ->
-    c.exclude(group:'org.grails',module:'grails-datastore-simple')
+configurations.configureEach {
+    exclude group: 'org.apache.grails', module: 'grails-data-simple'
 }
 
 dependencies {
@@ -9,23 +9,21 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
     implementation "javax.servlet:javax.servlet-api:$servletApiVersion"
-    implementation "org.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-core"
     implementation "org.apache.grails:grails-dependencies:$grailsVersion"
     implementation "org.apache.grails.web:grails-web-boot:$grailsVersion"
 
     implementation project(":grails-plugin")
 
     runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
-    runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
-    runtimeOnly "org.grails.plugins:fields:$fieldsVersion"
+    runtimeOnly "org.apache.grails:grails-scaffolding:$scaffoldingVersion"
+    runtimeOnly "org.apache.grails:grails-fields:$fieldsVersion"
 
     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") {
+    testImplementation ("org.apache.grails:grails-testing-support-web:$testingSupportVersion") {
         exclude group: "org.spockframework", module: "spock-core"
     }
 
@@ -45,7 +43,7 @@ dependencies {
 
     testRuntimeOnly "org.neo4j.test:neo4j-harness:$neo4jVersion"
 
-    profile "org.grails.profiles:web"
+    profile "org.apache.grails.profiles:web"
 }
 
 tasks.withType(Test) {
diff --git a/grails-data-neo4j/examples/test-data-service/build.gradle b/grails-data-neo4j/examples/test-data-service/build.gradle
index 50d5eaf6a64..6c0c1861ca4 100644
--- a/grails-data-neo4j/examples/test-data-service/build.gradle
+++ b/grails-data-neo4j/examples/test-data-service/build.gradle
@@ -3,27 +3,25 @@ group "examples"
 dependencies {
     implementation "org.springframework.boot:spring-boot-starter-logging"
     implementation "org.springframework.boot:spring-boot-autoconfigure"
-    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-core"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
     implementation ("org.apache.grails:grails-dependencies") {
-        exclude module:'grails-datastore-simple'
+        exclude module:'grails-data-simple'
     }
     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.apache.grails:grails-cache"
     implementation "org.apache.grails:grails-events"
     implementation project(":grails-plugin")
-    implementation "org.grails.plugins:views-json"
-    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"
+    implementation "org.apache.grails:grails-views-gson"
+    implementation project(":mongodb-gson-templates")
+    implementation 'org.apache.grails:grails-spring-security-rest'
+    profile "org.apache.grails.profiles:rest-api"
     testImplementation project(':grails-testing-support-datamapping')
-    testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion"
+    testImplementation "org.apache.grails:grails-testing-support-web:$testingSupportVersion"
     testRuntimeOnly "org.neo4j.test:neo4j-harness:$neo4jVersion"
 }
diff --git a/grails-data-neo4j/grails-plugin/build.gradle b/grails-data-neo4j/grails-plugin/build.gradle
index a8ec1cd99bb..e9c6a3a9bb6 100644
--- a/grails-data-neo4j/grails-plugin/build.gradle
+++ b/grails-data-neo4j/grails-plugin/build.gradle
@@ -8,15 +8,15 @@ dependencyManagement {
     applyMavenExclusions false
 }
 
-configurations.all {
-    exclude(group:'org.grails',module:'grails-datastore-simple')
+configurations.configureEach {
+    exclude group: 'org.apache.grails.data', module: 'grails-data-simple'
     resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-        if (details.requested.group == 'org.grails'
+        if (details.requested.group == 'org.apache.grails.data'
                 && details.requested.name.startsWith('grails-datastore')
                 && !details.requested.name.contains('neo4j')) {
 
             details.useVersion(datastoreVersion)
-        } else if (details.requested.group == 'org.codehaus.groovy' && details.requested.name.startsWith('groovy')) {
+        } else if (details.requested.group == 'org.apache.groovy' && details.requested.name.startsWith('groovy')) {
             details.useVersion(groovyVersion)
         } else if (details.requested.group == 'org.springframework') {
             details.useVersion(springVersion)
@@ -25,9 +25,7 @@ configurations.all {
 }
 
 dependencies {
-    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:grails-core"
     compileOnly "org.apache.grails.bootstrap:grails-bootstrap"
     compileOnly "org.spockframework:spock-core:$spockVersion", {
         exclude group: "junit", module: "junit-dep"
@@ -42,9 +40,9 @@ dependencies {
         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.bootstrap', 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'
     }
     api project(":grails-datastore-gorm-neo4j"), {
@@ -52,15 +50,13 @@ dependencies {
         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.bootstrap', 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'
     }
 
-    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:grails-core"
     testImplementation "org.apache.grails.bootstrap:grails-bootstrap"
     testImplementation "org.neo4j.test:neo4j-harness:$neo4jVersion"
 
diff --git a/grails-datamapping-core-test/build.gradle b/grails-datamapping-core-test/build.gradle
index 214b117702e..b924d7a100d 100644
--- a/grails-datamapping-core-test/build.gradle
+++ b/grails-datamapping-core-test/build.gradle
@@ -86,7 +86,6 @@ 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-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CustomAutoTimestampSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CustomAutoTimestampSpec.groovy
index 0aa41abb3ed..15407af28d6 100644
--- a/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CustomAutoTimestampSpec.groovy
+++ b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CustomAutoTimestampSpec.groovy
@@ -30,7 +30,7 @@ class CustomAutoTimestampSpec extends GormDatastoreSpec {
 
             then:"the custom lastUpdated property is updated and dateCreated is not"
             r.modified != null && previousModified < r.modified
-            previousCreated == r.created
+            previousCreated.time == r.created.time
     }
 
     void "Test when the auto timestamp properties are already set, they are overwritten"() {
@@ -57,7 +57,7 @@ class CustomAutoTimestampSpec extends GormDatastoreSpec {
 
         then:"the custom lastUpdated property is updated and dateCreated is not"
         r.modified != null && previousModified < r.modified
-        previousCreated == r.created
+        previousCreated.time == r.created.time
     }
 
     void "Test when the auto timestamp properties are already set, they are not overwritten if config is set"() {
@@ -75,8 +75,8 @@ class CustomAutoTimestampSpec extends GormDatastoreSpec {
         r = RecordCustom.get(r.id)
 
         then:"the custom lastUpdated and dateCreated are not overwritten"
-        now == r.modified
-        now == r.created
+        now.time == r.modified.time
+        now.time == r.created.time
 
         when:"An entity is modified"
         Date previousCreated = r.created
@@ -88,7 +88,7 @@ class CustomAutoTimestampSpec extends GormDatastoreSpec {
 
         then:"the custom lastUpdated property is updated and dateCreated is not"
         r.modified != null && previousModified < r.modified
-        previousCreated == r.created
+        previousCreated.time == r.created.time
     }
 
     @Override
diff --git a/grails-datamapping-core/build.gradle b/grails-datamapping-core/build.gradle
index f808f3bca5a..7712e714e1d 100644
--- a/grails-datamapping-core/build.gradle
+++ b/grails-datamapping-core/build.gradle
@@ -74,7 +74,6 @@ dependencies {
 
     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-datamapping-support/build.gradle b/grails-datamapping-support/build.gradle
index 0dffb55d474..587f04dbc7f 100644
--- a/grails-datamapping-support/build.gradle
+++ b/grails-datamapping-support/build.gradle
@@ -55,7 +55,6 @@ 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
diff --git a/grails-datamapping-tck-domains/build.gradle b/grails-datamapping-tck-domains/build.gradle
index fb27ab9c484..a48b04892ab 100644
--- a/grails-datamapping-tck-domains/build.gradle
+++ b/grails-datamapping-tck-domains/build.gradle
@@ -64,7 +64,6 @@ 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-datamapping-support'), {
diff --git a/grails-testing-support-datamapping/build.gradle b/grails-testing-support-datamapping/build.gradle
index 8e35e5af127..fb8e106b3ff 100755
--- a/grails-testing-support-datamapping/build.gradle
+++ b/grails-testing-support-datamapping/build.gradle
@@ -108,7 +108,6 @@ 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/settings.gradle b/settings.gradle
index 1229d42d142..62bcb0c73ef 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -89,35 +89,35 @@ include 'hibernate5-boot-plugin'
 findProject(':hibernate5-boot-plugin').projectDir = new File(settingsDir, 'grails-data-hibernate5/boot-plugin')
 
 // 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')
+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-bson"
@@ -144,22 +144,20 @@ 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-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")
+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")
 
+include 'mongodb-examples-gson-templates'
+project(":mongodb-examples-gson-templates").projectDir = new File(settingsDir, "grails-data-mongodb/examples/gson-templates")