Update hibernate core (major) - autoclosed

.github/dependabot.yml

@@ -6,14 +6,14 @@ updates:
       interval: "daily"
     labels:
       - "type: dependency upgrade"
-- package-ecosystem: gradle
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-  target-branch: 7.0.x
-  ignore:
-  - dependency-name: com.gradle.build-scan
-    versions:
-    - 3.5.1
-    - "3.6"
+  - package-ecosystem: gradle
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    target-branch: 7.0.x
+    ignore:
+    - dependency-name: com.gradle.build-scan
+      versions:
+      - 3.5.1
+      - "3.6"

.github/workflows/docs.yml

@@ -0,0 +1,58 @@
+name: Publish Docs
+on:
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: 'The Tag or Branch Name'
+        required: true
+jobs:
+  docs:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: ['11']
+    env:
+      GIT_USER_NAME: puneetbehl
+      GIT_USER_EMAIL: [email protected]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.GH_TOKEN }}
+          ref: ${{github.event.inputs.ref}}
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'adopt'
+          java-version: ${{ matrix.java }}
+      - name: Publish Documentation
+        id: docs
+        uses: gradle/gradle-build-action@v2
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
+        with:
+          arguments: docs:docs
+      - name: Determine docs target repository
+        if: success()
+        uses: haya14busa/action-cond@v1
+        id: docs_target
+        with:
+          cond: ${{ github.repository == 'grails/gorm-hibernate5' }}
+          if_true: "grails/grails-data-mapping"
+          if_false: ${{ github.repository }}
+      - name: Publish to Github Pages
+        if: success()
+        uses: micronaut-projects/github-pages-deploy-action@master
+        env:
+          BETA: ${{ contains(steps.release_version.outputs.release_version, 'M') || contains(steps.release_version.outputs.release_version, 'RC') }}
+          TARGET_REPOSITORY: ${{ steps.docs_target.outputs.value }}
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          BRANCH: gh-pages
+          FOLDER: docs/build/docs
+          DOC_SUB_FOLDER: hibernate
+          DOC_FOLDER: gh-pages
+          COMMIT_EMAIL: [email protected]
+          COMMIT_NAME: Puneet Behl
+          VERSION: ${{ steps.release_version.outputs.release_version }}

.github/workflows/gradle.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['8', '11', '14']
+        java: ['11', '14']
     env:
       WORKSPACE: ${{ github.workspace }}
       GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8
@@ -41,6 +41,7 @@ jobs:
         with:
           arguments: check -Dgeb.env=chromeHeadless
         env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
       - name: Run Build
@@ -64,6 +65,9 @@ jobs:
         uses: gradle/gradle-build-action@v2
         if: steps.build.outcome == 'success' && github.event_name == 'push' && matrix.java == '8'
         env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
           ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
         with:
@@ -72,6 +76,10 @@ jobs:
         id: docs
         if: steps.build.outcome == 'success' && github.event_name == 'push' && matrix.java == '8'
         uses: gradle/gradle-build-action@v2
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
         with:
           arguments: docs:docs
       - name: Determine docs target repository

.github/workflows/release.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['8']
+        java: ['11']
     env:
       GIT_USER_NAME: puneetbehl
       GIT_USER_EMAIL: [email protected]
@@ -29,22 +29,35 @@ jobs:
         uses: micronaut-projects/github-actions/pre-release@master
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Generate secring file
+        env:
+          SECRING_FILE: ${{ secrets.SECRING_FILE }}
+        run: echo $SECRING_FILE | base64 -d > ${{ github.workspace }}/secring.gpg
       - name: Publish to Sonatype OSSRH
+        id: publish
+        uses: gradle/gradle-build-action@v2
         env:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
-          ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-          ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
           SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
           SECRING_FILE: ${{ secrets.SECRING_FILE }}
-        run: |
-          echo $SECRING_FILE | base64 -d > secring.gpg
-          echo "Publishing Artifacts"
-          (set -x; ./gradlew -Psigning.secretKeyRingFile="${GITHUB_WORKSPACE}/secring.gpg" publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon)
-          echo "Publishing Documentation"
-          ./gradlew docs:docs
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
+        with:
+          arguments: -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg publishToSonatype closeAndReleaseSonatypeStagingRepository
+      - name: Publish Documentation
+        id: docs
+        if: steps.publish.outcome == 'success'
+        uses: gradle/gradle-build-action@v2
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
+        with:
+          arguments: docs:docs
       - name: Export Gradle Properties
         uses: micronaut-projects/github-actions/export-gradle-properties@master
       - name: Determine docs target repository

build.gradle

@@ -6,13 +6,11 @@ buildscript {
     dependencies {
         classpath "org.codehaus.groovy.modules.http-builder:http-builder:0.7.2"
         classpath "io.github.gradle-nexus:publish-plugin:1.3.0"
-        classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
         classpath "io.github.groovylang.groovydoc:groovydoc-gradle-plugin:1.0.1"
         classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
         classpath "org.grails.plugins:views-gradle:2.3.2"
-        classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.6.1'
-        classpath "gradle.plugin.com.energizedwork.webdriver-binaries:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion"
-        classpath "org.gradle:test-retry-gradle-plugin:1.5.2"
+        classpath("org.asciidoctor:asciidoctor-gradle-jvm:4.0.0-alpha.1")
+        classpath "com.github.erdi:webdriver-binaries-gradle-plugin:3.0"
     }
 }
 
@@ -88,7 +86,7 @@ subprojects { Project subproject ->
             if (subproject.name != "examples-grails-data-service") {
                 apply plugin:"org.grails.grails-web"
                 apply plugin:"org.grails.grails-gsp"
-                apply plugin:"com.energizedwork.webdriver-binaries"
+                apply plugin:"com.github.erdi.webdriver-binaries"
             }
         }
 
@@ -121,7 +119,7 @@ subprojects { Project subproject ->
         }
 
         dependencies {
-            testImplementation "io.projectreactor:reactor-test:3.5.5"
+            testImplementation "io.projectreactor:reactor-test:3.5.6"
             testImplementation "org.codehaus.groovy:groovy-test-junit5:$groovyVersion"
             testImplementation("org.spockframework:spock-core:$spockVersion") { transitive = false}
             testImplementation "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
@@ -130,6 +128,10 @@ subprojects { Project subproject ->
         }
 
         apply from: "${rootProject.projectDir}/gradle/testVerbose.gradle"
+
+        tasks.withType(Jar) {
+            duplicatesStrategy = DuplicatesStrategy.INCLUDE
+        }
         return
     }
 
@@ -201,20 +203,19 @@ subprojects { Project subproject ->
     }
     else {
         apply plugin:"groovy"
-        apply plugin: 'com.bmuschko.nexus'
-
-        modifyPom {
-            delegate.project pomInfo
-        }
     }
 
     apply plugin: 'java-library'
     apply plugin: 'maven-publish'
     apply plugin: 'signing'
-    apply plugin: "org.gradle.test-retry"
 
-    sourceCompatibility = "1.8"
-    targetCompatibility = "1.8"
+    sourceCompatibility = "1.11"
+    targetCompatibility = "1.11"
+
+    java {
+        withJavadocJar()
+        withSourcesJar()
+    }
 
     dependencies {
         documentation "org.fusesource.jansi:jansi:$jansiVersion"
@@ -269,25 +270,46 @@ subprojects { Project subproject ->
 
         publications {
             maven(MavenPublication) {
+
+                pom {
+                    name = projectInfo.projectName
+                    description = projectInfo.projectDescription
+                    url = projectInfo.projectURL
+
+                    licenses {
+                        license {
+                            name = 'The Apache Software License, Version 2.0'
+                            url = 'https://www.apache.org/licenses/LICENSE-2.0.txt'
+                            distribution = 'repo'
+                        }
+                    }
+
+                    scm {
+                        url = 'scm:[email protected]:grails/gorm-hibernate5.git'
+                        connection = 'scm:[email protected]:grails/gorm-hibernate5.git'
+                        developerConnection = 'scm:[email protected]:grails/gorm-hibernate5.git'
+                    }
+
+                    developers {
+                        developer {
+                            id = 'puneetbehl'
+                            name = 'Puneet Behl'
+                            email = '[email protected]'
+                        }
+                    }
+                }
+
                 artifactId projectInfo.projectArtifactId
 
                 from components.java
-                afterEvaluate {
-                    artifact source: sourcesJar, classifier: "sources"
-                    artifact source: javadocJar, classifier: "javadoc"
 
+                afterEvaluate {
                     if(isGrails3PluginProject) {
                         artifact source:"${sourceSets.main.groovy.outputDir}/META-INF/grails-plugin.xml",
                                 classifier:"plugin",
                                 extension:'xml'
                     }
                 }
-                pom.withXml {
-                    def xml = asNode()
-                    def dependency = xml.dependencies.find { dep -> dep.artifactId == 'slf4j-simple' }
-                    dependency?.optional = true
-                    xml.children().last() + pomInfo
-                }
 
             }
         }

docs/build.gradle

@@ -1,6 +1,8 @@
 ext {
-    githubBranch = "7.3.x"
+    githubBranch = "8.0.x"
     checkOutDir = "build/checkout"
+    explicitGormSrc = System.getProperty("gorm.src") ?: (project.hasProperty('gorm.src') ? project.getProperty("gorm.src") : null)
+    gormSrc = explicitGormSrc ? file(explicitGormSrc).absolutePath : "$checkOutDir/gorm-src"
     zipFile = "build/source.zip"
 
     coreProjects = [
@@ -12,8 +14,8 @@ ext {
 
 version rootProject.version
 
-apply plugin: 'org.asciidoctor.convert'
 apply plugin: 'groovy'
+apply plugin: 'org.asciidoctor.jvm.convert'
 
 configurations.all {
     resolutionStrategy.eachDependency { DependencyResolveDetails details ->
@@ -64,32 +66,30 @@ asciidoctor {
                 'sourcedir'     : "${project.projectDir}/src/main/groovy"
 }
 
-asciidoctorj {
-    version = '1.5.4'
-}
-
 task fetchSource {
-    doLast {
-        ant.mkdir dir: project.buildDir
-        ant.mkdir dir: checkOutDir
+    outputs.dir layout.buildDirectory.dir('checkout')
+    inputs.properties(branch: githubBranch)
+
+    onlyIf {
+        println "GORM SRC=$explicitGormSrc"
+        return !explicitGormSrc
+    }
 
+    doLast {
         println "Downloading GORM source code."
-        def tag = System.getenv('TRAVIS_TAG')
-        if (tag) {
-            ant.get src: "https://github.com/grails/grails-data-mapping/archive/${tag}.zip", dest: zipFile, verbose: true
+        if (isReleaseVersion) {
+            ant.get src: "https://github.com/grails/grails-data-mapping/archive/ref/tags/${gormVersion}.zip", dest: zipFile, verbose: true
         } else {
-            ant.get src: "https://github.com/grails/grails-data-mapping/zipball/${githubBranch}", dest: zipFile, verbose: true
+            ant.get src: "https://github.com/grails/grails-data-mapping/archive/refs/heads/${githubBranch}.zip", dest: zipFile, verbose: true
         }
 
         ant.unzip src: zipFile, dest: checkOutDir, {
             mapper type: "regexp", from: "(grails-\\S*?/)(.*)", to: "gorm-src/\\2"
         }
         println "GORM source code downloaded."
     }
-}
 
-fetchSource.inputs.properties(branch:githubBranch)
-fetchSource.outputs.dir checkOutDir
+}
 
 
 task copyDocs(type:Copy, dependsOn:asciidoctor) {
@@ -131,8 +131,13 @@ task docs(dependsOn:[asciidoctor, groovydoc, copyDocs, copyResources] +
                 .collect { project -> project.tasks.groovydoc }
 )
 
-//task assemble(type: Zip, dependsOn:docs) {
-//    from "${project.buildDir}/docs"
-//    baseName = "${project.name}-${project.version}"
-//    destinationDir = project.file("${project.buildDir}/distributions")
-//}
+task assembleDocsDist(type: Zip) {
+    dependsOn docs
+    from "${project.buildDir}/docs"
+    include '*'
+    include '*/**'
+    archiveFileName = "${project.name}-${project.version}.zip"
+    destinationDirectory = project.layout.buildDirectory.dir('distributions')
+}
+
+docs.finalizedBy assembleDocsDist