Merge pull request #132 from grails/upgrade/grails4_1

Upgrade to Grails 4.1.2

.github/workflows/gradle.yml

@@ -33,15 +33,15 @@ jobs:
         id: tests
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: check -Dgeb.env=chromeHeadless
+          arguments: check -Pgeb.env=chromeHeadless
       - name: Run Build
         if: github.event_name == 'push'
         id: build
         uses: gradle/gradle-build-action@v2
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
         with:
-          arguments: build
+          arguments: build -Pgeb.env=chromeHeadless
       - name: Publish Test Report
         if: steps.build.outcome == 'failure' || steps.tests.outcome == 'failure'
         uses: scacap/action-surefire-report@v1

examples/extended/build.gradle

@@ -1,13 +1,12 @@
 buildscript {
     repositories {
-        mavenLocal()
         maven { url "https://repo.grails.org/grails/core" }
     }
     dependencies {
         classpath "org.grails:grails-gradle-plugin:$grailsVersion"
-        classpath "org.grails.plugins:hibernate5:${gormVersion-".RELEASE"}"
+        classpath "org.grails.plugins:hibernate5:${hibernateGormVersion}"
         classpath "com.bertramlabs.plugins:asset-pipeline-gradle:${assetPipelineVersion}"
-        classpath "gradle.plugin.com.energizedwork.webdriver-binaries:webdriver-binaries-gradle-plugin:1.4"
+        classpath "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:2.0"
     }
 }
 
@@ -18,13 +17,11 @@ apply plugin:"eclipse"
 apply plugin:"idea"
 apply plugin:"war"
 apply plugin:"org.grails.grails-web"
-apply plugin:"com.energizedwork.webdriver-binaries"
+apply plugin:"com.github.erdi.webdriver-binaries"
 apply plugin: "com.bertramlabs.asset-pipeline"
 apply plugin:"org.grails.grails-gsp"
 
 repositories {
-    mavenLocal()
-    mavenCentral()
     maven { url "https://repo.grails.org/grails/core" }
 }
 
@@ -58,22 +55,15 @@ dependencies {
     runtime "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
     testCompile "org.grails:grails-gorm-testing-support"
     testCompile "org.grails:grails-web-testing-support"
-    testCompile("org.grails.plugins:geb") {
-        exclude group: 'org.gebish', module: 'geb-spock'
-    }
-    testCompile 'org.gebish:geb-spock:2.1'
-    testCompile "org.seleniumhq.selenium:selenium-chrome-driver:3.6.0"
-    testCompile "org.seleniumhq.selenium:selenium-remote-driver:3.6.0"
-    testCompile "org.seleniumhq.selenium:selenium-api:3.6.0"
-    // https://mvnrepository.com/artifact/org.seleniumhq.selenium/selenium-support
-    testCompile group: 'org.seleniumhq.selenium', name: 'selenium-support', version: '3.6.0'
-
-    testCompile("io.github.bonigarcia:webdrivermanager:2.2.4") {
-        exclude group: 'org.seleniumhq.selenium'
-    }
+    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 'dumbster:dumbster:1.6', { transitive = false }
-    compile "org.grails.plugins:mail:$mailVesion"
+    compile "org.grails.plugins:mail:$mailVersion"
 
 
     compile("org.grails.plugins:spring-security-acl:4.0.0.M2") {
@@ -98,10 +88,12 @@ assets {
     minifyCss = true
 }
 
-integrationTest {
-    systemProperty "geb.build.reportsDir", reporting.file("${project.projectDir}/build/geb-reports")
-    systemProperty "geb.env", System.getenv('geb.env') ?: (System.getProperty('webdriver.chrome.driver') ?: 'chromeHeadless')
+
+tasks.withType(Test) {
+    systemProperty "geb.env", System.getProperty('geb.env')
+    systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest")
     systemProperty "webdriver.chrome.driver", System.getProperty('webdriver.chrome.driver')
     systemProperty "webdriver.gecko.driver", System.getProperty('webdriver.gecko.driver')
 }
+
 apply from: "${rootProject.projectDir}/gradle/integrationTestVerbose.gradle"