Skip to content

Commit

Permalink
Merge pull request AtlasOfLivingAustralia#30 from AtlasOfLivingAustra…
Browse files Browse the repository at this point in the history 
…lia/feature/grails5

Feature/grails5
  • Loading branch information
@adam-collins
adam-collins authored Jul 10, 2023
2 parents 01517ac + c0a1cd7 commit 90d977b
Show file tree
Hide file tree
Showing 21 changed files with 314 additions and 238 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ Thumbs.db
.gradle
build/
out/
log/
logs/
.idea
*.iml
*.ipr
*.iws
.project
.settings
.classpath

5 changes: 1 addition & 4 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ branches:
only:
- master
- develop
- bie-test
- feature/oidcIntegration
- feature/issue-17
- aus-traits
- feature/grails5
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
Expand Down
152 changes: 67 additions & 85 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@ buildscript {
}
dependencies {
classpath "org.grails:grails-gradle-plugin:$grailsVersion"
// classpath "org.grails.plugins:hibernate5:7.0.5"
classpath "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:2.0"
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.2.4"
classpath "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion"
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.4.6"
}
}

plugins {
id "com.gorylenko.gradle-git-properties" version "2.2.3"
id "com.gorylenko.gradle-git-properties" version "2.4.1"
}


version "2.1.2-SNAPSHOT"
version "2.2.0-SNAPSHOT"
group "au.org.ala"

apply plugin:"eclipse"
Expand All @@ -32,118 +31,101 @@ apply plugin:"maven-publish"
publishing {
repositories {
maven {
name "Nexus"
url "https://nexus.ala.org.au/content/repositories/${project.version.endsWith("-SNAPSHOT") ? "snapshots" : "releases"}"
name 'Nexus'
url "https://nexus.ala.org.au/content/repositories/${project.version.endsWith('-SNAPSHOT') ? 'snapshots' : 'releases'}"
credentials {
username = System.getenv("TRAVIS_DEPLOY_USERNAME")
password = System.getenv("TRAVIS_DEPLOY_PASSWORD")
username = System.getenv('TRAVIS_DEPLOY_USERNAME')
password = System.getenv('TRAVIS_DEPLOY_PASSWORD')
}
}
}
publications {
mavenJar(MavenPublication) {
pom.withXml {
def pomNode = asNode()
pomNode.dependencyManagement.replaceNode {}

// simply remove dependencies without a version
// version-less dependencies are handled with dependencyManagement
// see https://github.com/spring-gradle-plugins/dependency-management-plugin/issues/8 for more complete solutions
pomNode.dependencies.dependency.findAll {
it.version.text().isEmpty()
}.each {
it.replaceNode {}
}
}
from components.web
artifact bootWar
}
}
}

bootWar {
launchScript()
}

repositories {
mavenLocal()
maven { url "https://nexus.ala.org.au/content/groups/public/" }
maven { url "https://repo.grails.org/grails/core" }
}

configurations {
developmentOnly
runtimeClasspath {
extendsFrom developmentOnly
}
}

dependencies {
developmentOnly("org.springframework.boot:spring-boot-devtools")
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-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:events"
// compile "org.grails.plugins:hibernate5"
// compile "org.hibernate:hibernate-core:5.4.18.Final"
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-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:events"
implementation "org.grails.plugins:gsp"
compileOnly "io.micronaut:micronaut-inject-groovy"
console "org.grails:grails-console"
profile "org.grails.profiles:web"
runtime "org.glassfish.web:el-impl:2.1.2-b03"
runtime "com.h2database:h2"
runtime "org.apache.tomcat:tomcat-jdbc"
runtime "javax.xml.bind:jaxb-api:2.3.1"
runtime "com.bertramlabs.plugins:asset-pipeline-grails:3.2.4"
testCompile "io.micronaut:micronaut-inject-groovy"
testCompile "org.grails:grails-gorm-testing-support"
testCompile "org.mockito:mockito-core"
testCompile "org.grails:grails-web-testing-support"
testCompile "org.grails.plugins:geb"
testCompile "org.seleniumhq.selenium:selenium-remote-driver:3.14.0"
testCompile "org.seleniumhq.selenium:selenium-api:3.14.0"
testCompile "org.seleniumhq.selenium:selenium-support:3.14.0"
testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:3.14.0"
testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:3.14.0"


compile "org.codehaus.groovy.modules.http-builder:http-builder:0.7.1"
testCompile "com.stehno.ersatz:ersatz:1.9.0:safe@jar"
runtimeOnly "org.glassfish.web:el-impl:2.1.2-b03"
runtimeOnly "com.h2database:h2"
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
runtimeOnly "javax.xml.bind:jaxb-api:2.3.1"
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:3.4.6"
testImplementation "io.micronaut:micronaut-inject-groovy"
testImplementation "org.grails:grails-gorm-testing-support"
testImplementation "org.mockito:mockito-core"
testImplementation "org.grails:grails-web-testing-support"
testImplementation "org.grails.plugins:geb"
testImplementation "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion"
testImplementation "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
testImplementation "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
testImplementation "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
testImplementation "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"


implementation "org.codehaus.groovy.modules.http-builder:http-builder:0.7.2"
testImplementation "com.stehno.ersatz:ersatz:1.9.0:safe@jar"
testImplementation "org.hamcrest:hamcrest-core:2.2"

compile ("org.jasig.cas.client:cas-client-core:3.4.1") { //??
implementation ("org.jasig.cas.client:cas-client-core:3.4.1") { //??
exclude group: "javax.servlet", module: "servlet-api"
}

compile (group: "au.org.ala.plugins.grails", name: "name-explorer-plugin", version: "2.0", changing: true){
implementation (group: "au.org.ala.plugins.grails", name: "name-explorer-plugin", version: "2.0", changing: true){
exclude group: "com.squareup.okhttp3", module: "okhttp"
}
compile "org.grails.plugins:external-config:2.0.0"
compile group: 'au.org.ala', name: 'ala-name-matching-model', version: '4.2', changing: true
compile "commons-httpclient:commons-httpclient:3.1"
compile "org.codehaus.jackson:jackson-core-asl:1.8.6"
compile "org.codehaus.jackson:jackson-mapper-asl:1.8.6"
compile "org.jsoup:jsoup:1.8.3"
compile group: "org.grails.plugins", name: "ala-bootstrap3", version: "4.1.0", changing: true
compile(group: "org.grails.plugins", name: "ala-auth", version:"5.1.1", changing: true) {
implementation "dk.glasius:external-config:3.1.1"
implementation group: 'au.org.ala', name: 'ala-name-matching-model', version: '4.2', changing: true
implementation "commons-httpclient:commons-httpclient:3.1"
implementation "org.codehaus.jackson:jackson-core-asl:1.8.6"
implementation "org.codehaus.jackson:jackson-mapper-asl:1.8.6"
implementation "org.jsoup:jsoup:1.15.4"
implementation group: "org.grails.plugins", name: "ala-bootstrap3", version: "4.1.0", changing: true
implementation (group: "org.grails.plugins", name: "ala-auth", version:"$alaSecurityLibsVersion", changing: true) {
exclude group: "javax.servlet", module: "servlet-api"
}
compile "au.org.ala:data-quality-filter-service-client:1.0.0"
implementation "org.grails.plugins:ala-ws-plugin:$alaSecurityLibsVersion"
implementation "au.org.ala:data-quality-filter-service-client:1.0.0"

compile group: "org.grails.plugins", name: "ala-admin-plugin", version: "2.3.0", changing: true
compile group: "au.org.ala.plugins.grails", name: "ala-citation-plugin", version: "1.0"
runtime group: "au.org.ala.plugins.grails", name: "ala-charts-plugin", version: "2.1.1"
compile group: "au.org.ala.plugins.grails", name: "images-client-plugin", version: "1.2"
implementation group: "org.grails.plugins", name: "ala-admin-plugin", version: "2.3.0", changing: true
implementation group: "au.org.ala.plugins.grails", name: "ala-citation-plugin", version: "1.0"
implementation group: "au.org.ala.plugins.grails", name: "ala-charts-plugin", version: "2.3.0"
implementation group: "au.org.ala.plugins.grails", name: "images-client-plugin", version: "1.2"

compile "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1"
implementation "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20220608.1"

implementation 'org.apache.tika:tika-core:2.4.1'
implementation 'org.apache.tika:tika-langdetect-optimaize:2.4.1'
Expand Down
12 changes: 10 additions & 2 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
grailsVersion=4.1.1
gorm.version=7.0.8.RELEASE
grailsVersion=5.2.1
gormVersion=7.2.1
org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M
gebVersion=2.3
groovyVersion=3.0.11
seleniumVersion=3.14.0
webdriverBinariesVersion=2.6
chromeDriverVersion=2.45.0
geckodriverVersion=0.24.0
seleniumSafariDriverVersion=3.14.0
alaSecurityLibsVersion=6.0.4
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
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.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 90d977b

Please sign in to comment.