Merge pull request #200 from longwa/grails4-upgrade

robertoschwald · web-flow · commit 58c37f4f02c8 · 2020-05-15T09:47:18.000+02:00
Grails 4 Upgrade
diff --git a/examples/audit-test/build.gradle b/examples/audit-test/build.gradle
@@ -8,8 +8,7 @@ buildscript {
     }
     dependencies {
         classpath "org.grails:grails-gradle-plugin:$grailsVersion"
-        classpath 'com.bertramlabs.plugins:asset-pipeline-gradle:2.14.2'
-        classpath "org.grails.plugins:hibernate5:${gormVersion - ".RELEASE"}"
+        classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.0.7"
     }
 }
 
@@ -44,7 +43,15 @@ grails {
     }
 }
 
+configurations {
+    developmentOnly
+    runtimeClasspath {
+        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"
@@ -63,21 +70,25 @@ dependencies {
     compile "org.grails.plugins:scaffolding"
     compile "org.grails.plugins:events"
     compile "org.grails.plugins:hibernate5"
-    compile "org.hibernate:hibernate-core:5.1.5.Final"
-    compile "org.hibernate:hibernate-ehcache:5.1.5.Final"
+    compile "org.hibernate:hibernate-core:5.4.0.Final"
+    compile "org.hibernate:hibernate-ehcache:5.4.0.Final"
     compile "org.grails.plugins:gsp"
-
     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 "com.bertramlabs.plugins:asset-pipeline-grails:2.14.6"
-
+    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"
 }
 
 task wrapper(type: Wrapper) {
diff --git a/examples/audit-test/src/integration-test/groovy/test/AuditDeleteSpec.groovy b/examples/audit-test/src/integration-test/groovy/test/AuditDeleteSpec.groovy
@@ -47,7 +47,7 @@ class AuditDeleteSpec extends Specification {
         }
 
         // Remove all logging of the inserts, we are focused on deletes here
-        AuditTrail.withNewSession {
+        AuditTrail.withNewTransaction {
             AuditTrail.where { id != null }.deleteAll()
             assert AuditTrail.count() == 0
         }
diff --git a/examples/audit-test/src/integration-test/groovy/test/AuditInsertSpec.groovy b/examples/audit-test/src/integration-test/groovy/test/AuditInsertSpec.groovy
@@ -35,7 +35,7 @@ class AuditInsertSpec extends Specification {
 
     void setup() {
         defaultIgnoreList = ['id'] + AuditLoggingConfigUtils.auditConfig.excluded?.asImmutable() ?: []
-        AuditTrail.withNewSession { AuditTrail.executeUpdate('delete from AuditTrail') }
+        AuditTrail.withNewTransaction { AuditTrail.executeUpdate('delete from AuditTrail') }
     }
 
     void "Test basic insert logging"() {
diff --git a/examples/audit-test/src/integration-test/groovy/test/AuditTruncateSpec.groovy b/examples/audit-test/src/integration-test/groovy/test/AuditTruncateSpec.groovy
@@ -70,7 +70,7 @@ class AuditTruncateSpec extends Specification {
         cleanup:
         log.info "Reset truncate length"
         setListenersTruncateLength oldTruncLength
-        AuditTrail.withNewSession { AuditTrail.executeUpdate('delete from AuditTrail') }
+        AuditTrail.withNewTransaction { AuditTrail.executeUpdate('delete from AuditTrail') }
     }
 
     void "Truncate_at_255"() {
@@ -100,7 +100,7 @@ class AuditTruncateSpec extends Specification {
 
         cleanup:
         setListenersTruncateLength oldTruncLength
-        AuditTrail.withNewSession { AuditTrail.executeUpdate('delete from AuditTrail') }
+        AuditTrail.withNewTransaction { AuditTrail.executeUpdate('delete from AuditTrail') }
     }
 
     void "Truncate_at_1024"() {
@@ -132,7 +132,7 @@ class AuditTruncateSpec extends Specification {
         cleanup:
         log.debug "Reset truncate length"
         setListenersTruncateLength oldTruncLength
-        AuditTrail.withNewSession { AuditTrail.executeUpdate('delete from AuditTrail') }
+        AuditTrail.withNewTransaction { AuditTrail.executeUpdate('delete from AuditTrail') }
     }
 
     private int getFirstListenerTruncateLength(){
diff --git a/examples/audit-test/src/integration-test/groovy/test/AuditUpdateCollectionSpec.groovy b/examples/audit-test/src/integration-test/groovy/test/AuditUpdateCollectionSpec.groovy
@@ -36,7 +36,7 @@ class AuditUpdateCollectionSpec extends Specification {
             author.save(flush: true, failOnError: true)
 
             // Remove all logging of the inserts, we are focused on updates here
-            AuditTrail.withNewSession {
+            AuditTrail.withNewTransaction {
                 AuditTrail.where { id != null }.deleteAll()
                 assert AuditTrail.count() == 0
             }
diff --git a/examples/audit-test/src/integration-test/groovy/test/AuditUpdateSpec.groovy b/examples/audit-test/src/integration-test/groovy/test/AuditUpdateSpec.groovy
@@ -41,7 +41,7 @@ class AuditUpdateSpec extends Specification {
             heliport.save(flush: true, failOnError: true)
 
             // Remove all logging of the inserts, we are focused on updates here
-            AuditTrail.withNewSession {
+            AuditTrail.withNewTransaction {
                 AuditTrail.where { id != null }.deleteAll()
                 assert AuditTrail.count() == 0
             }
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,6 @@
-grailsVersion=3.3.9
-gormVersion=6.1.11.RELEASE
-gradleWrapperVersion=3.5.1
+grailsVersion=4.0.3
+gormVersion=7.0.4.RELEASE
+gradleWrapperVersion=5.6.4
+org.gradle.daemon=true
+org.gradle.parallel=true
+org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Jan 29 22:32:54 EST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-all.zip
diff --git a/gradlew b/gradlew
@@ -28,16 +28,16 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
diff --git a/gradlew.bat b/gradlew.bat
@@ -1,84 +1,84 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -35,9 +35,6 @@ ext {
     gradleWrapperVersion = project.gradleWrapperVersion
 }
 
-//sourceCompatibility = 1.7
-//targetCompatibility = 1.7
-
 repositories {
     mavenLocal()
     maven { url "https://repo.grails.org/grails/core" }
@@ -67,7 +64,7 @@ dependencies {
     testCompile "org.grails:grails-web-testing-support"
 }
 
-bootRepackage.enabled = false
+bootJar.enabled = false
 
 // Needed for org.asciidoctor:asciidoctorj-epub3:1.5.0-alpha.6
 // See https://github.com/asciidoctor/asciidoctorj/issues/415
diff --git a/plugin/src/docs/changelog.adoc b/plugin/src/docs/changelog.adoc
@@ -1,4 +1,7 @@
 == Change Log
+* 4.0.0
+** Initial support for Grails 4
+
 * 3.0.5
 ** Add support for getOriginalValue() using config parameter.
 ** Fix #193 StackOverflow with composite ID and Auditable
diff --git a/plugin/src/docs/introduction.adoc b/plugin/src/docs/introduction.adoc
@@ -9,7 +9,8 @@ It also provides a convenient way to add Update and Create user stamping by exte
 [cols="1,2",width="50%",options="header,footer"]
 |====================
 |Grails Version  | Audit Logging Plugin Version
-|3.3.0 and later | 3.0.x
+|4.0.0 and later | 4.0.0
+|3.3.x | 3.0.x
 |3.0.0 to 3.2.0 | 2.0.x
 |2.0.0 to 2.5 | 1.0.x
 |1.3.x | 0.5.5.3
@@ -25,4 +26,4 @@ Please note, that only Hibernate5 is tested during development. If an issue occu
 please file a GitHub issue.
 
 While the plugin can log transactions for a MongoDB DataSource, it currently does not support MongoDB as an audit logging backend.
-If you use this plugin to log MongoDB transactions, you must configure a SQL DataSource for Audit Logging. See Ticket #181.
+If you use this plugin to log MongoDB transactions, you must configure a SQL DataSource for Audit Logging. See Ticket #181.
diff --git a/plugin/src/docs/upgrading.adoc b/plugin/src/docs/upgrading.adoc
@@ -1,4 +1,8 @@
-== Upgrading
+== Upgrading to 4.0.x
+
+The 4.0.0 version of the plugin is backwards compatible with 3.0.x. Any existing configuration and customization should work out of the box.
+
+== Upgrading to 3.0.x
 
 The 3.0.x version of the plugin is a major rewrite of the codebase. Therefore you need to upgrade your code for this version.
 
diff --git a/plugin/src/main/groovy/grails/plugins/orm/auditable/AuditLogListener.groovy b/plugin/src/main/groovy/grails/plugins/orm/auditable/AuditLogListener.groovy
diff --git a/plugin/src/main/groovy/grails/plugins/orm/auditable/AuditLoggingGrailsPlugin.groovy b/plugin/src/main/groovy/grails/plugins/orm/auditable/AuditLoggingGrailsPlugin.groovy
diff --git a/settings.gradle b/settings.gradle
diff --git a/version.txt b/version.txt

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class AuditDeleteSpec extends Specification {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`// Remove all logging of the inserts, we are focused on deletes here`
`50`		`- AuditTrail.withNewSession {`
	`50`	`+ AuditTrail.withNewTransaction {`
`51`	`51`	`AuditTrail.where { id != null }.deleteAll()`
`52`	`52`	`assert AuditTrail.count() == 0`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class AuditInsertSpec extends Specification {`
`35`	`35`
`36`	`36`	`void setup() {`
`37`	`37`	`defaultIgnoreList = ['id'] + AuditLoggingConfigUtils.auditConfig.excluded?.asImmutable() ?: []`
`38`		`- AuditTrail.withNewSession { AuditTrail.executeUpdate('delete from AuditTrail') }`
	`38`	`+ AuditTrail.withNewTransaction { AuditTrail.executeUpdate('delete from AuditTrail') }`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`void "Test basic insert logging"() {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class AuditUpdateCollectionSpec extends Specification {`
`36`	`36`	`author.save(flush: true, failOnError: true)`
`37`	`37`
`38`	`38`	`// Remove all logging of the inserts, we are focused on updates here`
`39`		`- AuditTrail.withNewSession {`
	`39`	`+ AuditTrail.withNewTransaction {`
`40`	`40`	`AuditTrail.where { id != null }.deleteAll()`
`41`	`41`	`assert AuditTrail.count() == 0`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ class AuditUpdateSpec extends Specification {`
`41`	`41`	`heliport.save(flush: true, failOnError: true)`
`42`	`42`
`43`	`43`	`// Remove all logging of the inserts, we are focused on updates here`
`44`		`- AuditTrail.withNewSession {`
	`44`	`+ AuditTrail.withNewTransaction {`
`45`	`45`	`AuditTrail.where { id != null }.deleteAll()`
`46`	`46`	`assert AuditTrail.count() == 0`
`47`	`47`	`}`