Upgrade to Grails 3.3.5, Hibernate 5.2.17, GORM 6.1.9, Gradle 4.7.

.travis.yml

@@ -2,7 +2,6 @@ dist: precise
 sudo: required
 language: groovy
 jdk:
-  - oraclejdk7
   - oraclejdk8
 
 env:

README.md

@@ -751,7 +751,7 @@ Version | Date        | Comments
 5.0.0   | 07/Nov/2016 | Grails 3: Add support for Hibernate 5.1. Upgrade dialect to Postgresql 9.4, Grails to 3.2.2 and GORM to 6.0.3.
 4.6.8   | 03/Nov/2016 | Grails 3: Add support for generic Json/Jsonb criteria [#95](https://github.com/kaleidos/grails-postgresql-extensions/pull/95). Thanks to Sabst.
 4.6.7   | 01/Nov/2016 | Grails 3: Add UUID arrays. Thanks to [Tom Potts](https://twitter.com/karaken12). Fix [#87](https://github.com/kaleidos/grails-postgresql-extensions/issues/87)
-5.0.0-RC1 | 28/Oct/2016 | Grails 3: Add support for Hibernate 5. Thanks to Alexey Zhokhov and Eric Helgeson.
+5.0.0-RC1 | 28/Oct/2016 | Grails 3: Add support for Hibernate 5. Thanks to [Alexey Zhokhov](https://github.com/donbeave/) and Eric Helgeson.
 4.6.6   | 24/Apr/2016 | Grails 3: Migrate (almost) all Java code to Groovy + @CompileStatic. No new features added.
 4.6.5   | 31/Dec/2015 | Grails 3: Fix [#84](https://github.com/kaleidos/grails-postgresql-extensions/issues/84). Starting Grails 3.0.10 the default `sequence_per_table` parameter was not working.
 4.6.4   | 29/Dec/2015 | Grails 3: Cleanup and new jar file with the same functionality as previous version. It seems that version 4.6.3 is corrupted.

build.gradle

@@ -5,32 +5,29 @@ buildscript {
     }
     repositories {
         mavenLocal()
-        maven { url 'https://repo.grails.org/grails/core' }
         mavenCentral()
+        jcenter()
+        maven { url 'https://repo.grails.org/grails/core' }
     }
     dependencies {
         classpath "org.grails:grails-gradle-plugin:$grailsVersion"
-        classpath "org.grails.plugins:hibernate5:$gormVersion"
-        classpath 'net.saliman:gradle-cobertura-plugin:2.3.2'
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3'
+        classpath "org.grails.plugins:hibernate5:${gormVersion - '.RELEASE'}"
+        classpath 'net.saliman:gradle-cobertura-plugin:2.5.4'
+        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2'
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0"
     }
 }
 
-plugins {
-    id 'com.jfrog.bintray' version '1.2'
-}
-
-version '5.2.0'
+version '6.0.0'
 group 'org.grails.plugins'
 
-apply plugin: 'maven-publish'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 apply plugin: 'org.grails.grails-plugin'
 apply plugin: 'org.grails.grails-plugin-publish'
 apply plugin: 'cobertura'
 apply plugin: 'com.github.kt3k.coveralls'
-
+apply plugin: 'com.jfrog.bintray'
 
 ext {
     gradleWrapperVersion = project.gradleWrapperVersion
@@ -39,8 +36,8 @@ ext {
     hibernateVersion = project.hibernateVersion
 }
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 cobertura {
     coverageExcludes = ['.*BootStrap.*', '.*test.*']
@@ -55,27 +52,15 @@ jar {
     exclude 'hibernate/**'
     exclude 'layouts/**'
     exclude 'spring/**'
-
-    doFirst {
-        File pd = new File(buildDir, 'classes/main/META-INF/grails-plugin.xml')
-        pd.text = pd.text.readLines().findAll { !it.contains('<resource>test.') }.join('\n')
-    }
 }
 
 repositories {
     mavenLocal()
+    mavenCentral()
     jcenter()
     maven { url 'https://repo.grails.org/grails/core' }
 }
 
-
-dependencyManagement {
-    imports {
-        mavenBom "org.grails:grails-bom:$grailsVersion"
-    }
-    applyMavenExclusions false
-}
-
 dependencies {
     // Grails deps
     compile 'org.springframework.boot:spring-boot-starter-logging'
@@ -86,15 +71,14 @@ dependencies {
     compile 'org.grails:grails-dependencies'
     compile 'org.grails:grails-web-boot'
     console 'org.grails:grails-console'
-    profile 'org.grails.profiles:web-plugin:3.1.0'
+
+    profile 'org.grails.profiles:web-plugin'
     provided 'org.grails:grails-plugin-services'
     provided 'org.grails:grails-plugin-domain-class'
     testCompile 'org.grails:grails-plugin-testing'
-    testCompile 'org.grails.plugins:geb'
-    testRuntime 'org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1'
-    testRuntime 'net.sourceforge.htmlunit:htmlunit:2.18'
+    testCompile 'org.grails:grails-gorm-testing-support'
 
-    provided 'org.postgresql:postgresql:9.4.1211.jre7'
+    provided 'org.postgresql:postgresql:42.2.2'
 
     // plugins
     provided 'org.grails.plugins:hibernate5'
@@ -104,6 +88,7 @@ dependencies {
     provided("org.hibernate:hibernate-ehcache:$hibernateVersion") {
         exclude group: 'net.sf.ehcache', module: 'ehcache'
     }
+    compile 'com.google.code.gson:gson:2.8.4'
 }
 
 task wrapper(type: Wrapper) {

gradle.properties

@@ -1,4 +1,4 @@
-gradleWrapperVersion=3.1
-grailsVersion=3.2.2
-hibernateVersion=5.1.1.Final
-gormVersion=6.0.3
+gradleWrapperVersion=4.7
+grailsVersion=3.3.5
+hibernateVersion=5.2.17.Final
+gormVersion=6.1.9.RELEASE

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Thu Oct 27 05:34:43 HKT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,16 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

grails-app/conf/application.yml

@@ -22,7 +22,7 @@ dataSource:
     username: postgres_extensions
     password: postgres_extensions
     url: jdbc:postgresql://localhost/pg_extensions_test
-    dbCreate: create
+    dbCreate: create-drop
 
 hibernate:
-    dialect: net.kaleidos.hibernate.PostgresqlExtensionsDialect
+    dialect: net.kaleidos.hibernate.PostgresqlExtensionsDialect

grails-app/conf/logback.groovy

@@ -22,3 +22,9 @@ if (Environment.isDevelopmentMode() && targetDir != null) {
 } else {
     root(ERROR, ['STDOUT'])
 }
+
+logger('org.hibernate.SQL', DEBUG)
+
+logger('org.hibernate.type', TRACE)
+
+logger('org.hibernate.tool.hbm2ddl', DEBUG)

grails-app/domain/test/array/TestDouble.groovy

@@ -1,16 +1,19 @@
 package test.array
 
+import groovy.transform.ToString
 import net.kaleidos.hibernate.usertype.ArrayType
 
+@ToString
 class TestDouble {
 
     Double[] doubleNumbers
 
     static mapping = {
-        doubleNumbers type:ArrayType, params: [type: Double]
+        doubleNumbers type: ArrayType, params: [type: Double]
     }
 
     static constraints = {
-        doubleNumbers nullable:true
+        doubleNumbers nullable: true
     }
+
 }

grails-app/domain/test/array/TestEnum.groovy

@@ -1,7 +1,9 @@
 package test.array
 
+import groovy.transform.ToString
 import net.kaleidos.hibernate.usertype.ArrayType
 
+@ToString
 class TestEnum {
 
     static enum Day {
@@ -14,7 +16,8 @@ class TestEnum {
         SUNDAY(6)
 
         final int id
-        Day(int id)  { this.id = id }
+
+        Day(int id) { this.id = id }
     }
 
     Day[] days
@@ -24,6 +27,7 @@ class TestEnum {
     }
 
     static constraints = {
-        days nullable:true
+        days nullable: true
     }
+
 }

grails-app/domain/test/array/TestFloat.groovy

@@ -1,16 +1,20 @@
 package test.array
 
+import groovy.transform.ToString
 import net.kaleidos.hibernate.usertype.ArrayType
 
+
+@ToString
 class TestFloat {
 
     Float[] floatNumbers
 
     static mapping = {
-        floatNumbers type:ArrayType, params: [type: Float]
+        floatNumbers type: ArrayType, params: [type: Float]
     }
 
     static constraints = {
-        floatNumbers nullable:true
+        floatNumbers nullable: true
     }
+
 }

grails-app/domain/test/array/TestInteger.groovy

@@ -1,16 +1,19 @@
 package test.array
 
+import groovy.transform.ToString
 import net.kaleidos.hibernate.usertype.ArrayType
 
+@ToString
 class TestInteger {
 
     Integer[] integerNumbers
 
     static mapping = {
-        integerNumbers type:ArrayType, params: ["type": Integer]
+        integerNumbers type: ArrayType, params: ["type": Integer]
     }
 
     static constraints = {
         integerNumbers nullable: true
     }
+
 }

grails-app/domain/test/array/TestLong.groovy

@@ -1,16 +1,19 @@
 package test.array
 
+import groovy.transform.ToString
 import net.kaleidos.hibernate.usertype.ArrayType
 
+@ToString
 class TestLong {
 
     Long[] longNumbers
 
     static mapping = {
-        longNumbers type:ArrayType, params: [type: Long]
+        longNumbers type: ArrayType, params: [type: Long]
     }
 
     static constraints = {
         longNumbers nullable: true
     }
+
 }

grails-app/domain/test/array/TestString.groovy

@@ -1,16 +1,19 @@
 package test.array
 
+import groovy.transform.ToString
 import net.kaleidos.hibernate.usertype.ArrayType
 
+@ToString
 class TestString {
 
     String[] stringArray
 
     static mapping = {
-        stringArray type:ArrayType, params: [type: String]
+        stringArray type: ArrayType, params: [type: String]
     }
 
     static constraints = {
-        stringArray nullable:true
+        stringArray nullable: true
     }
+
 }

grails-app/domain/test/array/TestUuid.groovy

@@ -1,16 +1,19 @@
 package test.array
 
+import groovy.transform.ToString
 import net.kaleidos.hibernate.usertype.ArrayType
 
+@ToString
 class TestUuid {
 
     UUID[] uuidArray
 
     static mapping = {
-        uuidArray type:ArrayType, params: [type: UUID]
+        uuidArray type: ArrayType, params: [type: UUID]
     }
 
     static constraints = {
-        uuidArray nullable:true
+        uuidArray nullable: true
     }
+
 }