Merge Mongodb & Hibernate5

.github/workflows/gradle.yml

@@ -7,16 +7,17 @@ on:
     branches:
       - '[7-9]+.[0-9]+.x'
 jobs:
-  build:
-    name: "Build Project"
+  datastore-build:
+    name: "Build Datastore Project"
     runs-on: ubuntu-24.04
     permissions:
       contents: read
       packages: read
     strategy:
       fail-fast: false
       matrix:
-        java: [17, 21]
+        java: [ 17, 21 ]
+        mongodb-version: [ '4', '5', '6', '7', '8' ]
     steps:
       - name: "📥 Checkout the repository"
         uses: actions/checkout@v4
@@ -29,15 +30,78 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
         with:
           develocity-access-key: ${{ secrets.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 build --continue -PonlyDatatstoreTests
+  mongodb-build:
+    name: "Build Mongodb Project"
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
+      packages: read
+    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.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 build --continue
+        run: ./gradlew build --continue -PonlyMongodbTests
+  hibernate5-build:
+    name: "Build Hibernate5 Project"
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
+      packages: read
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 17, 21 ]
+    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.DEVELOCITY_ACCESS_KEY }}
+      - name: "🔨 Run Build"
+        id: build
+        env:
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew build --continue -PonlyHibernate5Tests
   publish:
     if: github.event_name == 'push'
     name: "Publish Snapshot"
-    needs: build
+    needs: [datastore-build, hibernate5-build, mongodb-build]
     runs-on: ubuntu-24.04
     permissions:
       contents: read
@@ -97,7 +161,7 @@ jobs:
   trigger-build-gorm-impls:
     if: github.event_name == 'push'
     name: "Trigger Build in GORM Implementations"
-    needs: [build, publish]
+    needs: [datastore-build, mongodb-build, hibernate5-build, publish]
     runs-on: ubuntu-24.04
     continue-on-error: true
     steps:
@@ -111,14 +175,6 @@ jobs:
       - name: "📝 Create Snapshot Message for the Workflow Dispatch"
         id: dispatch_message
         run: echo "value={\"message\":\"New Data Mapping Snapshots $(date) - $GITHUB_SHA\"}" >> $GITHUB_OUTPUT
-      - name: "📡 Invoke the Java CI workflow in GORM Hibernate5"
-        uses: benc-uk/workflow-dispatch@e2e5e9a103e331dad343f381a29e654aea3cf8fc # v1.2.4 (Use commit sha as this is a 3rd party action)
-        continue-on-error: true
-        with:
-          workflow: Java CI
-          repo: grails/gorm-hibernate5
-          ref: ${{ steps.extract_branch.outputs.value }}
-          token: ${{ secrets.GH_TOKEN }}
       - name: "📡 Invoke the Java CI workflow in GORM Hibernate6"
         continue-on-error: true
         uses: benc-uk/workflow-dispatch@e2e5e9a103e331dad343f381a29e654aea3cf8fc # v1.2.4 (Use commit sha as this is a 3rd party action)
@@ -135,13 +191,4 @@ jobs:
           repo: grails/gorm-mongodb
           ref: ${{ steps.extract_branch.outputs.value }}
           token: ${{ secrets.GH_TOKEN }}
-          inputs: ${{ steps.dispatch_message.outputs.value }}
-      - name: "📡 Invoke the Java CI workflow in GORM Neo4j"
-        if: false # Skip until neo4j is ported to grails 7
-        continue-on-error: true
-        uses: benc-uk/workflow-dispatch@e2e5e9a103e331dad343f381a29e654aea3cf8fc # v1.2.4 (Use commit sha as this is a 3rd party action)
-        with:
-          workflow: Java CI
-          repo: grails/gorm-neo4j
-          ref: ${{ steps.extract_branch.outputs.value }}
-          token: ${{ secrets.GH_TOKEN }}
+          inputs: ${{ steps.dispatch_message.outputs.value }}

.github/workflows/groovy-joint-workflow.yml

@@ -127,6 +127,10 @@ 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 }}

.gitignore

@@ -1,31 +1,33 @@
+!gradle-wrapper.jar
+*.db
+*.iml
+*.ipr
+*.iws
+*.sha1
 *.swp
-.settings/
+*.zip
+.DS_Store
 .classpath
-.project
+.gradle
+.gradletasknamecache
+.idea
 .metadata
-.DS_Store
+.project
+.settings/
+Servers/
+bin/
 build/
-target/
-.gradle/
-grails-plugins/mongodb/web-app
+classes/
+eclipse-workspace/
+gradle-app.setting
 grails-plugins/checkout
-grails-plugins/redis/web-app
+grails-plugins/mongodb/grails-mongodb-1.0.0.RC5.zip.sha1
+grails-plugins/mongodb/web-app
 grails-plugins/neo4j/web-app
-eclipse-workspace/
-Servers/
+grails-plugins/redis/web-app
 out
-stacktrace.log
-*.iws
-*.iml
-*.ipr
-.idea/*
-classes/*
-bin/
-boot-plugins/*/.idea/*
-grails-plugins/mongodb/grails-mongodb-1.0.0.RC5.zip.sha1
+prodDb.mv.db
+secring.gpg
 spy.log
-*.db
-
-*.sha1
-
-*.zip
+stacktrace.log
+target/

DEVELOPMENT.md

@@ -0,0 +1,10 @@
+# Various properties that control which tests run
+* onlyHibernate5Tests 
+* onlyMongodbTests
+* onlyDatastoreTests
+* skipHibernate5Tests
+* skipMongodbTests
+* skipDatastoreTests
+
+# Start a mongo docker container
+docker run -d  --name mongo-on-docker  -p 27017:27017 mongo

build.gradle

@@ -65,12 +65,30 @@ def publishedProjects = [
         'grails-datastore-gorm-validation',
         'grails-datastore-web',
         'grails-gorm-testing-support',
+        'database-migration-hibernate5',
+        'gorm-hibernate5-spring-boot',
+        'grails-datastore-gorm-hibernate5',
+        'hibernate5-grails-plugin',
+        'gorm-mongodb-spring-boot',
+        'grails-datastore-gorm-bson',
+        'grails-datastore-gorm-mongodb',
+        'grails-datastore-gorm-mongodb-ext',
+        'mongodb-grails-plugin',
+        'views-json-templates'
 ]
-subprojects {
+subprojects { Project subproject ->
     if (name in publishedProjects) {
         // This has to be applied here
         apply plugin: 'org.grails.grails-publish'
     }
+
+    // asset-pipeline #177 work around for parallel builds
+    subproject.afterEvaluate {
+        Task assetTask = subproject.tasks.findByName('assetCompile')
+        if(assetTask) {
+            assetTask.outputs.dir rootProject.layout.buildDirectory.dir("asset-serialize")
+        }
+    }
 }
 
-apply from: layout.projectDirectory.file('gradle/documentation-config.gradle')
+apply from: layout.projectDirectory.file('gradle/documentation-config.gradle')

buildSrc/build.gradle

@@ -8,7 +8,7 @@ file('../gradle.properties').withInputStream {
 }
 
 repositories {
-    mavenLocal()
+//    mavenLocal()
     maven { url = 'https://repo.grails.org/grails/core' }
     mavenCentral()
     if (System.getenv('GITHUB_MAVEN_PASSWORD')) {
@@ -25,5 +25,6 @@ repositories {
 dependencies {
     implementation platform("org.grails:grails-bom:${versions.getProperty('grailsVersion')}")
     implementation 'org.grails:grails-gradle-plugin'
-    runtimeOnly 'io.github.gradle-nexus:publish-plugin:2.0.0'
+    runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-gradle'
+    runtimeOnly 'org.grails.plugins:views-gradle'
 }

gradle.properties

@@ -1,15 +1,26 @@
 projectVersion=9.0.0-SNAPSHOT
-
 grailsVersion=7.0.0-SNAPSHOT
 javaVersion=17
 
 asciidoctorVersion=4.0.4
+testcontainersMongodbVersion=1.20.1
 commonsValidatorVersion=1.9.0
 hibernateVersion=5.6.15.Final
+grailsSpringSecurityVersion=7.0.0-SNAPSHOT
+jbossTransactionApiVersion=2.0.0.Final
+liquibaseHibernate5Version=4.27.0
+yakworksHibernateGroovyProxyVersion=1.1
 jakartaElVersion=4.0.0
 jakartaElGlassfishImplVersion=4.0.2
 javassistVersion=3.30.2-GA
+micronautPlatformVersion=4.6.3
+picocliVersion=4.7.6
+
+# This prevents the Grails Gradle Plugin from unnecessarily excluding slf4j-simple in the generated POMs
+# https://github.com/grails/grails-gradle-plugin/issues/222
+slf4jPreventExclusion=true
 
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.daemon=true
+org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1536M -XX:MaxMetaspaceSize=512M

gradle/documentation-config.gradle

@@ -56,10 +56,25 @@ tasks.register('data-mapping-groovydoc', Groovydoc) {
     }
 }
 
+tasks.register('copyGormImplementationDocs', Copy) {
+    dependsOn(':grails-data-hibernate5-docs:docs', ':grails-data-mongodb-docs:docs')
+
+    def hibernate5SourceDir =  project(':hibernate5-docs').layout.buildDirectory.dir('docs')
+    def mongodbSourceDir =  project(':mongodb-docs').layout.buildDirectory.dir('docs')
+    def targetDir = rootProject.layout.buildDirectory.dir('docs')
+
+    from(hibernate5SourceDir, mongodbSourceDir)
+    into(targetDir)
+
+    inputs.dir(hibernate5SourceDir)
+    inputs.dir(mongodbSourceDir)
+    outputs.dir(targetDir)
+}
+
 tasks.register('docs') {
     group = 'documentation'
     dependsOn(':data-mapping-groovydoc')
-    finalizedBy('copyRootWebsite','copyGuides')
+    finalizedBy('copyRootWebsite','copyGuides', 'copyGormImplementationDocs')
 }
 
 tasks.register('copyRootWebsite', Copy) {

gradle/example-config.gradle

@@ -0,0 +1,3 @@
+tasks.withType(Groovydoc).configureEach {
+    enabled = false
+}

gradle/hibernate5-test-config.gradle

@@ -0,0 +1,53 @@
+dependencies {
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+}
+
+tasks.withType(Test).configureEach {
+    onlyIf {
+        if(project.hasProperty('skipHibernate5Tests')) {
+            return false
+        }
+
+        if(project.hasProperty('onlyMongodbTests')) {
+            return false
+        }
+
+        if(project.hasProperty('onlyDatastoreTests')) {
+            return false
+        }
+
+        true
+    }
+
+    useJUnitPlatform()
+    systemProperty('hibernate5.gorm.suite', System.getProperty('hibernate5.gorm.suite') ?: true)
+    reports.html.required = !System.getenv('CI')
+    reports.junitXml.required = !System.getenv('CI')
+    testLogging {
+        events('passed', 'skipped', 'failed')
+        showExceptions = true
+        exceptionFormat = 'full'
+        showCauses = true
+        showStackTraces = true
+
+        // set options for log level DEBUG and INFO
+        debug {
+            events('started', 'passed', 'skipped', 'failed', 'standardOut', 'standardError')
+            exceptionFormat = 'full'
+        }
+        info.events = debug.events
+        info.exceptionFormat = debug.exceptionFormat
+    }
+    afterTest { desc, result ->
+        logger.quiet(' -- Executed test {} [{}] with result: {}', desc.name, desc.className, result.resultType)
+    }
+    afterSuite { desc, result ->
+        if (!desc.parent) { // will match the outermost suite
+            def output = "Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} successes, ${result.failedTestCount} failures, ${result.skippedTestCount} skipped)"
+            def startItem = '|  ', endItem = '  |'
+            def repeatLength = startItem.length() + output.length() + endItem.length()
+            def dashes = '-' * repeatLength
+            logger.quiet('\n{}\n{}{}{}\n{}', dashes, startItem, output, endItem, dashes)
+        }
+    }
+}