Update to Grails 7.0.0-M5

Author: jdaugherty

.github/workflows/gradle.yml

@@ -62,6 +62,6 @@ jobs:
         env:
           MAVEN_PUBLISH_USERNAME: ${{ secrets.MAVEN_PUBLISH_USERNAME }}
           MAVEN_PUBLISH_PASSWORD: ${{ secrets.MAVEN_PUBLISH_PASSWORD }}
-          MAVEN_PUBLISH_URL: ${{ secrets.MAVEN_PUBLISH_SNAPSHOT_URL }}
+          MAVEN_PUBLISH_URL: 'https://repo.grails.org/artifactory/plugins3-snapshots-local'
         working-directory: ./plugin
         run: ../gradlew publish

.github/workflows/release.yml

@@ -3,22 +3,41 @@ on:
   release:
     types: [published]
 env:
-  GIT_USER_NAME: 'grails-build'
-  GIT_USER_EMAIL: '[email protected]'
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  JAVA_VERSION: '17.0.15' # this must be a specific version for reproducible builds
+  RELEASE_TAG_PREFIX: 'v'
 jobs:
   publish:
     permissions:
+      packages: read  #  pre-release workflow
       contents: write  #  to create release
       issues: write  #  to modify milestones
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       release_version: ${{ steps.release_version.outputs.value }}
-      target_branch: ${{ steps.extract_branch.outputs.value }}
+      extract_repository_name: ${{ steps.extract_repository_name.outputs.repository_name }}
     steps:
+      - name: "📝 Store the current release version"
+        id: release_version
+        run: |
+          export RELEASE_VERSION="${{ github.ref_name }}"
+          export RELEASE_VERSION=${RELEASE_VERSION:${#RELEASE_TAG_PREFIX}}
+          echo "Found Release Version: ${RELEASE_VERSION}"
+          echo "value=${RELEASE_VERSION}" >> $GITHUB_OUTPUT
+      - name: "Extract repository name"
+        id: extract_repository_name
+        run: |
+          echo "repository_name=${GITHUB_REPOSITORY##*/}" >> $GITHUB_OUTPUT
       - name: "📥 Checkout the repository"
         uses: actions/checkout@v4
         with:
-          token: ${{ secrets.GH_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          ref: v{{ steps.release_version.outputs.value }}
+      - name: 'Ensure Common Build Date' # to ensure a reproducible build
+        run: echo "SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)" >> "$GITHUB_ENV"
+      - name: "Ensure source files use common date"
+        run: |
+          find . -depth \( -type f -o -type d \) -exec touch -d "@${SOURCE_DATE_EPOCH}" {} +
       - name: "🧱 Setup up node"
         uses: actions/setup-node@v3
         with:
@@ -30,81 +49,74 @@ jobs:
       - name: "☕️ Setup JDK"
         uses: actions/setup-java@v4
         with:
-          distribution: 'liberica'
-          java-version: '17'
+          distribution: liberica
+          java-version: ${{ env.JAVA_VERSION }}
       - name: "🐘 Setup Gradle"
         uses: gradle/actions/setup-gradle@v4
-      - name: "📝 Store the target branch"
-        id: extract_branch
-        run: |
-          echo "Determining Target Branch"
-          TARGET_BRANCH=${GITHUB_REF#refs/heads/}
-          echo $TARGET_BRANCH
-          echo "value=${TARGET_BRANCH}" >> $GITHUB_OUTPUT
-      - name: "📝Set the current release version"
-        id: release_version
-        run: echo "value=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
       - name: "⚙️ Run pre-release"
-        uses: grails/github-actions/pre-release@main
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+        uses: grails/github-actions/pre-release@asf
+        env:
+          RELEASE_VERSION: ${{ steps.release_version.outputs.value }}
       - name: "🧩 Run Assemble"
-        if: success()
         id: assemble
         run: ./gradlew -U assemble
-      - name: "🔐 Generate secring file"
+      - name: "🔐 Generate key file for artifact signing"
         env:
           SECRING_FILE: ${{ secrets.SECRING_FILE }}
         run: echo $SECRING_FILE | base64 -d > ${{ github.workspace }}/secring.gpg
-      - name: "🚀 Publish to Sonatype OSSRH"
-        id: publish
+      - name: "📤 Publish to Maven Central"
         env:
-          NEXUS_PUBLISH_USERNAME: ${{ secrets.NEXUS_PUBLISH_USERNAME }}
-          NEXUS_PUBLISH_PASSWORD: ${{ secrets.NEXUS_PUBLISH_PASSWORD }}
-          NEXUS_PUBLISH_URL: ${{ secrets.NEXUS_PUBLISH_RELEASE_URL }}
-          NEXUS_PUBLISH_STAGING_PROFILE_ID: ${{ secrets.NEXUS_PUBLISH_STAGING_PROFILE_ID }}
+          GRAILS_PUBLISH_RELEASE: 'true'
+          NEXUS_PUBLISH_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          NEXUS_PUBLISH_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+          NEXUS_PUBLISH_URL: 'https://ossrh-staging-api.central.sonatype.com/service/local/'
+          NEXUS_PUBLISH_DESCRIPTION: '${{ steps.extract_repository_name.outputs.repository_name }}:${{ steps.release_version.outputs.value }}'
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
-          SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
-          SECRING_FILE: ${{ secrets.SECRING_FILE }}
+          SIGNING_PASSPHRASE: ${{ secrets.SECRING_PASSPHRASE }}
         run: >
           ./gradlew
-          -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg 
-          publishToSonatype 
+          -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg
+          publishMavenPublicationToSonatypeRepository
+          publishPluginMavenPublicationToSonatypeRepository 
           closeSonatypeStagingRepository
+      - name: "Generate Build Date file"
+        run: echo "$SOURCE_DATE_EPOCH" >> build/BUILD_DATE.txt
+      - name: "Upload Build Date file"
+        uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631
+        with:
+          files: build/BUILD_DATE.txt
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   release:
     needs: publish
     runs-on: ubuntu-latest
     permissions:
-      contents: read
+      contents: write
+      issues: write
+      pull-requests: write
     steps:
       - name: "📥 Checkout repository"
         uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          ref: v${{ needs.publish.outputs.release_version }}
       - name: "☕️ Setup JDK"
         uses: actions/setup-java@v4
         with:
           distribution: liberica
-          java-version: 17
-      - name: "📥 Checkout repository"
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GH_TOKEN }}
-          ref: v${{ needs.publish.outputs.release_version }}
+          java-version: ${{ env.JAVA_VERSION }}
       - name: "🐘 Setup Gradle"
         uses: gradle/actions/setup-gradle@v4
-      - name: "🏆Nexus Staging Close And Release"
+      - name: "📤 Release staging repository"
         env:
-          NEXUS_PUBLISH_USERNAME: ${{ secrets.NEXUS_PUBLISH_USERNAME }}
-          NEXUS_PUBLISH_PASSWORD: ${{ secrets.NEXUS_PUBLISH_PASSWORD }}
-          NEXUS_PUBLISH_URL: ${{ secrets.NEXUS_PUBLISH_RELEASE_URL }}
-          NEXUS_PUBLISH_STAGING_PROFILE_ID: ${{ secrets.NEXUS_PUBLISH_STAGING_PROFILE_ID }}
+          GRAILS_PUBLISH_RELEASE: 'true'
+          NEXUS_PUBLISH_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          NEXUS_PUBLISH_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+          NEXUS_PUBLISH_URL: 'https://ossrh-staging-api.central.sonatype.com/service/local/'
+          NEXUS_PUBLISH_DESCRIPTION: '${{ needs.publish.outputs.extract_repository_name }}:${{ needs.publish.outputs.release_version }}'
         run: >
           ./gradlew
           findSonatypeStagingRepository
           releaseSonatypeStagingRepository
-      - name: "⚙️Run post-release"
-        if: success()
-        uses: grails/github-actions/post-release@main
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-        env:
-          SNAPSHOT_SUFFIX: -SNAPSHOT
+      - name: "⚙️ Run post-release"
+        uses: apache/grails-github-actions/post-release@asf

app/build.gradle

@@ -1,66 +1,53 @@
-buildscript {
-    repositories {
-        maven { url "https://plugins.gradle.org/m2/" }
-        maven { url "https://repo.grails.org/grails/core" }
-    }
-    dependencies {
-        classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
-        classpath "org.grails.plugins:hibernate5:$grailsHibernateGradlePluginVersion"
-        classpath "com.bertramlabs.plugins:asset-pipeline-gradle:$assetPipelineVersion"
-    }
-}
-
 plugins {
     id "groovy"
-    id "war"
-    id "idea"
-    id "com.bertramlabs.asset-pipeline" version "$assetPipelineVersion"
-    id "eclipse"
+    id "cloud.wondrify.asset-pipeline"
 }
 
-apply plugin: "org.grails.grails-web"
-apply plugin: "org.grails.grails-gsp"
+apply plugin: "org.apache.grails.gradle.grails-web"
+apply plugin: "org.apache.grails.gradle.grails-gsp"
+
 
+version = project.projectVersion
 group = "grails.app"
 
 dependencies {
-    implementation platform("org.grails:grails-bom:$grailsVersion")
-
-    implementation("org.grails:grails-core")
-    implementation("org.grails:grails-logging")
-    implementation("org.grails:grails-plugin-databinding")
-    implementation("org.grails:grails-plugin-i18n")
-    implementation("org.grails:grails-plugin-interceptors")
-    implementation("org.grails:grails-plugin-rest")
-    implementation("org.grails:grails-plugin-services")
-    implementation("org.grails:grails-plugin-url-mappings")
-    implementation("org.grails:grails-web-boot")
-    implementation("org.grails.plugins:gsp")
-    implementation("org.grails.plugins:hibernate5")
-    implementation("org.grails.plugins:scaffolding")
+    implementation platform("org.apache.grails:grails-bom:$grailsVersion")
+
+    implementation("org.apache.grails:grails-core")
+    implementation("org.apache.grails:grails-logging")
+    implementation("org.apache.grails:grails-databinding")
+    implementation("org.apache.grails:grails-i18n")
+    implementation("org.apache.grails:grails-interceptors")
+    implementation("org.apache.grails:grails-rest-transforms")
+    implementation("org.apache.grails:grails-services")
+    implementation("org.apache.grails:grails-url-mappings")
+    implementation("org.apache.grails:grails-web-boot")
+    implementation("org.apache.grails:grails-gsp")
+    implementation("org.apache.grails:grails-data-hibernate5")
+    implementation("org.apache.grails:grails-scaffolding")
     implementation("org.springframework.boot:spring-boot-autoconfigure")
     implementation("org.springframework.boot:spring-boot-starter")
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-starter-logging")
     implementation("org.springframework.boot:spring-boot-starter-tomcat")
     implementation("org.springframework.boot:spring-boot-starter-validation")
-    console("org.grails:grails-console")
-    runtimeOnly("com.bertramlabs.plugins:asset-pipeline-grails")
+    console("org.apache.grails:grails-console")
+    runtimeOnly("cloud.wondrify:asset-pipeline-grails")
     runtimeOnly("com.h2database:h2")
     runtimeOnly("org.apache.tomcat:tomcat-jdbc")
     runtimeOnly("org.fusesource.jansi:jansi")
-    testImplementation("org.grails:grails-gorm-testing-support")
-    testImplementation("org.grails:grails-web-testing-support")
+    testImplementation("org.apache.grails:grails-testing-support-datamapping")
+    testImplementation("org.apache.grails:grails-testing-support-web")
 
-    integrationTestImplementation testFixtures("org.grails.plugins:geb")
+    integrationTestImplementation testFixtures("org.apache.grails:grails-geb")
     testImplementation("org.spockframework:spock-core")
 
     implementation project(':grails-web-console')
-
 }
 
-tasks.withType(Test) {
-    useJUnitPlatform()
+apply {
+    from project.rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
+    from project.rootProject.layout.projectDirectory.file('gradle/test-config.gradle')
 }
 
 assets {

build.gradle

@@ -1,32 +1,27 @@
 buildscript {
     repositories {
-        maven { url "https://plugins.gradle.org/m2/" }
-        maven { url "https://repo.grails.org/grails/core" }
+        maven { url 'https://plugins.gradle.org/m2/' }
+        maven { url 'https://repo.grails.org/grails/restricted' }
     }
     dependencies {
-        classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
+        classpath platform("org.apache.grails:grails-bom:${grailsVersion}")
+        classpath 'org.apache.grails:grails-gradle-plugins'
     }
 }
 
 allprojects {
     repositories {
+        maven { url "https://repo.grails.org/grails/restricted" }
         mavenCentral()
-        maven { url "https://repo.grails.org/grails/core" }
     }
 }
 
 version project.projectVersion
 group "org.grails.plugins"
 
 subprojects { project ->
-    version project.projectVersion
-
-    apply plugin: "groovy"
-
-    project.compileJava.options.release = 17
-
     if(project.name.endsWith('grails-web-console')) {
-        apply plugin: "org.grails.grails-publish"
+        apply plugin: "org.apache.grails.gradle.grails-publish"
 
         grailsPublish {
             githubSlug = 'grails-plugins/grails-web-console'
@@ -35,7 +30,7 @@ subprojects { project ->
                 name = 'Apache-2.0'
             }
             title = "Grails Web Console Plugin"
-            desc = "A web-based Groovy console for interactive runtime application management and debugging"
+            desc = "A Grails Plugin that adds a web-based Groovy console for interactive runtime application management and debugging"
             developers = [ziegfried: 'Siegfried Puchbauer', mingfai: 'Mingfai Ma', burtbeckwith: 'Burt Beckwith', sheehan: 'Matt Sheehan', mjhugo: 'Mike Hugo', kdybicz: 'Kamil Dybicz', vsachinv: 'vsachinv' ]
         }
     }

buildSrc/build.gradle

@@ -0,0 +1,43 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+plugins {
+    id 'groovy-gradle-plugin'
+}
+
+file('../gradle.properties').withInputStream {
+    Properties props = new Properties()
+    props.load(it)
+    project.ext.gradleProperties = props
+}
+
+compileJava.options.release = gradleProperties.javaVersion.toString().toInteger()
+
+repositories {
+    maven { url = 'https://repo.grails.org/grails/restricted' }
+    mavenCentral()
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation platform("org.apache.grails:grails-gradle-bom:${gradleProperties.grailsVersion}")
+    implementation 'cloud.wondrify:asset-pipeline-gradle'
+    implementation 'org.apache.grails:grails-gradle-plugins'
+    implementation "com.adarshr.test-logger:com.adarshr.test-logger.gradle.plugin:${gradleProperties.testLoggerVersion}"
+}

gradle.properties

@@ -1,9 +1,7 @@
 projectVersion=7.0.0-SNAPSHOT
-
-grailsVersion=7.0.0-M1
-grailsGradlePluginVersion=7.0.0-SNAPSHOT
-grailsHibernateGradlePluginVersion=9.0.0-M2
-assetPipelineVersion=5.0.5
+grailsVersion=7.0.0-M5
+javaVersion=17
+testLoggerVersion=4.0.0
 
 org.gradle.caching=true
 org.gradle.daemon=true