Merge branch 'release/3.0.0'

.travis.yml

@@ -1,3 +1,5 @@
+dist: focal
+arch: amd64
 language: groovy
 jdk:
   - openjdk11
@@ -10,6 +12,7 @@ branches:
     - /^hotfix\/.*$/
 services:
   - docker
+  - postgresql
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
 
@@ -21,14 +24,20 @@ cache:
 
 before_install:
   - sudo rm /usr/local/bin/docker-compose
-  - curl -L https://github.com/docker/compose/releases/download/1.29.1/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - curl -L https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-`uname -s`-`uname -m` > docker-compose
   - chmod +x docker-compose
-  - sudo mv docker-compose /usr/local/bin
+  - mkdir -p ~/.docker/cli-plugins/
+  - cp docker-compose ~/.docker/cli-plugins/docker-compose
+  - sudo cp docker-compose /usr/local/bin
   - docker-compose -f elastic.yml up -d
   - 'export GRADLE_OPTS="-Dgrails.env=travis"'
 
+install:
+  - 'travis_wait 30 ./gradlew clean'
+  - './gradlew assemble'
+
 after_success:
-  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && GRADLE_OPTS="-Dgrails.env=production" travis_retry ./gradlew clean assemble publish --stacktrace'
+  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && GRADLE_OPTS="-Dgrails.env=production" travis_retry ./gradlew publish --stacktrace'
 
 after_script:
   - docker-compose -f elastic.yml kill

buildSrc/build.gradle

@@ -0,0 +1,9 @@
+repositories {
+    mavenCentral()
+    maven { url "https://repo.grails.org/grails/core/" }
+}
+dependencies {
+    implementation("com.bertramlabs.plugins:asset-pipeline-gradle:4.3.0")
+    implementation("org.grails:grails-gradle-plugin:6.1.0")
+    implementation("org.grails.plugins:hibernate5:8.0.1")
+}

elastic.yml

@@ -7,6 +7,7 @@ services:
     environment: 
       - cluster.name=docker-cluster
       - discovery.type=single-node
+      - cluster.routing.allocation.disk.threshold_enabled=false
     image: "docker.elastic.co/elasticsearch/elasticsearch:7.9.2"
     networks: 
       - elasticsearch

gradle.properties

@@ -1,7 +1,13 @@
 #Mon Mar 02 16:40:48 AEDT 2020
-grailsVersion=4.1.1
-gorm.version=7.0.8.RELEASE
+grailsVersion=6.1.0
+grailsGradlePluginVersion=6.1.0
+version=3.0.0
+org.gradle.caching=true
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M
-amazonAwsSdkVersion=1.11.734
+gormVersion=8.0.0
+#groovyVersion=3.0.11
+#gorm.version=7.3.2
+amazonAwsSdkVersion=1.12.418
+alaSecurityLibsVersion=6.2.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jul 19 17:05:22 AEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip