#593 Grails 6

build.gradle

@@ -1,28 +1,19 @@
 buildscript {
- repositories {
- maven { url "https://plugins.gradle.org/m2/" }
- maven { url "https://repo.grails.org/grails/core" }
- maven { url "https://nexus.ala.org.au/content/groups/public/" }
- }
- dependencies {
- classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
- classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.4.7"
- }
+ version "7.0.0-SNAPSHOT"
+ group "au.org.ala.plugins.grails"
 }
 
-version "6.2.0-SNAPSHOT"
-group "au.org.ala.plugins.grails"
+plugins {
+ id "groovy"
+ id "org.grails.grails-gsp"
+ id "org.grails.grails-web"
+ id "war"
+ id "idea"
+ id "com.bertramlabs.asset-pipeline"
+ id "eclipse"
 
-apply plugin:"eclipse"
-apply plugin:"idea"
-apply plugin:"war"
-apply plugin:"org.grails.grails-web"
-apply plugin:"org.grails.grails-gsp"
-apply plugin:"com.bertramlabs.asset-pipeline"
-apply plugin:"maven-publish"
-
-//sourceCompatibility = 1.8
-//targetCompatibility = 1.8
+ id "maven-publish"
+}
 
 repositories {
  mavenLocal()
@@ -37,6 +28,15 @@ configurations {
  }
 }
 
+bootWar {
+ launchScript()
+ dependsOn(compileGroovyPages)
+}
+
+war {
+ dependsOn(compileGroovyPages)
+}
+
 // Set to true it needed only for development
 // Inplace plugins ala-charts-plugin and images-client-plugin are defined in ala-hub configuration
 
@@ -80,13 +80,13 @@ dependencies {
 
  implementation 'dk.glasius:external-config:3.1.1'
  //jars
- implementation "org.apache.httpcomponents:httpclient:4.5.6"
+ implementation 'org.apache.httpcomponents:httpclient:4.5.13'
  implementation 'com.maxmind.geoip2:geoip2:2.9.0'
  implementation "org.apache.commons:commons-lang3:3.7"
  implementation "org.apache.commons:commons-text:1.3"
  implementation "net.sf.supercsv:super-csv:2.1.0"
  implementation group: 'org.apache.lucene', name: 'lucene-queryparser', version: '8.5.1'
- implementation "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1"
+ implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20211018.2'
 
  implementation "au.org.ala:data-quality-filter-service-client:1.0.0", noCache
  implementation 'xml-apis:xml-apis:1.4.01'

gradle.properties

@@ -1,6 +1,7 @@
-grailsVersion=5.3.2
-grailsGradlePluginVersion=5.3.0
+grailsVersion=6.0.0
+grailsGradlePluginVersion=6.0.0
 groovyVersion=3.0.11
+org.gradle.caching=true
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-7.6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -1 +1,16 @@
+pluginManagement {
+ repositories {
+ mavenLocal()
+ maven { url "https://nexus.ala.org.au/content/groups/public/" }
+ maven { url "https://repo.grails.org/grails/core/" }
+ gradlePluginPortal()
+ //maven { url "https://plugins.gradle.org/m2/" }
+ }
+ plugins {
+ 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"
+ }
+}
+
 rootProject.name='biocache-hubs'