From 0c950a65f7f85de2f013dd5033e70932fab3f50a Mon Sep 17 00:00:00 2001 From: das037 Date: Mon, 27 Nov 2023 12:34:11 +1100 Subject: [PATCH 1/6] Added shapshot version to dev --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1e9f91b..5df38af 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ plugins { } -version "2.5.1" +version "2.5.2-SNAPSHOT" group "au.org.ala" description "Dashboard application" From 3c374d8ee76fe3bdb89f15a30e8085c3fbdb8641 Mon Sep 17 00:00:00 2001 From: das037 Date: Mon, 18 Dec 2023 13:03:44 +1100 Subject: [PATCH 2/6] Updated Grails version to 6 --- .travis.yml | 16 +++++++ build.gradle | 57 +++++++++--------------- gradle.properties | 5 ++- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 21 ++++++++- 5 files changed, 59 insertions(+), 42 deletions(-) diff --git a/.travis.yml b/.travis.yml index dca36ed..9b6d77d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,15 @@ branches: - dev - feature/grails5 - feature/plugin-upgrade + - feature/grails6-upgrade + +before_install: + - rm -fr $HOME/.gradle/caches + - sudo mkdir -p /data/dashboard/ehcache + - sudo chmod o+xw /data + - sudo chmod o+xw /data/dashboard + - sudo chmod o+xw /data/dashboard/ehcache + before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ @@ -18,8 +27,15 @@ cache: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ +install: + - 'travis_wait 30 ./gradlew clean' + - './gradlew assemble' + after_success: + - './gradlew bootJar' - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && travis_retry ./gradlew publish' + + env: global: - JAVA_TOOL_OPTIONS=-Dhttps.protocols=TLSv1.2 diff --git a/build.gradle b/build.gradle index 5df38af..4adc091 100644 --- a/build.gradle +++ b/build.gradle @@ -1,35 +1,21 @@ buildscript { - repositories { - mavenLocal() - maven { url "https://nexus.ala.org.au/content/groups/public/" } - maven { url "https://repo.grails.org/grails/core" } - } - dependencies { - classpath "org.grails:grails-gradle-plugin:$grailsVersion" - classpath "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion" - classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.4.6" - classpath 'org.grails.plugins:quartz:2.0.13' - } + version "2.6-SNAPSHOT" + group "au.org.ala" + description "Dashboard application" } plugins { + id "groovy" + id "org.grails.grails-web" + id "org.grails.grails-gsp" + id "application" + id "war" + id "maven-publish" + id "com.bertramlabs.asset-pipeline" id "com.gorylenko.gradle-git-properties" version "2.4.1" } -version "2.5.2-SNAPSHOT" -group "au.org.ala" -description "Dashboard application" - -apply plugin:"eclipse" -apply plugin:"idea" -apply plugin:"war" -apply plugin:"org.grails.grails-web" -apply plugin:"com.github.erdi.webdriver-binaries" -apply plugin:"com.bertramlabs.asset-pipeline" -apply plugin:"org.grails.grails-gsp" -apply plugin:"maven-publish" - publishing { repositories { maven { @@ -50,12 +36,17 @@ publishing { bootWar { launchScript() + dependsOn(compileGroovyPages) +} + +war { + dependsOn(compileGroovyPages) } repositories { mavenLocal() maven { url "https://nexus.ala.org.au/content/groups/public/" } - maven { url "https://repo.grails.org/grails/core" } + mavenCentral() } configurations { @@ -77,10 +68,12 @@ dependencies { implementation "org.grails:grails-logging" implementation "org.grails.plugins:cache" implementation "org.grails.plugins:scaffolding" + implementation "org.grails.plugins:hibernate5:${gormVersion}" + implementation "org.hibernate:hibernate-core:5.6.15.Final" console "org.grails:grails-console" profile "org.grails.profiles:web" implementation "org.codehaus.groovy:groovy-dateutil" - runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:3.4.6" + runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:4.3.0" testImplementation "org.grails.plugins:geb" testImplementation "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion" testImplementation "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion" @@ -94,16 +87,11 @@ dependencies { implementation 'dk.glasius:external-config:3.1.1' runtimeOnly 'org.apache.ant:ant:1.7.1' //you can also use runtime runtimeOnly 'org.apache.ant:ant-launcher:1.7.1' - // implementation 'net.sf.opencsv:opencsv:2.3' implementation 'org.grails.plugins:csv:1.0.ALA.3' implementation 'com.yahoo.platform.yui:yuicompressor:2.4.8' implementation group: 'org.jsoup', name: 'jsoup', version: '1.9.1' - - // implementation 'org.codehaus.groovy.modules.http-builder:http-builder:0.8' - implementation group: 'org.codehaus.groovy.modules.http-builder', name: 'http-builder', version: '0.7.2' - - // implementation 'org.grails.grails-plugin-rest:2.3.0.M2' + implementation group: 'org.codehaus.groovy.modules.http-builder', name: 'http-builder', version: '0.7.2' implementation 'org.codehaus.groovy:groovy-ant:2.0.0' implementation "org.grails.plugins:ala-bootstrap3:4.4.0" @@ -130,11 +118,6 @@ tasks.withType(Test) { systemProperty "webdriver.gecko.driver", System.getProperty('webdriver.gecko.driver') } -webdriverBinaries { - chromedriver "$chromeDriverVersion" - geckodriver "$geckodriverVersion" -} - assets { minifyJs = false diff --git a/gradle.properties b/gradle.properties index 746ffad..767923a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,6 @@ -grailsVersion=5.2.1 -gormVersion=7.2.1 +grailsVersion=6.0.0 +grailsGradlePluginVersion=6.0.0 +gormVersion=8.0.1 org.gradle.daemon=true org.gradle.parallel=true org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a2..98debb8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index e8b71dc..7c0a8d9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,20 @@ -//include ':ala-bootstrap3' -//project(':ala-bootstrap3').projectDir = new File(settingsDir, '../ala-bootstrap3') +pluginManagement { + repositories { + mavenLocal() + maven { url "https://nexus.ala.org.au/content/groups/public/" } + maven { url "https://repo.grails.org/grails/core" } + mavenCentral() + } + + plugins { + id "org.grails.grails-gradle-plugin" version "6.0.0" + id "org.grails.grails-web" version "6.0.0" + id "org.grails.grails-gsp" version "6.0.0" + id "com.bertramlabs.asset-pipeline" version "4.3.0" + id "org.grails.grails-plugin" version "2.0.13" + + } +} + + rootProject.name='dashboard' From 7f83cb79ce3fe2994bb573fb8cf8a21fed9a0499 Mon Sep 17 00:00:00 2001 From: das037 Date: Tue, 2 Jan 2024 11:31:01 +1100 Subject: [PATCH 3/6] Updated Grails version to 6 --- .travis.yml | 5 +---- build.gradle | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b6d77d..9b3ace0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +11,9 @@ branches: - feature/grails6-upgrade before_install: - - rm -fr $HOME/.gradle/caches - - sudo mkdir -p /data/dashboard/ehcache + - sudo mkdir -p /data/dashboard - sudo chmod o+xw /data - sudo chmod o+xw /data/dashboard - - sudo chmod o+xw /data/dashboard/ehcache before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock @@ -32,7 +30,6 @@ install: - './gradlew assemble' after_success: - - './gradlew bootJar' - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && travis_retry ./gradlew publish' diff --git a/build.gradle b/build.gradle index 4adc091..ccf2c3e 100644 --- a/build.gradle +++ b/build.gradle @@ -68,8 +68,6 @@ dependencies { implementation "org.grails:grails-logging" implementation "org.grails.plugins:cache" implementation "org.grails.plugins:scaffolding" - implementation "org.grails.plugins:hibernate5:${gormVersion}" - implementation "org.hibernate:hibernate-core:5.6.15.Final" console "org.grails:grails-console" profile "org.grails.profiles:web" implementation "org.codehaus.groovy:groovy-dateutil" From 47bf0f26b9f25d14c812a43dc63b875b1b1a1264 Mon Sep 17 00:00:00 2001 From: das037 Date: Tue, 2 Jan 2024 11:39:50 +1100 Subject: [PATCH 4/6] Updated Grails version to 6 --- gradle.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 767923a..aff739e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,5 @@ grailsVersion=6.0.0 grailsGradlePluginVersion=6.0.0 -gormVersion=8.0.1 org.gradle.daemon=true org.gradle.parallel=true org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M From fc4cce69ff78c450fceb2fefae1b4490e6eb2091 Mon Sep 17 00:00:00 2001 From: Adam Collins Date: Tue, 23 Jan 2024 09:13:26 +1000 Subject: [PATCH 5/6] replace deprecated services --- .../services/au/org/ala/dashboard/MetadataService.groovy | 4 ++-- src/main/groovy/au/org/ala/dashboard/Constants.groovy | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/grails-app/services/au/org/ala/dashboard/MetadataService.groovy b/grails-app/services/au/org/ala/dashboard/MetadataService.groovy index 7841e4e..813a3e3 100644 --- a/grails-app/services/au/org/ala/dashboard/MetadataService.groovy +++ b/grails-app/services/au/org/ala/dashboard/MetadataService.groovy @@ -285,7 +285,7 @@ class MetadataService { log.info "looking up spatial layers" // look it up def resp = null - def url = "${SPATIAL_URL}/layers.json" + def url = "${SPATIAL_URL}/layers" def conn = new URL(url).openConnection() try { @@ -449,7 +449,7 @@ class MetadataService { def bieBulkLookup(list) { def url = BIE_URL def data = webService.doPost(url, - "/species/guids/bulklookup.json", "", (list as JSON).toString()) + "/species/guids/bulklookup", "", (list as JSON).toString()) //println "returned from doPost ${data.resp}" def results = [:] if (!data.error) { diff --git a/src/main/groovy/au/org/ala/dashboard/Constants.groovy b/src/main/groovy/au/org/ala/dashboard/Constants.groovy index 7ee484b..7e93b19 100644 --- a/src/main/groovy/au/org/ala/dashboard/Constants.groovy +++ b/src/main/groovy/au/org/ala/dashboard/Constants.groovy @@ -7,9 +7,9 @@ class Constants { class WebServices { - final static String PARTIAL_URL_STATE_TERRITORY_FACETED_RESULTS = "/occurrences/search.json?pageSize=0&q=*:*&facets=state&flimit=200" + final static String PARTIAL_URL_STATE_TERRITORY_FACETED_RESULTS = "/occurrences/search?pageSize=0&q=*:*&facets=state&flimit=200" - final static String PARTIAL_URL_RECORDS_BY_LIFE_FORM = "/occurrences/search.json?pageSize=0&q=*:*&facets=species_group&flimit=200" + final static String PARTIAL_URL_RECORDS_BY_LIFE_FORM = "/occurrences/search?pageSize=0&q=*:*&facets=species_group&flimit=200" final static String PARTIAL_URL_DATE_STATS_EARLIEST_RECORD = "/occurrences/search?q=!assertions:invalidCollectionDate&pageSize=1&sort=occurrence_date&facet=off" From 974286929e3f74a7adbaa6db1f659c25115ee4dd Mon Sep 17 00:00:00 2001 From: das037 Date: Wed, 7 Feb 2024 11:33:20 +1100 Subject: [PATCH 6/6] Removed Snapshot --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ccf2c3e..1634889 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - version "2.6-SNAPSHOT" + version "2.6" group "au.org.ala" description "Dashboard application" }