Update for Grails 7.0.0-M1

grails-plugins · Dec 24, 2024 · 1e443a8 · 1e443a8
1 parent 9f61b78
commit 1e443a8
Show file tree

Hide file tree

Showing 14 changed files with 148 additions and 109 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -45,13 +45,13 @@ jobs:
         id: release_version
         run: echo "value=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
       - name: "⚙️ Run pre-release"
-        uses: micronaut-projects/github-actions/pre-release@master
+        uses: grails/github-actions/pre-release@main
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: "🧩 Run Assemble"
         if: success()
         id: assemble
-        run: ./gradlew assemble
+        run: ./gradlew -U assemble
       - name: "🔐 Generate secring file"
         env:
           SECRING_FILE: ${{ secrets.SECRING_FILE }}
@@ -63,12 +63,11 @@ jobs:
           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 }}
-          SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+          SIGNING_KEY: ${{ secrets.SIGNING_KEY_ID }}
           SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
           SECRING_FILE: ${{ secrets.SECRING_FILE }}
-        working-directory: ./plugin
         run: >
-          ../gradlew
+          ./gradlew
           -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg 
           publishToSonatype 
           closeSonatypeStagingRepository
@@ -98,14 +97,13 @@ jobs:
           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 }}
-        working-directory: ./plugin
         run: >
-          ../gradlew
+          ./gradlew
           findSonatypeStagingRepository
           releaseSonatypeStagingRepository
       - name: "⚙️Run post-release"
         if: success()
-        uses: micronaut-projects/github-actions/post-release@master
+        uses: grails/github-actions/post-release@main
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
         env:

diff --git a/LOCALDEPLOYMENT.md b/LOCALDEPLOYMENT.md
@@ -5,12 +5,12 @@ This page is meant for people not willing to wait for an official plugin release
 ### Build
 
 ```shell
-npm run grails:release
+npm install
+npx gulp grailsRelease
 
 cd plugin
 
-./gradlew clean
-./gradlew build
+./gradlew clean build
 ```
 
 ### Public local

diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ repositories {
 }
 
 dependencies {
-    runtimeOnly 'com.github.grails-plugins:grails-web-console:7.0.0-SNAPSHOT'
+    runtimeOnly 'com.github.grails-plugins:grails-web-console:7.0.0-M1'
 }
 ```
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,17 +1,31 @@
+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 "org.grails.grails-web"
-    id "org.grails.grails-gsp"
     id "war"
     id "idea"
-    id "com.bertramlabs.asset-pipeline"
-    id "application"
+    id "com.bertramlabs.asset-pipeline" version "$assetPipelineVersion"
     id "eclipse"
 }
 
+apply plugin: "org.grails.grails-web"
+apply plugin: "org.grails.grails-gsp"
+
 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")
@@ -31,22 +45,18 @@ dependencies {
     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:${assetPipelineVersion}")
+    runtimeOnly("com.bertramlabs.plugins:asset-pipeline-grails")
     runtimeOnly("com.h2database:h2")
     runtimeOnly("org.apache.tomcat:tomcat-jdbc")
-    runtimeOnly("org.fusesource.jansi:jansi:1.18")
+    runtimeOnly("org.fusesource.jansi:jansi")
     testImplementation("org.grails:grails-gorm-testing-support")
     testImplementation("org.grails:grails-web-testing-support")
 
-    integrationTestImplementation testFixtures("org.grails.plugins:geb:${gebVersion}")
+    integrationTestImplementation testFixtures("org.grails.plugins:geb")
     testImplementation("org.spockframework:spock-core")
 
-    implementation project(':plugin')
-
-}
+    implementation project(':grails-web-console')
 
-application {
-    mainClass.set("grails.app.Application")
 }
 
 tasks.withType(Test) {

diff --git a/app/buildSrc/build.gradle b/app/buildSrc/build.gradle
diff --git a/app/grails-app/conf/logback-spring.xml b/app/grails-app/conf/logback-spring.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
+    <root level="ERROR">
+        <appender-ref ref="CONSOLE"/>
+    </root>
+
+
+    <!--    logging to a file-->
+    <!--    <property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}spring.log}"/>-->
+    <!--    <include resource="org/springframework/boot/logging/logback/file-appender.xml" />-->
+    <!--    <root level="INFO">-->
+    <!--        <appender-ref ref="FILE" />-->
+    <!--    </root>-->
+
+    <!--    add logging.file.name to application.yml-->
+
+    <springProfile name="development">
+        <logger name="StackTrace" level="ERROR" additivity="false"/>
+        <logger name="ahr" level="DEBUG"/>
+        <logger name="ahr" level="DEBUG"/>
+        <logger name="io.awspring.cloud" level="DEBUG"/>
+        <logger name="grails.spring.BeanBuilder" level="DEBUG"/>
+        <logger name="org.hibernate.orm.deprecation" level="OFF"/> <!--HHH90000022: Hibernate's legacy org.hibernate.Criteria API is deprecated-->
+        <logger name="grails.boot" level="DEBUG"/>
+
+        <!--        <logger name="org.hibernate.SQL" level="DEBUG"/>-->
+        <!--        <logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE"/>-->
+        <root level="WARN"/>
+    </springProfile>
+</configuration>
+
diff --git a/app/grails-app/conf/logback.xml b/app/grails-app/conf/logback.xml
diff --git a/build.gradle b/build.gradle
@@ -1,3 +1,13 @@
+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"
+    }
+}
+
 allprojects {
     repositories {
         mavenCentral()
@@ -6,11 +16,27 @@ allprojects {
 }
 
 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"
+
+        grailsPublish {
+            githubSlug = 'grails-plugins/grails-web-console'
+
+            license {
+                name = 'Apache-2.0'
+            }
+            title = "Grails Web Console Plugin"
+            desc = "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' ]
+        }
+    }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,10 +1,10 @@
 projectVersion=7.0.0-SNAPSHOT
 
-grailsVersion=7.0.0-SNAPSHOT
+grailsVersion=7.0.0-M1
 grailsGradlePluginVersion=7.0.0-SNAPSHOT
-gebVersion=5.0.0-SNAPSHOT
-assetPipelineVersion=5.0.1
-version=7.0.0-SNAPSHOT
+grailsHibernateGradlePluginVersion=9.0.0-M2
+assetPipelineVersion=5.0.5
+
 org.gradle.caching=true
 org.gradle.daemon=true
 org.gradle.parallel=true

diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -1,30 +1,34 @@
 buildscript {
     repositories {
-        mavenCentral()
-        gradlePluginPortal()
+        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 "org.grails.grails-web"
-    id "org.grails.grails-gsp"
-    id "org.grails.grails-plugin"
-    id "application"
     id "eclipse"
+    id "application"
     id "com.gorylenko.gradle-git-properties"
-    id "org.grails.grails-publish"
     id "com.adarshr.test-logger" version "4.0.0"
 }
 
+apply plugin: "org.grails.grails-web"
+apply plugin: "org.grails.grails-gsp"
+apply plugin: "org.grails.grails-plugin"
+
 group "org.grails.plugins"
 
 dependencies {
+    implementation platform("org.grails:grails-bom:$grailsVersion")
+
     implementation("org.grails:grails-core")
     implementation("org.grails:grails-logging")
     implementation("org.grails:grails-plugin-databinding")
@@ -131,13 +135,3 @@ testlogger {
 
 // enable if you wish to package this plugin as a standalone application
 bootJar.enabled = false
-
-grailsPublish {
-    githubSlug = 'grails-plugins/grails-web-console'
-    license {
-        name = 'Apache-2.0'
-    }
-    title = "Grails Web Console Plugin"
-    desc = "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' ]
-}
diff --git a/plugin/buildSrc/build.gradle b/plugin/buildSrc/build.gradle
diff --git a/plugin/grails-app/conf/logback-spring.xml b/plugin/grails-app/conf/logback-spring.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
+    <root level="ERROR">
+        <appender-ref ref="CONSOLE"/>
+    </root>
+
+
+    <!--    logging to a file-->
+    <!--    <property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}spring.log}"/>-->
+    <!--    <include resource="org/springframework/boot/logging/logback/file-appender.xml" />-->
+    <!--    <root level="INFO">-->
+    <!--        <appender-ref ref="FILE" />-->
+    <!--    </root>-->
+
+    <!--    add logging.file.name to application.yml-->
+
+    <springProfile name="development">
+        <logger name="StackTrace" level="ERROR" additivity="false"/>
+        <logger name="ahr" level="DEBUG"/>
+        <logger name="ahr" level="DEBUG"/>
+        <logger name="io.awspring.cloud" level="DEBUG"/>
+        <logger name="grails.spring.BeanBuilder" level="DEBUG"/>
+        <logger name="org.hibernate.orm.deprecation" level="OFF"/> <!--HHH90000022: Hibernate's legacy org.hibernate.Criteria API is deprecated-->
+        <logger name="grails.boot" level="DEBUG"/>
+
+        <!--        <logger name="org.hibernate.SQL" level="DEBUG"/>-->
+        <!--        <logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE"/>-->
+        <root level="WARN"/>
+    </springProfile>
+</configuration>
+
diff --git a/plugin/grails-app/conf/logback.xml b/plugin/grails-app/conf/logback.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ repositories { @@
     }
     dependencies {
-        runtimeOnly 'com.github.grails-plugins:grails-web-console:7.0.0-SNAPSHOT'
+        runtimeOnly 'com.github.grails-plugins:grails-web-console:7.0.0-M1'
     }
     ```
@@ Expand Down @@