Skip to content

Commit e326cc3

Browse files
niravassarsdelamo
niravassar
authored andcommitted
grails5 upgrade
1 parent 45d2256 commit e326cc3

19 files changed

+573
-432
lines changed

complete/build.gradle

+23-18
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
dependencies {
77
classpath "org.grails:grails-gradle-plugin:$grailsVersion"
88
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:$assetPipelineVersion"
9-
classpath "org.grails.plugins:hibernate5:7.0.0"
9+
classpath "org.grails.plugins:hibernate5:7.1.0"
1010
classpath "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:2.1"
1111

1212
}
@@ -69,31 +69,31 @@ dependencies {
6969
compile "org.grails.plugins:scaffolding"
7070
compile "org.grails.plugins:events"
7171
compile "org.grails.plugins:hibernate5"
72-
compile "org.hibernate:hibernate-core:5.4.0.Final"
72+
compile "org.hibernate:hibernate-core:5.5.7.Final"
7373
compile "org.grails.plugins:gsp"
7474
// tag::dependencySSR[]
7575
compile 'org.grails.plugins:spring-security-rest:3.0.0.RC1'
7676
compile 'org.grails.plugins:spring-security-core:4.0.0.RC2'
7777
// end::dependencySSR[]
7878
console "org.grails:grails-console"
7979
profile "org.grails.profiles:web"
80-
runtime "org.glassfish.web:el-impl:2.1.2-b03"
81-
runtime "com.h2database:h2"
82-
runtime "org.apache.tomcat:tomcat-jdbc"
83-
runtime "javax.xml.bind:jaxb-api:2.3.0"
84-
runtime "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
85-
testCompile "org.grails:grails-gorm-testing-support"
86-
testCompile "org.mockito:mockito-core"
87-
testCompile "org.grails:grails-web-testing-support"
80+
runtimeOnly "org.glassfish.web:el-impl:2.1.2-b03"
81+
runtimeOnly "com.h2database:h2"
82+
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
83+
runtimeOnly "javax.xml.bind:jaxb-api:2.3.0"
84+
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
85+
testImplementation "org.grails:grails-gorm-testing-support"
86+
testImplementation "org.mockito:mockito-core"
87+
testImplementation "org.grails:grails-web-testing-support"
8888
// tag::micronaut[]
89-
testCompile "io.micronaut:micronaut-http-client"
89+
testImplementation "io.micronaut:micronaut-http-client"
9090
// end::micronaut[]
91-
testCompile "org.grails.plugins:geb"
92-
testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
93-
testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
94-
testCompile "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion"
95-
testCompile "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
96-
testCompile "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
91+
testImplementation "org.grails.plugins:geb"
92+
testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
93+
testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
94+
testImplementation "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion"
95+
testImplementation "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
96+
testImplementation "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
9797
}
9898

9999
bootRun {
@@ -125,6 +125,11 @@ tasks.withType(Test) {
125125
}
126126

127127
webdriverBinaries {
128-
chromedriver '77.0.3865.40'
128+
chromedriver {
129+
version = '77.0.3865.40'
130+
architecture = 'X86'
131+
}
129132
geckodriver '0.24.0'
130133
}
134+
135+
tasks.withType(Test) { useJUnitPlatform() }

complete/gradle.properties

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
grailsVersion=4.0.1
2-
gormVersion=7.0.2.RELEASE
3-
assetPipelineVersion=3.0.11
1+
grailsVersion=5.0.0
2+
gormVersion=7.1.0.M5
3+
groovyVersion=3.0.7
4+
org.gradle.daemon=true
5+
org.gradle.parallel=true
6+
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M
7+
assetPipelineVersion=3.3.4
48
seleniumVersion=3.141.59
3.83 KB
Binary file not shown.
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.6.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)