initial updates for Grails 7

.github/workflows/ci.yaml

@@ -9,31 +9,31 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11]
+        java: [17, 21]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: cd $GITHUB_WORKSPACE
 
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           java-package: jdk
           architecture: x64
-
+          distribution: temurin
       - run: ./gradlew check
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: testreport-audit-test-${{ matrix.java }}
           path: examples/audit-test/build/reports/tests
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: testreport-audit-test-allow-update-outside-transaction-${{ matrix.java }}
           path: examples/audit-test-allow-update-outside-transaction/build/reports/tests
 
       - run: ./gradlew :examples:audit-test:check -Daudit-test.AuditTrail.datasource=DEFAULT
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: testreport-audit-test-single-datasource-${{ matrix.java }}

README.md

@@ -20,7 +20,9 @@ This repositories new artifacts are currently moved to Maven Central, sind Bintr
  * For 2.x documentation, see [2.x User Guide](https://gpc.github.io/grails-audit-logging-plugin/2.0.x/plugin.html)
 
 ## Grails versions
- * Grails 4.0.x: [master branch (5.0.x version)](https://github.com/gpc/grails-audit-logging-plugin/tree/master) Alternatively up to Grails 4.0.9: [4.x_maintenance branch](https://github.com/gpc/grails-audit-logging-plugin/tree/4.x_maintenance)
+ * Grails 7.0.x: [6.0.x branch (6.0.x version)](https://github.com/gpc/grails-audit-logging-plugin/tree/6.0.x)
+ * Grails 4.0.10+: [5.0.x branch (5.0.x version)](https://github.com/gpc/grails-audit-logging-plugin/tree/5.0.x) 
+ * Grails up to 4.0.9: [4.x_maintenance branch](https://github.com/gpc/grails-audit-logging-plugin/tree/4.x_maintenance)
  * Grails 3.3.x: [3.x_maintenance branch](https://github.com/gpc/grails-audit-logging-plugin/tree/3.x_maintenance)
  * Grails 3.0.x-3.2.x: [2.x_maintenance branch](https://github.com/gpc/grails-audit-logging-plugin/tree/2.x_maintenance)
  * Grails 2.x: [1.x_maintenance branch](https://github.com/gpc/grails-audit-logging-plugin/tree/1.x_maintenance)

examples/audit-test-allow-update-outside-transaction/build.gradle

@@ -3,20 +3,22 @@ buildscript {
         grailsVersion = project.grailsVersion
     }
     repositories {
-        mavenLocal()
         maven { url "https://repo.grails.org/grails/core" }
     }
     dependencies {
-        classpath "org.grails:grails-gradle-plugin:$grailsVersion"
-        classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.0.7"
+        classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
     }
 }
 
-version file("$rootDir/version.txt").text.trim()
+plugins {
+  id "com.bertramlabs.asset-pipeline" version "$assetPipelineVersion"
+}
+
+
+version project.projectVersion
 group "audit.test"
 
 apply plugin: "war"
-apply plugin: "asset-pipeline"
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 apply plugin: "org.grails.grails-web"
@@ -37,58 +39,44 @@ repositories {
     maven { url "https://repo.grails.org/grails/core" }
 }
 
-grails {
-    plugins {
-        compile project(":audit-logging")
-    }
-}
-
 configurations {
     developmentOnly
-    runtimeClasspath {
+    runtimeOnlyClasspath {
         extendsFrom developmentOnly
     }
 }
 
 dependencies {
     developmentOnly("org.springframework.boot:spring-boot-devtools")
-    compile "org.springframework.boot:spring-boot-starter-logging"
-    compile "org.springframework.boot:spring-boot-autoconfigure"
-    compile "org.grails:grails-core"
-    compile "org.springframework.boot:spring-boot-starter-actuator"
-    compile "org.springframework.boot:spring-boot-starter-tomcat"
-    compile "org.grails:grails-web-boot"
-    compile "org.grails:grails-logging"
-    compile "org.grails:grails-plugin-rest"
-    compile "org.grails:grails-plugin-databinding"
-    compile "org.grails:grails-plugin-i18n"
-    compile "org.grails:grails-plugin-services"
-    compile "org.grails:grails-plugin-url-mappings"
-    compile "org.grails:grails-plugin-interceptors"
-    compile "org.grails.plugins:cache"
-    compile "org.grails.plugins:async"
-    compile "org.grails.plugins:scaffolding"
-    compile "org.grails.plugins:events"
-    compile "org.grails.plugins:hibernate5"
-    compile "org.hibernate:hibernate-core:5.4.0.Final"
-    compile "org.hibernate:hibernate-ehcache:5.4.0.Final"
-    compile "org.grails.plugins:gsp"
+    compileOnly "org.springframework.boot:spring-boot-starter-logging"
+    compileOnly "org.springframework.boot:spring-boot-autoconfigure"
+    compileOnly "org.grails:grails-core"
+    compileOnly "org.springframework.boot:spring-boot-starter-actuator"
+    compileOnly "org.springframework.boot:spring-boot-starter-tomcat"
+    compileOnly "org.grails:grails-web-boot"
+    compileOnly "org.grails:grails-logging"
+    compileOnly "org.grails:grails-plugin-rest"
+    compileOnly "org.grails:grails-plugin-databinding"
+    compileOnly "org.grails:grails-plugin-i18n"
+    compileOnly "org.grails:grails-plugin-services"
+    compileOnly "org.grails:grails-plugin-url-mappings"
+    compileOnly "org.grails:grails-plugin-interceptors"
+    compileOnly "org.grails.plugins:cache"
+    compileOnly "org.grails.plugins:async"
+    compileOnly "org.grails.plugins:scaffolding"
+    compileOnly "org.grails.plugins:events"
+    compileOnly "org.grails.plugins:hibernate5"
+    compileOnly "org.grails.plugins:gsp"
+    implementation project(":audit-logging")
+    implementation "org.apache.groovy:groovy"
     console "org.grails:grails-console"
     profile "org.grails.profiles:web"
-    runtime "org.glassfish.web:el-impl:2.1.2-b03"
-    runtime "com.h2database:h2"
-    runtime "org.apache.tomcat:tomcat-jdbc"
-    runtime "javax.xml.bind:jaxb-api:2.3.0"
-    runtime "com.bertramlabs.plugins:asset-pipeline-grails:3.0.7"
-    testCompile "org.grails:grails-gorm-testing-support"
-    testCompile "org.mockito:mockito-core"
-    testCompile "org.grails:grails-web-testing-support"
-    testCompile "org.grails.plugins:geb"
-    testCompile "org.seleniumhq.selenium:selenium-remote-driver:3.14.0"
-    testCompile "org.seleniumhq.selenium:selenium-api:3.14.0"
-    testCompile "org.seleniumhq.selenium:selenium-support:3.14.0"
-    testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:3.14.0"
-    testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:3.14.0"
+    runtimeOnly "com.h2database:h2"
+    runtimeOnly "org.apache.tomcat:tomcat-jdbc"
+    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
+    testCompileOnly "org.grails:grails-gorm-testing-support"
+    testCompileOnly "org.mockito:mockito-core"
+    testImplementation "org.grails:grails-web-testing-support"
 }
 
 task wrapper(type: Wrapper) {

examples/audit-test/build.gradle

@@ -3,20 +3,21 @@ buildscript {
         grailsVersion = project.grailsVersion
     }
     repositories {
-        mavenLocal()
         maven { url "https://repo.grails.org/grails/core" }
     }
     dependencies {
-        classpath "org.grails:grails-gradle-plugin:$grailsVersion"
-        classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.0.7"
+        classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
     }
 }
 
-version file("$rootDir/version.txt").text.trim()
+plugins {
+  id "com.bertramlabs.asset-pipeline" version "$assetPipelineVersion"
+}
+
+version project.projectVersion
 group "audit.test"
 
 apply plugin: "war"
-apply plugin: "asset-pipeline"
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 apply plugin: "org.grails.grails-web"
@@ -37,58 +38,44 @@ repositories {
     maven { url "https://repo.grails.org/grails/core" }
 }
 
-grails {
-    plugins {
-        compile project(":audit-logging")
-    }
-}
-
 configurations {
     developmentOnly
-    runtimeClasspath {
+    runtimeOnlyClasspath {
         extendsFrom developmentOnly
     }
 }
 
 dependencies {
-    developmentOnly("org.springframework.boot:spring-boot-devtools")
-    compile "org.springframework.boot:spring-boot-starter-logging"
-    compile "org.springframework.boot:spring-boot-autoconfigure"
-    compile "org.grails:grails-core"
-    compile "org.springframework.boot:spring-boot-starter-actuator"
-    compile "org.springframework.boot:spring-boot-starter-tomcat"
-    compile "org.grails:grails-web-boot"
-    compile "org.grails:grails-logging"
-    compile "org.grails:grails-plugin-rest"
-    compile "org.grails:grails-plugin-databinding"
-    compile "org.grails:grails-plugin-i18n"
-    compile "org.grails:grails-plugin-services"
-    compile "org.grails:grails-plugin-url-mappings"
-    compile "org.grails:grails-plugin-interceptors"
-    compile "org.grails.plugins:cache"
-    compile "org.grails.plugins:async"
-    compile "org.grails.plugins:scaffolding"
-    compile "org.grails.plugins:events"
-    compile "org.grails.plugins:hibernate5"
-    compile "org.hibernate:hibernate-core:5.4.0.Final"
-    compile "org.hibernate:hibernate-ehcache:5.4.0.Final"
-    compile "org.grails.plugins:gsp"
+    developmentOnly "org.springframework.boot:spring-boot-devtools"
+    compileOnly "org.springframework.boot:spring-boot-starter-logging"
+    compileOnly "org.springframework.boot:spring-boot-autoconfigure"
+    compileOnly "org.springframework.boot:spring-boot-starter-actuator"
+    compileOnly "org.springframework.boot:spring-boot-starter-tomcat"
+    compileOnly "org.grails:grails-web-boot"
+    compileOnly "org.grails:grails-logging"
+    compileOnly "org.grails:grails-plugin-rest"
+    compileOnly "org.grails:grails-plugin-databinding"
+    compileOnly "org.grails:grails-plugin-i18n"
+    compileOnly "org.grails:grails-plugin-services"
+    compileOnly "org.grails:grails-plugin-url-mappings"
+    compileOnly "org.grails:grails-plugin-interceptors"
+    compileOnly "org.grails.plugins:cache"
+    compileOnly "org.grails.plugins:async"
+    compileOnly "org.grails.plugins:scaffolding"
+    compileOnly "org.grails.plugins:events"
+    compileOnly "org.grails.plugins:gsp"
+    implementation "org.grails:grails-core"
+    implementation project(":audit-logging")
+    implementation "org.apache.groovy:groovy"
+    implementation "org.grails.plugins:hibernate5"
     console "org.grails:grails-console"
     profile "org.grails.profiles:web"
-    runtime "org.glassfish.web:el-impl:2.1.2-b03"
-    runtime "com.h2database:h2"
-    runtime "org.apache.tomcat:tomcat-jdbc"
-    runtime "javax.xml.bind:jaxb-api:2.3.0"
-    runtime "com.bertramlabs.plugins:asset-pipeline-grails:3.0.7"
-    testCompile "org.grails:grails-gorm-testing-support"
-    testCompile "org.mockito:mockito-core"
-    testCompile "org.grails:grails-web-testing-support"
-    testCompile "org.grails.plugins:geb"
-    testCompile "org.seleniumhq.selenium:selenium-remote-driver:3.14.0"
-    testCompile "org.seleniumhq.selenium:selenium-api:3.14.0"
-    testCompile "org.seleniumhq.selenium:selenium-support:3.14.0"
-    testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:3.14.0"
-    testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:3.14.0"
+    runtimeOnly "com.h2database:h2"
+    runtimeOnly "org.apache.tomcat:tomcat-jdbc"
+    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
+    testImplementation "org.grails:grails-gorm-testing-support"
+    testImplementation "org.grails:grails-web-testing-support"
+    testCompileOnly "org.mockito:mockito-core"
 }
 
 task wrapper(type: Wrapper) {

gradle.properties

@@ -1,10 +1,17 @@
-grailsVersion=4.0.3
-gormVersion=7.0.4.RELEASE
-gradleWrapperVersion=5.6.4
+projectVersion=6.0.0-SNAPSHOT
+
+artifactoryVersion=5.2.5
+asciidoctorJvmVersion=4.0.3
+assetPipelineVersion=5.0.1
+grailsVersion=7.0.0-SNAPSHOT
+grailsGradlePluginVersion=7.0.0-SNAPSHOT
+gormVersion=9.0.0-SNAPSHOT
+groovyVersion=4.0.24
+gradleWrapperVersion=8.11
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M
 
-vcsUrl=https://github.com/robertoschwald/grails-audit-logging-plugin
-websiteUrl=https://github.com/robertoschwald/grails-audit-logging-plugin
-issueTrackerUrl=https://github.com/robertoschwald/grails-audit-logging-plugin/issues
+vcsUrl=https://github.com/gpc/grails-audit-logging-plugin
+websiteUrl=https://github.com/gpc/grails-audit-logging-plugin
+issueTrackerUrl=https://github.com/gpc/grails-audit-logging-plugin/issues

gradle/grailsPublish.gradle

@@ -9,13 +9,13 @@ setIfNotSet 'websiteUrl', project.vcsUrl
 grailsPublish {
   user = System.getenv("BINTRAY_USER") ?: project.hasProperty("bintrayUser") ? project.bintrayUser : ''
   key = System.getenv("BINTRAY_KEY") ?: project.hasProperty("bintrayKey") ? project.bintrayKey : ''
-  githubSlug = 'robertoschwald/grails-audit-logging-plugin'
+  githubSlug = 'gpc/grails-audit-logging-plugin'
   websiteUrl = project.hasProperty('websiteUrl') ? project.websiteUrl : "https://grails.org/plugin/$project.name"
   license {
     name = project.hasProperty('license') ? [project.license] : ['Apache-2.0']
   }
   issueTrackerUrl = project.hasProperty('issueTrackerUrl') ? project.issueTrackerUrl : "https://github.com/grails-plugins/$project.name/issues"
-  vcsUrl = project.hasProperty('vcsUrl') ? project.vcsUrl : "https://github.com/robertoschwald/$project.name"
+  vcsUrl = project.hasProperty('vcsUrl') ? project.vcsUrl : "https://github.com/gpc/$project.name"
   title = "Grails Audit-Logging Plugin"
   desc = "Grails Audit-Logging Plugin for Grails 4.x"
   developers = [robertoschwald:"Robert Oschwald", longwa:"Aaron Long", elkr:"Elmar Kretzer"]

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists