Merge pull request #404 from AtlasOfLivingAustralia/release/3.0.0

Release/3.0.0

.travis.yml

@@ -19,17 +19,9 @@ cache:
   - $HOME/.gradle/caches/
   - $HOME/.gradle/wrapper/
 after_success:
+  - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST"
   - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && travis_retry ./gradlew publish'
-jobs:
-  include:
-    - stage: trigger downstream
-      script: |
-        echo "TRAVIS_BRANCH=$TRAVIS_BRANCH TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST"
-        if [[ ($TRAVIS_PULL_REQUEST == false) ]] ; then
-          sh .travis/trigger-travis.sh --branch $TRAVIS_BRANCH AtlasOfLivingAustralia ala-hub $TRAVIS_ACCESS_TOKEN
-        else
-          echo "trigger-travis.sh did not run"
-        fi
+  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && sh .travis/trigger-travis.sh --pro --branch $TRAVIS_BRANCH AtlasOfLivingAustralia ala-hub $TRAVIS_ACCESS_TOKEN'
 env:
   global:
   - secure: fwa7jtwNL/MNa3+iI+r0jrGwnQcC8fYtgH9vbOT3x9MHo0b2K2CCTq+io+U2iDhFpDt1Tee49ZqL38aQV+/Q7oW9OddRCBhpPafLwvIeAeEAzYVfZzYj0M5QfomqhQfFqaeBlsDGWLmfqs+Qa56acG/5AXvy2bdIBkx8eobxKHw=

.travis/trigger-travis.sh

@@ -17,12 +17,8 @@ if [ "$#" -lt 3 ] || [ "$#" -ge 7 ]; then
   exit 1
 fi
 
-if [ "$1" = "--pro" ] ; then
-  TRAVIS_URL=travis-ci.com
-  shift
-else
-  TRAVIS_URL=travis-ci.org
-fi
+# always use travis-ci.com
+TRAVIS_URL=travis-ci.com
 
 if [ "$1" = "--branch" ] ; then
   shift

README.md

@@ -1,8 +1,8 @@
-# biocache-hubs [![Build Status](https://travis-ci.org/AtlasOfLivingAustralia/biocache-hubs.svg?branch=master)](http://travis-ci.org/AtlasOfLivingAustralia/biocache-hubs) 
+# biocache-hubs [![Build Status](https://travis-ci.com/AtlasOfLivingAustralia/biocache-hubs.svg?branch=master)](https://travis-ci.com/AtlasOfLivingAustralia/biocache-hubs) 
 
-**biocache-hubs** is a Grails plugin that provides the core functionality for the _Atlas of Living Australia_ (ALA) [Occurrence search portal](http://biocache.ala.org.au/search) (Biocache) front-end.
+**biocache-hubs** is a Grails plugin that provides the core functionality for the _Atlas of Living Australia_ (ALA) [Occurrence search portal](https://biocache.ala.org.au/search) (Biocache) front-end.
 
-This application/plugin provides a web UI for a back-end service called [**biocache-service**](https://github.com/AtlasOfLivingAustralia/biocache-service) (see [biocache-service API](http://biocache.ala.org.au/ws)) - a full-text search and record retreival for occurrence data records, using JSON data format.
+This application/plugin provides a web UI for a back-end service called [**biocache-service**](https://github.com/AtlasOfLivingAustralia/biocache-service) (see [biocache-service API](https://biocache-ws.ala.org.au/ws)) - a full-text search and record retreival for occurrence data records, using JSON data format.
 
 An example Grails application that uses this plugin, is the [**generic-hub**](https://github.com/AtlasOfLivingAustralia/generic-hub) app. There are other implementations listed in the [ALA Github repository](https://github.com/AtlasOfLivingAustralia?query=-hub) (all implementations have a suffix '-hub').
 
@@ -31,7 +31,7 @@ If you have deployed biocache-hubs plugin version 1.4.x or earlier in your own h
 * The minimum version of Java is 8
 * You have to use the latest Grails 3.1.x 
 Use these as reference: 
-    * http://docs.grails.org/3.2.11/guide/upgrading.html#upgrading2x
+    * https://docs.grails.org/3.2.11/guide/upgrading.html#upgrading2x
     * https://docs.grails.org/3.0.x/guide/upgrading.html
 * biocache-hubs now uses ala-auth 3.x, see this [guide](https://github.com/AtlasOfLivingAustralia/ala-auth-plugin/wiki/1.x-Migration-Guide) for configuration changes
 * Grails 3 no longer supports resources pipeline, You will have to migrate resources settings to [Asset pipeline plugin configuration](http://www.asset-pipeline.com/manual/#grails3)

build.gradle

@@ -10,7 +10,7 @@ buildscript {
     }
 }
 
-version "2.1.9"
+version "3.0.0"
 group "au.org.ala.plugins.grails"
 
 apply plugin:"eclipse"
@@ -71,9 +71,13 @@ dependencies {
     compile "org.apache.commons:commons-lang3:3.7"
     compile "org.apache.commons:commons-text:1.3"
     compile "net.sf.supercsv:super-csv:2.1.0"
+    compile group: 'org.apache.lucene', name: 'lucene-queryparser', version: '8.5.1'
+
     //compile 'com.google.guava:guava:19.0' // replaces ehcache
     compile "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1"
 
+    compile "au.org.ala:data-quality-filter-service-client:1.0.0", noCache
+
     //plugins
     //compile 'org.grails.plugins:cache-ehcache:3.0.0.M1'
     compile 'org.grails.plugins:http-builder-helper:1.0.2.ALA'

gradle.properties

@@ -1,3 +1,5 @@
+#Mon May 18 05:26:56 AEST 2020
 grailsVersion=3.2.11
-gormVersion=6.0.12.RELEASE
+grailsWrapperVersion=1.0.0
+gormVersion=6.1.12.RELEASE
 gradleWrapperVersion=3.4.1

grails-app/assets/javascripts/exploreYourArea.js

@@ -22,7 +22,6 @@
 //= require leaflet-plugins/spin/spin.min.js
 //= require leaflet-plugins/spin/leaflet.spin.js
 //= require leaflet-plugins/EasyButton/easy-button.js
-//= require leaflet-google.js
 //= require magellan.js
 //= require jquery.qtip.min.js
 //= require biocache-hubs.js