Update build files and dependencies

.gitignore

@@ -32,6 +32,9 @@
 # Gradle:
 .idea/gradle.xml
 .idea/libraries
+*.iml
+*.ipr
+*.iws
 
 # Mongo Explorer plugin:
 .idea/mongoSettings.xml

gradle.properties

@@ -1,5 +1,5 @@
-grailsVersion=3.1.14
-gradleWrapperVersion=2.13
+grailsVersion=3.2.11
+gradleWrapperVersion=3.4.1
 
 org.gradle.daemon=true
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Dec 05 15:46:31 GMT 2016
+#Mon Jul 10 17:41:47 BST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-2.11-bin.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-3.4.1-bin.zip

gradlew

@@ -1,17 +1,35 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ## Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 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=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
  CYGWIN* )
  cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
  MINGW* )
  msys=true
  ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
  MAX_FD_LIMIT=`ulimit -H -n`
  if [ $? -eq 0 ] ; then
  if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +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
+ cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@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=
-
 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
 
@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

rabbitmq-native-test-plugin/build.gradle

@@ -1,7 +1,4 @@
 buildscript {
- ext {
- grailsVersion = project.grailsVersion
- }
  repositories {
  mavenLocal()
  maven { url "https://repo.grails.org/grails/core" }
@@ -15,23 +12,11 @@ apply plugin:"eclipse"
 apply plugin:"idea"
 apply plugin:"org.grails.grails-plugin"
 
-ext {
- grailsVersion = project.grailsVersion
- gradleWrapperVersion = project.gradleWrapperVersion
-}
-
 repositories {
  mavenLocal()
  maven { url "https://repo.grails.org/grails/core" }
 }
 
-dependencyManagement {
- imports {
- mavenBom "org.grails:grails-bom:$grailsVersion"
- }
- applyMavenExclusions false
-}
-
 dependencies {
  compile "org.springframework.boot:spring-boot-starter-logging"
  compile "org.springframework.boot:spring-boot-autoconfigure"
@@ -41,13 +26,11 @@ dependencies {
  provided "org.grails:grails-plugin-services"
  provided "org.grails:grails-plugin-domain-class"
  testCompile "org.grails:grails-plugin-testing"
- compile project(':rabbitmq-native3')
-
 }
 
-grails {
- exploded = true
- plugins {
-
- }
-}
+bootRun {
+ jvmArgs('-Dspring.output.ansi.enabled=always')
+ addResources = true
+}
+// enable if you wish to package this plugin as a standalone application
+bootRepackage.enabled = false

rabbitmq-native/build.gradle

@@ -1,7 +1,4 @@
 buildscript {
- ext {
- grailsVersion = project.grailsVersion
- }
  repositories {
  mavenLocal()
  maven { url "https://repo.grails.org/grails/core" }
@@ -16,38 +13,32 @@ apply plugin:"idea"
 apply plugin:"org.grails.grails-plugin"
 apply plugin:"org.grails.grails-plugin-publish"
 
-ext {
- grailsVersion = project.grailsVersion
- gradleWrapperVersion = project.gradleWrapperVersion
-}
-
 repositories {
  mavenLocal()
  maven { url "https://repo.grails.org/grails/core" }
 }
 
-dependencyManagement {
- imports {
- mavenBom "org.grails:grails-bom:$grailsVersion"
- }
- applyMavenExclusions false
-}
-
 dependencies {
  compile "org.springframework.boot:spring-boot-starter-logging"
  compile "org.springframework.boot:spring-boot-autoconfigure"
  compile "org.grails:grails-core"
  console "org.grails:grails-console"
- profile "org.grails.profiles:plugin:$grailsVersion"
+ profile "org.grails.profiles:plugin"
  provided "org.grails:grails-plugin-services"
- provided "org.grails:grails-plugin-domain-class"
  testCompile "org.grails:grails-plugin-testing"
 
  compile 'commons-lang:commons-lang:2.6'
- compile 'org.codehaus.groovy:groovy-json:2.4.7'
+ compile 'org.codehaus.groovy:groovy-json:2.4.11'
  compile 'com.rabbitmq:amqp-client:3.6.6'
 }
 
+bootRun {
+ jvmArgs('-Dspring.output.ansi.enabled=always')
+ addResources = true
+}
+// enable if you wish to package this plugin as a standalone application
+bootRepackage.enabled = false
+
 grailsPublish {
  githubSlug = 'ofreeman/grails-rabbitmq-native'
  license {
@@ -65,8 +56,6 @@ grailsPublish {
 
  websiteUrl = 'https://github.com/olliefreeman/grails-rabbitmq-native'
  vcsUrl = 'https://github.com/olliefreeman/grails-rabbitmq-native.git'
-
-
 }
 
 publishing {

rabbitmq-native/grails-app/conf/application.yml

@@ -3,8 +3,33 @@ grails:
  doc:
  title: RabbitMQ Native Plugin
  authors: Bud Byrd
+ codegen:
+ defaultPackage: plugin
+ spring:
+ transactionManagement:
+ proxies: false
+ gorm:
+ # Whether to autowire entities.
+ # Disabled by default for performance reasons.
+ autowire: false
+ reactor:
+ # Whether to translate GORM events into Reactor events
+ # Disabled by default for performance reasons
+ events: false
 info:
  app:
  name: '@info.app.name@'
  version: '@info.app.version@'
  grailsVersion: '@info.app.grailsVersion@'
+spring:
+ main:
+ banner-mode: "off"
+ groovy:
+ template:
+ check-template-location: false
+
+# Spring Actuator Endpoints are Disabled by Default
+endpoints:
+ enabled: false
+ jmx:
+ enabled: true

rabbitmq-native/grails-app/conf/logback.groovy

@@ -1,30 +1,39 @@
 import grails.util.BuildSettings
 import grails.util.Environment
+import org.springframework.boot.logging.logback.ColorConverter
+import org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter
 
+import java.nio.charset.Charset
+
+conversionRule 'clr', ColorConverter
+conversionRule 'wex', WhitespaceThrowableProxyConverter
 
 // See https://logback.qos.ch/manual/groovy.html for details on configuration
 appender('STDOUT', ConsoleAppender) {
  encoder(PatternLayoutEncoder) {
- pattern = "%level %logger - %msg%n"
+ charset = Charset.forName('UTF-8')
+
+ pattern =
+ '%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} ' + // Date
+ '%clr(%5p) ' + // Log level
+ '%clr(---){faint} %clr([%15.15t]){faint} ' + // Thread
+ '%clr(%-40.40logger{39}){cyan} %clr(:){faint} ' + // Logger
+ '%m%n%wex' // Message
  }
 }
 
-root(ERROR, ['STDOUT'])
-
-if(Environment.current == Environment.DEVELOPMENT) {
- def targetDir = BuildSettings.TARGET_DIR
- if(targetDir) {
-
- appender("FULL_STACKTRACE", FileAppender) {
-
- file = "${targetDir}/stacktrace.log"
- append = true
- encoder(PatternLayoutEncoder) {
- pattern = "%level %logger - %msg%n"
- }
+def targetDir = BuildSettings.TARGET_DIR
+if (Environment.isDevelopmentMode() && targetDir != null) {
+ appender("FULL_STACKTRACE", FileAppender) {
+ file = "${targetDir}/stacktrace.log"
+ append = true
+ encoder(PatternLayoutEncoder) {
+ pattern = "%level %logger - %msg%n"
  }
- logger("StackTrace", ERROR, ['FULL_STACKTRACE'], false )
  }
+ logger("StackTrace", ERROR, ['FULL_STACKTRACE'], false)
 }
+root(ERROR, ['STDOUT'])
+
 
 logger 'com.budjb.rabbitmq', DEBUG