Skip to content

Commit 4b98954

Browse files
sughicssughics
authored
Merge pull request #181 from AtlasOfLivingAustralia/develop
PR for release 3.0.0
2 parents fe980d7 + ab01446 commit 4b98954

12 files changed

+365
-248
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ branches:
66
only:
77
- master
88
- develop
9-
- feature_oidcIntegration
9+
- feature/grails5
1010
before_cache:
1111
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
1212
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/

‎build.gradle

+115-73
Original file line numberDiff line numberDiff line change
@@ -19,43 +19,63 @@ buildscript {
1919
}
2020
dependencies {
2121
classpath "org.grails:grails-gradle-plugin:$grailsVersion"
22-
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.3.2"
23-
classpath "org.grails.plugins:hibernate5:7.0.2"
22+
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.4.6"
23+
classpath "org.grails.plugins:hibernate5:7.0.5"
2424
classpath 'org.grails.plugins:quartz:2.0.13'
25+
classpath "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:2.6"
2526
}
2627
}
2728

2829
plugins {
29-
id "com.gorylenko.gradle-git-properties" version "1.4.17"
30+
id "com.gorylenko.gradle-git-properties" version "2.4.1"
3031
}
3132

3233

33-
version "2.0.3"
34+
version "2.2.0-SNAPSHOT"
3435
group "au.org.ala"
3536

3637
apply plugin:"eclipse"
3738
apply plugin:"idea"
3839
apply plugin:"war"
3940
apply plugin:"org.grails.grails-web"
41+
apply plugin:"com.github.erdi.webdriver-binaries"
4042
apply plugin:"org.grails.grails-gsp"
4143
apply plugin:"com.bertramlabs.asset-pipeline"
44+
apply plugin:"maven-publish"
4245

43-
//apply from: 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/travis-build-configuration/master/travis_grails_publish.gradle'
44-
apply from: "${project.projectDir}/gradle/publish.gradle"
4546

46-
sourceCompatibility = 1.11
47-
targetCompatibility = 1.11
47+
publishing {
48+
repositories {
49+
maven {
50+
name 'Nexus'
51+
url "https://nexus.ala.org.au/content/repositories/${project.version.endsWith('-SNAPSHOT') ? 'snapshots' : 'releases'}"
52+
credentials {
53+
username = System.getenv('TRAVIS_DEPLOY_USERNAME')
54+
password = System.getenv('TRAVIS_DEPLOY_PASSWORD')
55+
}
56+
}
57+
}
58+
publications {
59+
mavenJar(MavenPublication) {
60+
artifact bootWar
61+
}
62+
}
63+
}
64+
65+
bootWar {
66+
launchScript()
67+
}
4868

4969
repositories {
5070
mavenLocal()
5171
maven { url "https://nexus.ala.org.au/content/groups/public/" }
5272
maven { url "https://repo.grails.org/grails/core" }
5373
}
5474

55-
grails {
56-
exploded = true
57-
plugins {
58-
//compile project(":ala-admin-plugin") // inline plugin use only
75+
configurations {
76+
developmentOnly
77+
runtimeClasspath {
78+
extendsFrom developmentOnly
5979
}
6080
}
6181

@@ -64,82 +84,104 @@ dependencies {
6484
exclude group: 'org.grails.plugins', module: 'cache'
6585
exclude group: 'org.ehcache', module: 'ehcache'
6686
}
67-
68-
compile "org.springframework.boot:spring-boot-starter-logging"
69-
compile "org.springframework.boot:spring-boot-autoconfigure"
70-
compile "org.grails:grails-core"
71-
compile "org.springframework.boot:spring-boot-starter-actuator"
72-
compile "org.springframework.boot:spring-boot-starter-tomcat"
73-
compile "org.grails:grails-web-boot"
74-
compile "org.grails:grails-logging"
75-
compile "org.grails:grails-plugin-rest"
76-
compile "org.grails:grails-plugin-databinding"
77-
compile "org.grails:grails-plugin-i18n"
78-
compile "org.grails:grails-plugin-services"
79-
compile "org.grails:grails-plugin-url-mappings"
80-
compile "org.grails:grails-plugin-interceptors"
81-
compile "org.grails.plugins:async"
82-
compile "org.grails.plugins:scaffolding"
83-
compile "org.grails.plugins:events"
84-
compile "org.grails.plugins:hibernate5"
85-
// compile "org.hibernate:hibernate-core:5.4.0.Final"
86-
// compile "org.hibernate:hibernate-ehcache:5.4.0.Final"
87-
compile "org.hibernate:hibernate-jcache"
88-
89-
compile "org.grails.plugins:gsp"
87+
developmentOnly("org.springframework.boot:spring-boot-devtools")
88+
implementation "org.springframework.boot:spring-boot-starter-logging"
89+
implementation "org.springframework.boot:spring-boot-autoconfigure"
90+
implementation "org.grails:grails-core"
91+
implementation "org.springframework.boot:spring-boot-starter-actuator"
92+
implementation "org.springframework.boot:spring-boot-starter-tomcat"
93+
implementation "org.grails:grails-web-boot"
94+
implementation "org.grails:grails-logging"
95+
implementation "org.grails:grails-plugin-rest"
96+
implementation "org.grails:grails-plugin-databinding"
97+
implementation "org.grails:grails-plugin-i18n"
98+
implementation "org.grails:grails-plugin-services"
99+
implementation "org.grails:grails-plugin-url-mappings"
100+
implementation "org.grails:grails-plugin-interceptors"
101+
implementation "org.grails.plugins:async"
102+
implementation "org.grails.plugins:scaffolding"
103+
implementation "org.grails.plugins:events"
104+
implementation "org.grails.plugins:hibernate5"
105+
implementation "org.hibernate:hibernate-jcache"
106+
107+
implementation "org.grails.plugins:gsp"
90108
console "org.grails:grails-console"
91109
profile "org.grails.profiles:web"
92-
runtime "org.glassfish.web:el-impl:2.1.2-b03"
93-
runtime "com.h2database:h2"
94-
runtime "org.apache.tomcat:tomcat-jdbc"
95-
runtime "com.bertramlabs.plugins:asset-pipeline-grails:3.3.2"
96-
97-
//compile "org.grails.plugins:grails-plugin-converters" // only needed for grails 3.3
98-
//testCompile "org.grails:grails-plugin-testing"
99-
testCompile "org.grails:grails-gorm-testing-support"
100-
testCompile "org.grails.plugins:geb"
101-
testCompile "org.grails:grails-web-testing-support"
102-
testCompile "org.grails:grails-test-mixins:3.3.0"
110+
runtimeOnly "org.glassfish.web:el-impl:2.1.2-b03"
111+
runtimeOnly "com.h2database:h2"
112+
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
113+
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:3.4.6"
114+
115+
testImplementation "org.grails:grails-gorm-testing-support"
116+
testImplementation "org.grails.plugins:geb"
117+
testImplementation "org.grails:grails-web-testing-support"
118+
testImplementation "org.grails:grails-test-mixins:3.3.0"
103119

104120
// Grails plugin dependencies
105-
runtime "org.grails.plugins:ala-bootstrap3:4.1.0", noCache
106-
compile "org.grails.plugins:ala-ws-security-plugin:4.1.1", noCache
107-
compile "org.grails.plugins:ala-ws-plugin:3.1.2", noCache
108-
compile "org.grails.plugins:ala-auth:5.1.1", noCache
109-
compile "org.grails.plugins:ala-admin-plugin:2.3.0"
121+
runtimeOnly "org.grails.plugins:ala-bootstrap3:4.1.0", noCache
122+
implementation "org.grails.plugins:ala-auth:$alaSecurityLibsVersion"
123+
implementation "org.grails.plugins:ala-ws-security-plugin:$alaSecurityLibsVersion"
124+
implementation "org.grails.plugins:ala-ws-plugin:$alaSecurityLibsVersion"
125+
implementation "au.org.ala:userdetails-service-client:$alaSecurityLibsVersion"
126+
implementation "org.grails.plugins:ala-admin-plugin:2.3.0"
110127

111-
compile 'org.grails.plugins:external-config:2.0.0'
112-
compile 'org.grails.plugins:mail:3.0.0'
113-
compile 'org.grails.plugins:http-builder-helper:1.0.2.ALA'
114-
compile 'org.grails.plugins:schwartz-monitor:2.0.1.ALA-SNAPSHOT'
115-
compile 'org.grails.plugins:quartz:2.0.13'
116-
compile 'org.grails.plugins:cache:4.0.2'
117-
compile 'org.grails.plugins:cache-ehcache:3.0.0'
128+
implementation 'dk.glasius:external-config:3.1.1'
129+
implementation 'org.grails.plugins:mail:3.0.0'
130+
implementation "org.codehaus.groovy.modules.http-builder:http-builder:0.7.2"
131+
implementation 'org.grails.plugins:schwartz-monitor:2.0.1.ALA-SNAPSHOT'
132+
implementation 'org.grails.plugins:quartz:2.0.13'
133+
implementation 'org.quartz-scheduler:quartz:2.3.2' // Is not pulled in by default https://stackoverflow.com/questions/61144025/quartz-not-working-in-grails4-issue-in-dependency-not-able-to-compile
134+
implementation 'org.grails.plugins:cache:4.0.2'
135+
implementation 'org.grails.plugins:cache-ehcache:3.0.0'
118136

119137
// regular JAR dependencies
120-
runtime 'mysql:mysql-connector-java:8.0.25'
121-
testRuntime "com.h2database:h2"
122-
testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1"
123-
testRuntime "net.sourceforge.htmlunit:htmlunit:2.18"
124-
runtime 'commons-lang:commons-lang:2.6'
125-
compile 'commons-io:commons-io:2.5'
126-
runtime 'org.hamcrest:hamcrest-core:1.3'
127-
runtime 'org.hamcrest:hamcrest-library:1.3'
128-
runtime 'xalan:xalan:2.7.2'
129-
//runtime 'org.apache.httpcomponents:httpcore:4.2.2'
130-
//runtime 'org.apache.httpcomponents:httpclient:4.2.2'
131-
compile 'com.jayway.jsonpath:json-path:0.5.6'
132-
compile 'com.jayway.jsonpath:json-path-assert:0.5.6'
133-
compile 'au.org.ala.plugins:openapi:1.1.0'
138+
runtimeOnly 'mysql:mysql-connector-java:8.0.25'
139+
testRuntimeOnly "com.h2database:h2"
140+
testImplementation "org.seleniumhq.selenium:selenium-remote-driver:3.14.0"
141+
testImplementation "org.seleniumhq.selenium:selenium-api:3.14.0"
142+
testImplementation "org.seleniumhq.selenium:selenium-support:3.14.0"
143+
testImplementation "org.seleniumhq.selenium:selenium-firefox-driver:3.14.0"
144+
runtimeOnly 'commons-lang:commons-lang:2.6'
145+
implementation 'commons-io:commons-io:2.5'
146+
runtimeOnly 'org.hamcrest:hamcrest-core:1.3'
147+
runtimeOnly 'org.hamcrest:hamcrest-library:1.3'
148+
runtimeOnly 'xalan:xalan:2.7.2'
149+
implementation 'com.jayway.jsonpath:json-path:0.5.6'
150+
implementation 'com.jayway.jsonpath:json-path-assert:0.5.6'
151+
implementation 'au.org.ala.plugins:openapi:1.1.0'
134152
}
135153

136154
bootRun {
137-
jvmArgs('-Dspring.output.ansi.enabled=always')
155+
ignoreExitValue true
156+
jvmArgs(
157+
'-Dspring.output.ansi.enabled=always',
158+
'-noverify',
159+
'-XX:TieredStopAtLevel=1',
160+
'-Xmx1024m')
138161
sourceResources sourceSets.main
139162
String springProfilesActive = 'spring.profiles.active'
140163
systemProperty springProfilesActive, System.getProperty(springProfilesActive)
141164
}
142165

166+
tasks.withType(GroovyCompile) {
167+
configure(groovyOptions) {
168+
forkOptions.jvmArgs = ['-Xmx1024m']
169+
}
170+
}
171+
172+
173+
webdriverBinaries {
174+
chromedriver '2.45.0'
175+
geckodriver '0.24.0'
176+
}
177+
178+
tasks.withType(Test) {
179+
systemProperty "geb.env", System.getProperty('geb.env')
180+
systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest")
181+
systemProperty "webdriver.chrome.driver", System.getProperty('webdriver.chrome.driver')
182+
systemProperty "webdriver.gecko.driver", System.getProperty('webdriver.gecko.driver')
183+
}
184+
143185

144186
assets {
145187
minifyJs = true

‎gradle.properties

+13-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1-
grailsVersion=4.1.1
2-
gormVersion=7.0.8.RELEASE
3-
gradleWrapperVersion=5.0
1+
grailsVersion=5.2.1
2+
gormVersion=7.2.1
3+
org.gradle.daemon=true
4+
org.gradle.parallel=true
5+
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M
6+
gebVersion=2.3
7+
groovyVersion=3.0.11
8+
seleniumVersion=3.14.0
9+
webdriverBinariesVersion=2.6
10+
chromeDriverVersion=2.45.0
11+
geckodriverVersion=0.24.0
12+
seleniumSafariDriverVersion=3.14.0
13+
alaSecurityLibsVersion=6.0.4

‎gradle/publish.gradle

-32
This file was deleted.

‎gradle/wrapper/gradle-wrapper.jar

3.71 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)