Merge branch 'release/2.2.1'

.gitignore

@@ -129,6 +129,7 @@ hs_err_pid*
 
 # Allow Grails Wrapper
 !/wrapper/*.jar
+!grails-wrapper.jar
 # Allow Gradle Wrapper
 !/gradle/wrapper/gradle-wrapper.jar
 

.travis.yml

@@ -1,6 +1,6 @@
 language: groovy
 jdk:
-  - oraclejdk8
+  - openjdk8
 sudo: false
 branches:
   only:

CHANGELOG.md

@@ -0,0 +1,177 @@
+# Change Log
+
+## [V2.2.1](https://github.com/AtlasOfLivingAustralia/userdetails/tree/v2.2.1) (2019-07-19)
+
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/v2.2.0...v2.2.1)
+
+**Features:**
+- Add user search by username, email and display name WS endpoint
+- Add user search by role endpoint
+- Support 2019 ALA UI
+- Add support for linking iNaturalist accounts
+
+**Closed issues:**
+
+- User Admin: Add comments field to user details page  [\#64](https://github.com/AtlasOfLivingAustralia/userdetails/issues/64)
+- Allow HTML in bulk user template [\#52](https://github.com/AtlasOfLivingAustralia/userdetails/issues/52)
+- created field shows date of last change, not account creation date [\#45](https://github.com/AtlasOfLivingAustralia/userdetails/issues/45)
+
+**Merged pull requests:**
+
+- Bugfix legacy encoder [\#62](https://github.com/AtlasOfLivingAustralia/userdetails/pull/62) ([reupost](https://github.com/reupost))
+
+## [v2.2.0](https://github.com/AtlasOfLivingAustralia/userdetails/tree/v2.2.0) (2018-08-15)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/VV2.1.3...v2.2.0)
+
+**Closed issues:**
+
+- Password reset allows double submit and produces a confusing error when it does [\#33](https://github.com/AtlasOfLivingAustralia/userdetails/issues/33)
+
+**Merged pull requests:**
+
+- View your downloaded records link [\#56](https://github.com/AtlasOfLivingAustralia/userdetails/pull/56) ([javier-molina](https://github.com/javier-molina))
+- Merge dev to master for V2.1.4 [\#54](https://github.com/AtlasOfLivingAustralia/userdetails/pull/54) ([chrisala](https://github.com/chrisala))
+
+## [VV2.1.3](https://github.com/AtlasOfLivingAustralia/userdetails/tree/VV2.1.3) (2018-06-14)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/V2.1.2...VV2.1.3)
+
+## [V2.1.2](https://github.com/AtlasOfLivingAustralia/userdetails/tree/V2.1.2) (2018-06-12)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/V2.1.1...V2.1.2)
+
+## [V2.1.1](https://github.com/AtlasOfLivingAustralia/userdetails/tree/V2.1.1) (2018-06-12)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/V2.1...V2.1.1)
+
+## [V2.1](https://github.com/AtlasOfLivingAustralia/userdetails/tree/V2.1) (2018-06-12)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/0.12.1...V2.1)
+
+**Fixed bugs:**
+
+- When viewing user list filtered by role, the paging buttons do not include the role [\#50](https://github.com/AtlasOfLivingAustralia/userdetails/issues/50)
+- Cannot browse to users from the role list if their id is greater than 1000 [\#49](https://github.com/AtlasOfLivingAustralia/userdetails/issues/49)
+- Error when viewing by role ROLE\_USER [\#48](https://github.com/AtlasOfLivingAustralia/userdetails/issues/48)
+
+## [0.12.1](https://github.com/AtlasOfLivingAustralia/userdetails/tree/0.12.1) (2018-05-08)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/V2.0.0...0.12.1)
+
+## [V2.0.0](https://github.com/AtlasOfLivingAustralia/userdetails/tree/V2.0.0) (2017-11-08)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/v1.0.0...V2.0.0)
+
+## [v1.0.0](https://github.com/AtlasOfLivingAustralia/userdetails/tree/v1.0.0) (2017-08-16)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/0.12.0...v1.0.0)
+
+## [0.12.0](https://github.com/AtlasOfLivingAustralia/userdetails/tree/0.12.0) (2017-07-18)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/0.11.0...0.12.0)
+
+## [0.11.0](https://github.com/AtlasOfLivingAustralia/userdetails/tree/0.11.0) (2017-07-12)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/0.10...0.11.0)
+
+## [0.10](https://github.com/AtlasOfLivingAustralia/userdetails/tree/0.10) (2017-07-07)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/0.9...0.10)
+
+**Merged pull requests:**
+
+- Dev [\#39](https://github.com/AtlasOfLivingAustralia/userdetails/pull/39) ([chrisala](https://github.com/chrisala))
+
+## [0.9](https://github.com/AtlasOfLivingAustralia/userdetails/tree/0.9) (2017-03-02)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/userdetails-0.8...0.9)
+
+**Merged pull requests:**
+
+- Dev [\#38](https://github.com/AtlasOfLivingAustralia/userdetails/pull/38) ([chrisala](https://github.com/chrisala))
+
+## [userdetails-0.8](https://github.com/AtlasOfLivingAustralia/userdetails/tree/userdetails-0.8) (2016-04-26)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/userdetails-0.7...userdetails-0.8)
+
+**Implemented enhancements:**
+
+- User details page \(admin\) add URL for reset password link [\#15](https://github.com/AtlasOfLivingAustralia/userdetails/issues/15)
+- Add "change email address" option to editAccount page [\#1](https://github.com/AtlasOfLivingAustralia/userdetails/issues/1)
+
+**Fixed bugs:**
+
+- New user creation error [\#19](https://github.com/AtlasOfLivingAustralia/userdetails/issues/19)
+
+**Closed issues:**
+
+- Admin screen - add export all users to CSV [\#27](https://github.com/AtlasOfLivingAustralia/userdetails/issues/27)
+- Login screen - change username to email [\#24](https://github.com/AtlasOfLivingAustralia/userdetails/issues/24)
+- Log4j config need fixing [\#20](https://github.com/AtlasOfLivingAustralia/userdetails/issues/20)
+- User profile has wrong term for DigiVol [\#17](https://github.com/AtlasOfLivingAustralia/userdetails/issues/17)
+- Add "disable account" button to editAccount page [\#2](https://github.com/AtlasOfLivingAustralia/userdetails/issues/2)
+
+## [userdetails-0.7](https://github.com/AtlasOfLivingAustralia/userdetails/tree/userdetails-0.7) (2015-12-15)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/userdetails-0.6...userdetails-0.7)
+
+**Closed issues:**
+
+- user lookup should include user's roles [\#25](https://github.com/AtlasOfLivingAustralia/userdetails/issues/25)
+- add ability to update/create and view a property for a user [\#21](https://github.com/AtlasOfLivingAustralia/userdetails/issues/21)
+
+**Merged pull requests:**
+
+- fixes \#25: now user id lookup will incude user's role [\#26](https://github.com/AtlasOfLivingAustralia/userdetails/pull/26) ([temi](https://github.com/temi))
+- fixes \#21: adds ability to get and update a property. [\#23](https://github.com/AtlasOfLivingAustralia/userdetails/pull/23) ([temi](https://github.com/temi))
+
+## [userdetails-0.6](https://github.com/AtlasOfLivingAustralia/userdetails/tree/userdetails-0.6) (2015-09-17)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/userdetails-0.5...userdetails-0.6)
+
+**Fixed bugs:**
+
+- Flickr linking broken [\#18](https://github.com/AtlasOfLivingAustralia/userdetails/issues/18)
+
+## [userdetails-0.5](https://github.com/AtlasOfLivingAustralia/userdetails/tree/userdetails-0.5) (2015-05-04)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/userdetails-0.4...userdetails-0.5)
+
+**Implemented enhancements:**
+
+- Allow extra information to be requested from user details lookups [\#16](https://github.com/AtlasOfLivingAustralia/userdetails/issues/16)
+
+**Fixed bugs:**
+
+- Registration form bug [\#8](https://github.com/AtlasOfLivingAustralia/userdetails/issues/8)
+
+## [userdetails-0.4](https://github.com/AtlasOfLivingAustralia/userdetails/tree/userdetails-0.4) (2015-03-23)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/userdetails-0.3...userdetails-0.4)
+
+**Closed issues:**
+
+- generated confirm registration link/URL broken [\#13](https://github.com/AtlasOfLivingAustralia/userdetails/issues/13)
+
+## [userdetails-0.3](https://github.com/AtlasOfLivingAustralia/userdetails/tree/userdetails-0.3) (2015-03-04)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/userdetails-0.2...userdetails-0.3)
+
+**Merged pull requests:**
+
+- Updated Spanish translation. Added Catalan translation [\#59](https://github.com/AtlasOfLivingAustralia/userdetails/pull/59) ([vjrj](https://github.com/vjrj))
+- Applies 2015 look and feel [\#12](https://github.com/AtlasOfLivingAustralia/userdetails/pull/12) ([m-r-c](https://github.com/m-r-c))
+- Fixes [\#11](https://github.com/AtlasOfLivingAustralia/userdetails/pull/11) ([m-r-c](https://github.com/m-r-c))
+
+## [userdetails-0.2](https://github.com/AtlasOfLivingAustralia/userdetails/tree/userdetails-0.2) (2015-02-09)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/userdetails-20140318...userdetails-0.2)
+
+**Fixed bugs:**
+
+- userdetails-config.properties not in sync with Config.groovy [\#10](https://github.com/AtlasOfLivingAustralia/userdetails/issues/10)
+- Construction of URL should check for existing request params [\#7](https://github.com/AtlasOfLivingAustralia/userdetails/issues/7)
+- Can't create a user from the "New User" page [\#4](https://github.com/AtlasOfLivingAustralia/userdetails/issues/4)
+
+**Closed issues:**
+
+- Can't create a user from the  [\#3](https://github.com/AtlasOfLivingAustralia/userdetails/issues/3)
+
+**Merged pull requests:**
+
+- Updates to user details service [\#9](https://github.com/AtlasOfLivingAustralia/userdetails/pull/9) ([davidbairdala](https://github.com/davidbairdala))
+- Update ala-web-theme to v0.8.1 [\#6](https://github.com/AtlasOfLivingAustralia/userdetails/pull/6) ([sbearcsiro](https://github.com/sbearcsiro))
+- Fixes \#4 Can't create a user from the 'New User' page [\#5](https://github.com/AtlasOfLivingAustralia/userdetails/pull/5) ([sbearcsiro](https://github.com/sbearcsiro))
+
+## [userdetails-20140318](https://github.com/AtlasOfLivingAustralia/userdetails/tree/userdetails-20140318) (2014-04-07)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/userdetails-b4-19092013...userdetails-20140318)
+
+## [userdetails-b4-19092013](https://github.com/AtlasOfLivingAustralia/userdetails/tree/userdetails-b4-19092013) (2013-09-19)
+[Full Changelog](https://github.com/AtlasOfLivingAustralia/userdetails/compare/ozatlas-before-jqm11...userdetails-b4-19092013)
+
+## [ozatlas-before-jqm11](https://github.com/AtlasOfLivingAustralia/userdetails/tree/ozatlas-before-jqm11) (2012-04-30)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
     dependencies {
         classpath "org.grails:grails-gradle-plugin:$grailsVersion"
-        classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.14.1"
+        classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.15.1"
         classpath "org.grails.plugins:hibernate5:${gormVersion-".RELEASE"}"
     }
 }
@@ -17,21 +17,25 @@ plugins {
     id "com.gorylenko.gradle-git-properties" version "1.4.17"
 }
 
-version "2.2.1-SNAPSHOT"
+version "2.2.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 plugin:"org.grails.grails-gsp"
 
 apply from: 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/travis-build-configuration/master/travis_grails_publish.gradle'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
+configurations.all {
+    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+}
+
 repositories {
     mavenLocal()
     maven { url "https://nexus.ala.org.au/content/groups/public/" }
@@ -44,59 +48,73 @@ dependencies {
     compile "org.grails:grails-core"
     compile "org.springframework.boot:spring-boot-starter-actuator"
     provided "org.springframework.boot:spring-boot-starter-tomcat"
-    compile "org.grails:grails-dependencies"
     compile "org.grails:grails-web-boot"
+    compile "org.grails:grails-logging"
+    compile "org.grails:grails-plugin-rest"
+    compile "org.grails:grails-plugin-databinding"
+    compile "org.grails:grails-plugin-i18n"
+    compile "org.grails:grails-plugin-services"
+    compile "org.grails:grails-plugin-url-mappings"
+    compile "org.grails:grails-plugin-interceptors"
     compile "org.grails.plugins:cache"
+    compile "org.grails.plugins:async"
     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"
+    compile "org.hibernate:hibernate-core:5.1.16.Final"
+//    compile "org.hibernate:hibernate-ehcache:5.1.16.Final"
+    compile "org.grails.plugins:gsp"
     console "org.grails:grails-console"
     profile "org.grails.profiles:web"
-    runtime "com.bertramlabs.plugins:asset-pipeline-grails:2.14.1"
-    testCompile "org.grails:grails-plugin-testing"
-    testCompile "org.grails.plugins:geb"
+    runtime "org.glassfish.web:el-impl:2.1.2-b03"
+    runtime "org.apache.tomcat:tomcat-jdbc"
+    runtime "com.bertramlabs.plugins:asset-pipeline-grails:2.15.1"
+    testCompile "org.grails:grails-gorm-testing-support"
+    testCompile "org.grails.plugins:geb:1.1.2"
+    testCompile "org.grails:grails-web-testing-support"
     testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1"
     testRuntime "net.sourceforge.htmlunit:htmlunit:2.18"
+    testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:2.47.1"
 
     // Grails plugin dependencies
 
-    runtime "org.grails.plugins:ala-bootstrap3:3.0.4"
+    runtime "org.grails.plugins:ala-bootstrap3:3.2.1"
     compile "org.grails.plugins:ala-ws-plugin:2.0"
-    compile "org.grails.plugins:ala-auth:3.0.3"
+    compile "org.grails.plugins:ala-auth:3.1.1"
     compile "org.grails.plugins:ala-admin-plugin:2.1"
 
-    compile 'org.grails.plugins:external-config:1.1.1'
-    compile 'org.grails.plugins:http-builder-helper:1.0.2.ALA'
-    compile "org.grails.plugins:csv:1.0.ALA.3"
-    compile 'org.grails.plugins:mail:2.0.0.RC6'
+    compile 'org.grails.plugins:external-config:1.3.0'
+    compile 'org.grails.plugins:http-builder-helper:1.1.0'
+    compile "org.grails.plugins:csv:1.0.1"
+    compile 'org.grails.plugins:mail:2.0.0'
     compile "org.grails.plugins:oauth:4.0.0"
     compile "domurtag.plugins:grails-simple-captcha:1.0.0-grails3"
     compile "org.grails.plugins:export:2.0.0"
     compile 'org.grails.plugins:grails-markdown:3.0.0'
-    compile 'org.grails.plugins:cache-ehcache:2.0.0.ALA'
+//    compile 'org.grails.plugins:cache-ehcache:2.0.0.ALA'
 //    compile 'org.grails.plugins:cache:4.0.0.RC1'
 //    compile 'org.grails.plugins:cache-ehcache:3.0.0.M1'
 
     // regular JAR dependencies
 
-    compile 'de.codecentric:spring-boot-admin-starter-client:1.5.3'
-
+    runtime 'com.zaxxer:HikariCP:3.3.1'
     runtime 'mysql:mysql-connector-java:5.1.42'
     testRuntime "com.h2database:h2"
     compile 'com.google.guava:guava:21.0'
     compile 'org.apache.httpcomponents:httpcore:4.3.3'
     compile 'org.apache.httpcomponents:httpclient:4.3.3'
     compile 'org.apache.httpcomponents:httpmime:4.3.3'
     compile 'org.apache.commons:commons-lang3:3.1'
+    compile 'commons-io:commons-io:2.6'
     compile 'commons-beanutils:commons-beanutils:1.8.3'
     compile 'org.mindrot:jbcrypt:0.4'
 
-    compile 'org.grails.plugins:spring-session-helper:1.0'
+    compile 'org.grails.plugins:spring-session-helper:1.1'
     compile 'org.springframework.boot:spring-boot-starter-data-redis'
     compile 'org.springframework.session:spring-session-data-redis'
 
     // Spring Security to secure actuator endpoints
+    compile 'de.codecentric:spring-boot-admin-starter-client:1.5.3'
+    compile 'org.springframework.boot:spring-boot-starter-security'
     compile 'org.springframework.security:spring-security-web'
 
     compile('org.webjars.bower:chosen:1.8.3')
@@ -114,6 +132,8 @@ springBoot {
 bootRun {
     jvmArgs('-Dspring.output.ansi.enabled=always')
     addResources = true
+    String springProfilesActive = 'spring.profiles.active'
+    systemProperty springProfilesActive, System.getProperty(springProfilesActive)
 }
 
 bootRepackage {
@@ -122,6 +142,13 @@ bootRepackage {
     classifier = 'exec'
 }
 
+tasks.withType(Test) {
+    systemProperty "geb.env", System.getProperty('geb.env')
+    systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest")
+    systemProperty "webdriver.chrome.driver", System.getProperty('webdriver.chrome.driver')
+    systemProperty "webdriver.gecko.driver", System.getProperty('webdriver.gecko.driver')
+}
+
 assets {
     minifyJs = true
     minifyCss = true

gradle.properties

@@ -1,5 +1,5 @@
 #Wed Jul 19 16:19:40 AEST 2017
-grailsVersion=3.2.12
+grailsVersion=3.3.10
 grailsWrapperVersion=1.0.0
-gormVersion=6.0.12.RELEASE
-gradleWrapperVersion=3.4.1
+gormVersion=6.1.12.RELEASE
+gradleWrapperVersion=3.5

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ 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
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip