Skip to content

Commit

Permalink
upgrade of grails to v5.3.2
Browse files Browse the repository at this point in the history
and gradle v7.4
  • Loading branch information
brucehyslop committed Mar 3, 2023
1 parent 55def33 commit ac99a86
Show file tree
Hide file tree
Showing 6 changed files with 225 additions and 181 deletions.
112 changes: 58 additions & 54 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,25 +1,31 @@
import org.gradle.api.tasks.compile.GroovyCompile

buildscript {
repositories {
mavenLocal()
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:$grailsVersion"
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.0.10"
classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.4.7"
}
}

version "5.0.1-SNAPSHOT"
version "6.0.0-SNAPSHOT"
group "au.org.ala.plugins.grails"

apply plugin:"eclipse"
apply plugin:"idea"
apply plugin:"org.grails.grails-plugin"
apply plugin:"asset-pipeline"
apply plugin:"war"
apply plugin:"org.grails.grails-web"
apply plugin:"org.grails.grails-gsp"
apply plugin:"com.bertramlabs.asset-pipeline"


//apply plugin:"eclipse"
//apply plugin:"idea"
//apply plugin:"org.grails.grails-plugin"
//apply plugin:"asset-pipeline"
//apply plugin:"org.grails.grails-gsp"
apply plugin:"maven-publish"

//sourceCompatibility = 1.8
Expand All @@ -38,9 +44,9 @@ configurations {
}
}

springBoot {
mainClassName = 'biocache.hubs.Application'
}
//springBoot {
// mainClassName = 'biocache.hubs.Application'
//}

// Set to true it needed only for development
boolean inplace = false
Expand All @@ -54,61 +60,59 @@ dependencies {
exclude group: 'org.grails.plugins', module: 'cache-ehcache'
}

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: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"
provided "org.grails:grails-plugin-services"
provided "org.grails:grails-plugin-domain-class"
compile "org.grails.plugins:scaffolding"
compile "org.grails.plugins:gsp"
implementation "org.springframework.boot:spring-boot-starter-logging"
implementation "org.springframework.boot:spring-boot-autoconfigure"
implementation "org.grails:grails-core"
implementation "org.springframework.boot:spring-boot-starter-actuator"
implementation "org.springframework.boot:spring-boot-starter-tomcat"
implementation "org.grails:grails-dependencies"
implementation "org.grails:grails-web-boot"
implementation "org.grails:grails-logging"
implementation "org.grails:grails-plugin-rest"
implementation "org.grails:grails-plugin-databinding"
implementation "org.grails:grails-plugin-i18n"
implementation "org.grails:grails-plugin-services"
implementation "org.grails:grails-plugin-url-mappings"
implementation "org.grails:grails-plugin-interceptors"
implementation "org.grails.plugins:cache"
implementation "org.grails.plugins:async"
implementation "org.grails.plugins:scaffolding"
implementation "org.grails.plugins:gsp"
compileOnly "io.micronaut:micronaut-inject-groovy"
console "org.grails:grails-console"
profile "org.grails.profiles:web-plugin"
runtime "com.bertramlabs.plugins:asset-pipeline-grails:3.0.10"
testCompile "org.mockito:mockito-core"
testCompile "org.grails:grails-web-testing-support"
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:3.0.10"
testImplementation "org.mockito:mockito-core"
testImplementation "org.grails:grails-web-testing-support"

testImplementation group: 'org.spockframework', name: 'spock-spring', version: '1.3-groovy-2.5'
implementation group: 'org.ehcache', name: 'ehcache', version: '3.1.0'
testImplementation group: 'xml-apis', name: 'xml-apis', version: '1.4.01'

compile 'org.grails.plugins:external-config:2.0.0'
implementation 'org.grails.plugins:external-config:2.0.0'
//jars
compile "org.apache.httpcomponents:httpclient:4.5.6"
compile 'com.maxmind.geoip2:geoip2:2.9.0'
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.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1"
implementation "org.apache.httpcomponents:httpclient:4.5.6"
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"

compile "au.org.ala:data-quality-filter-service-client:1.0.0", noCache
compile 'xml-apis:xml-apis:1.4.01'
implementation "au.org.ala:data-quality-filter-service-client:1.0.0", noCache
implementation 'xml-apis:xml-apis:1.4.01'

//plugins
compile 'org.grails.plugins:cache-ehcache:3.0.0'
compile 'org.grails.plugins:http-builder-helper:1.0.2.ALA'
compile "org.grails.plugins:ala-admin-plugin:2.3.0"
compile "org.grails.plugins:ala-auth:5.1.1"
compile "org.grails.plugins:ala-ws-plugin:3.1.2"
compile "au.org.ala.plugins.grails:images-client-plugin:1.5-SNAPSHOT"
compile "au.org.ala.plugins.grails:ala-charts-plugin:2.2"

compile "au.org.ala:userdetails-service-client:1.5.0"
compile 'commons-fileupload:commons-fileupload:1.4'
implementation 'org.grails.plugins:cache-ehcache:3.0.0'
implementation 'org.grails.plugins:http-builder-helper:1.0.2.ALA'
implementation "org.grails.plugins:ala-admin-plugin:2.3.0"
implementation "org.grails.plugins:ala-auth:5.1.1"
implementation "org.grails.plugins:ala-ws-plugin:3.1.2"
implementation "au.org.ala.plugins.grails:images-client-plugin:1.5-SNAPSHOT"
implementation "au.org.ala.plugins.grails:ala-charts-plugin:2.2"

implementation "au.org.ala:userdetails-service-client:1.5.0"
implementation 'commons-fileupload:commons-fileupload:1.4'
}

bootRun {
Expand Down
7 changes: 6 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
grailsVersion=4.1.1
grailsVersion=5.3.2
grailsGradlePluginVersion=5.3.0
groovyVersion=3.0.11
org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M
#exploded=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit ac99a86

Please sign in to comment.