Fixing failed merge.

.travis.yml

@@ -1,42 +1,23 @@
 language: groovy
-sudo: false
 jdk:
 - oraclejdk8
+sudo: false
 branches:
-  except:
-  - trunk
-before_install:
-- export TZ=Australia/Canberra
-- date
-- rm -rf ~/.sdkman
-- curl -s get.sdkman.io > ~/install_gvm.sh
-- chmod 775 ~/install_gvm.sh
-- ~/install_gvm.sh
-- echo "sdkman_auto_answer=true" > ~/.sdkman/etc/config
-- source ~/.sdkman/bin/sdkman-init.sh
-- GRAILS_VERSION=`grep '^\s*app.grails.version' application.properties | sed -e 's/^\s*app\.grails\.version=//g'
-  | tr -d "\r"`
-- echo "GRAILS_VERSION:$GRAILS_VERSION"
-- sdk install grails $GRAILS_VERSION || true
-before_script:
-- GRAILS_VERSION_NUMBER=`echo $GRAILS_VERSION | sed -e 's/\.[0-9]*$//g' -e 's/\.//g'
-  | tr -d "\r"`
-- echo "GRAILS_VERSION_NUMBER:$GRAILS_VERSION_NUMBER"
-- GRAILS_SETTINGS_FILE="travis_grails_settings_new.groovy"
-- if [ "$GRAILS_VERSION_NUMBER" -lt "23" ]; then GRAILS_SETTINGS_FILE="travis_grails_settings_old.groovy";
-  fi;
-- echo "GRAILS_SETTINGS_FILE:$GRAILS_SETTINGS_FILE"
-- mkdir -p ~/.grails; wget -q -O ~/.grails/settings.groovy https://raw.githubusercontent.com/AtlasOfLivingAustralia/travis-build-configuration/master/$GRAILS_SETTINGS_FILE
-- MAVEN_REPO="ala-repo-snapshot"
-- APP_VERSION=`grep '^\s*def\s*version' *GrailsPlugin.groovy | sed -e 's/^.*= *"//g'
-  | sed -e 's/".*$//g' | tr -d "\r"`
-- echo $APP_VERSION | grep -q "\-SNAPSHOT"; if [ "$?" = "1" ]; then MAVEN_REPO="ala-repo-release";
-  fi;
-- echo "APP_VERSION:$APP_VERSION"
-- echo "MAVEN_REPO:$MAVEN_REPO"
-script:
-- grails clean && grails refresh-dependencies --non-interactive && grails prod maven-install
-  --non-interactive && grails prod maven-deploy --repository=$MAVEN_REPO --non-interactive
+  only:
+  - master
+  - hotfix
+  - grails-jdk-upgrade
+  - bs3-with-grails3
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  directories:
+  - $HOME/.m2
+  - $HOME/.gradle/caches/
+  - $HOME/.gradle/wrapper/
+after_success:
+  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && travis_retry ./gradlew publish'
 env:
   global:
   - secure: 8H8KsZuqo9KMJJRgl6w5TzBj2XIPYzxQfE/KvlV3PPLvwmJoL1d18Voh4vnAR3SA5WGI+ZlRBHZxbGDjRigIE4FpxN0WoDkGpRZVB/5nChH+ldViiYejDL4IkBmbhqG8x7zZ2GghLdeXqoQc3bqeaskxOBBmlYGMSA9YUWI4j4s=

src/main/groovy/images/client/plugin/ImagesClientPluginGrailsPlugin.groovy

@@ -1,8 +1,10 @@
-class ImagesClientPluginGrailsPlugin {
-    // the plugin version
-    def version = "0.8.1-SNAPSHOT"
+package images.client.plugin
+
+import grails.plugins.Plugin
+
+class ImagesClientPluginGrailsPlugin extends Plugin {
     // the version or versions of Grails the plugin is designed for
-    def grailsVersion = "2.2 > *"
+    def grailsVersion = "3.2.11 > *"
     // resources that are excluded from plugin packaging
     def pluginExcludes = [
             "grails-app/views/error.gsp"
@@ -39,30 +41,10 @@ class ImagesClientPluginGrailsPlugin {
         // TODO Implement additions to web.xml (optional), this event occurs before
     }
 
-    def doWithSpring = {
-
-        if (!application.config.grails.cache.config) {
-            application.config.grails.cache.config = {}
+    Closure doWithSpring() {
+        { ->
+            println("ImagesClientPluginGrailsPlugin starting")
         }
-
-        application.config.grails.cache.config = application.config.grails.cache.config << {
-
-            defaults {
-                eternal false
-                overflowToDisk false
-                maxElementsInMemory 20000
-                timeToLiveSeconds 3600
-            }
-
-            cache {
-                name 'speciesListKvp'
-                eternal false
-                overflowToDisk false
-                maxElementsInMemory 20000
-                timeToLiveSeconds(3600 * 2) // 2 hours
-            }
-        }
-
     }
 
     def doWithDynamicMethods = { ctx ->
@@ -87,4 +69,4 @@ class ImagesClientPluginGrailsPlugin {
     def onShutdown = { event ->
         // TODO Implement code that is executed when the application shuts down (optional)
     }
-}
+}