Merge pull request #168 from AtlasOfLivingAustralia/name-match-redesign

Release 1.4.1

.gitignore

@@ -1,7 +1,13 @@
-.slcache
-
-out
-*.iml
-target
+Thumbs.db
+.DS_Store
+.gradle
+build/
+target/
 .idea
-
+*.iml
+*.ipr
+*.iws
+.project
+.settings
+.classpath
+.slcache

.travis.yml

@@ -1,23 +1,22 @@
 language: groovy
 jdk:
-- oraclejdk7
+- oraclejdk8
 sudo: false
 branches:
  only:
- - master
- - hotfix
-before_install:
-- wget -q https://raw.githubusercontent.com/AtlasOfLivingAustralia/travis-build-configuration/master/ala_common.sh
-- chmod +x ala_common.sh
-- source ./ala_common.sh
+ - name-match-redesign
+before_cache:
+ - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+ - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
 
-- ala_travis_grails_setup_env
-
-script:
-- ala_travis_grails_test
+cache:
+ directories:
+ - $HOME/.m2
+ - $HOME/.gradle/caches/
+ - $HOME/.gradle/wrapper/
 
 after_success:
-- ala_travis_grails_deploy
+ - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && travis_retry ./gradlew publish'
 
 env:
  global:

build.gradle

@@ -0,0 +1,92 @@
+buildscript {
+ repositories {
+ mavenLocal()
+ maven { url "http://nexus.ala.org.au/content/groups/public/" }
+ maven { url "https://repo.grails.org/grails/core" }
+ }
+ dependencies {
+ classpath "org.grails:grails-gradle-plugin:$grailsVersion"
+ classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.14.1"
+ //classpath "org.grails.plugins:hibernate5:${gormVersion-".RELEASE"}"
+ }
+}
+
+version "1.4.1"
+group "au.org.ala"
+
+apply plugin:"eclipse"
+apply plugin:"idea"
+apply plugin:"war"
+apply plugin:"org.grails.grails-web"
+apply plugin:"org.grails.grails-gsp"
+apply plugin:"asset-pipeline"
+
+apply from: 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/travis-build-configuration/master/travis_grails_publish.gradle'
+
+repositories {
+ mavenLocal()
+ maven { url "http://nexus.ala.org.au/content/groups/public/" }
+ maven { url "https://repo.grails.org/grails/core" }
+}
+
+dependencies {
+ compile "org.springframework.boot:spring-boot-starter-logging"
+ compile "org.springframework.boot:spring-boot-autoconfigure"
+ compile "org.grails:grails-core"
+ compile "org.springframework.boot:spring-boot-starter-actuator"
+ compile "org.springframework.boot:spring-boot-starter-tomcat"
+ compile "org.grails:grails-dependencies"
+ compile "org.grails:grails-web-boot"
+ compile "org.grails.plugins:cache"
+ //compile "org.grails.plugins:scaffolding"
+ //compile "org.grails.plugins:hibernate5"
+ //compile "org.hibernate:hibernate-core:5.1.3.Final"
+ //compile "org.hibernate:hibernate-ehcache:5.1.3.Final"
+ console "org.grails:grails-console"
+ profile "org.grails.profiles:web"
+ runtime "com.bertramlabs.plugins:asset-pipeline-grails:2.14.1"
+ runtime "org.hibernate:hibernate-validator:5.1.3.Final"
+ //runtime "com.h2database:h2"
+ 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"
+
+ compile "org.grails.plugins:ala-ws-security-plugin:2.0-SNAPSHOT"
+ compile 'com.github.davidmoten:rxjava-file:0.4'
+ compile 'io.reactivex:rxgroovy:1.0.3'
+ compile ('org.jasig.cas.client:cas-client-core:3.4.1') {
+ exclude group: 'javax.servlet', module: 'servlet-api'
+ }
+
+ compile 'net.sf.opencsv:opencsv:2.3'
+ compile "org.apache.solr:solr-solrj:5.4.0"
+ compile("org.gbif:dwca-io:1.24") {
+ exclude group: 'com.google.guava', module: 'guava'
+ }
+ compile "com.google.guava:guava:19.0"
+ compile("au.org.ala:ala-name-matching:2.4.6") {
+ exclude group: 'org.slf4j', module: 'slf4j-log4j12'
+ }
+ compile "org.jsoup:jsoup:1.8.3"
+ compile 'org.grails.plugins:external-config:1.1.1'
+
+ compile group: 'org.grails.plugins', name: 'ala-bootstrap3', version: '3.0.0-SNAPSHOT', changing: true
+ compile(group: 'org.grails.plugins', name: 'ala-auth', version:'3.1.0-SNAPSHOT', changing: true) {
+ exclude group: 'javax.servlet', module: 'servlet-api'
+ }
+ compile group: 'org.grails.plugins', name: 'ala-admin-plugin', version: '2.0-SNAPSHOT', changing: true
+ compile "org.grails.plugins:grails-spring-websocket:2.3.0"
+ //compile "org.grails.plugins:rxjava2:2.0.0"
+}
+
+bootRun {
+ jvmArgs('-Dspring.output.ansi.enabled=always')
+ addResources = true
+}
+
+
+assets {
+ minifyJs = true
+ minifyCss = true
+}

gradle.properties

@@ -0,0 +1,5 @@
+#Tue Aug 08 13:13:22 AEST 2017
+grailsVersion=3.2.11
+grailsWrapperVersion=1.0.0
+gormVersion=6.0.12.RELEASE
+gradleWrapperVersion=3.4.1

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Mon Aug 07 10:51:52 AEST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip