Merge pull request #182 from AtlasOfLivingAustralia/feature/issue181

Feature/issue181

Author: salomon-j

.github/workflows/build.yml

@@ -34,10 +34,10 @@ jobs:
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
 
-      - name: Build and run clover coverage report with Gradle
+      - name: Run tests and jacoco coverage report with Gradle
         uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
         with:
-          arguments: -PenableClover=true cloverGenerateReport
+          arguments: -PenableJacoco=true check
 
       - name: Run javascript unit tests
         run: node_modules/karma/bin/karma start karma.conf.js --single-run --browsers ChromeHeadless

.travis.yml

@@ -1,7 +1,7 @@
 dist: bionic
 language: groovy
 jdk:
-- openjdk8
+- openjdk11
 sudo: false
 addons:
   chrome: stable
@@ -15,6 +15,7 @@ branches:
   - devg3
   - grails4
   - grails4-bs-branch
+  - grails5
 
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -36,7 +37,7 @@ before_script:
 - npm run-script package-turf
 script:
 - cd $TRAVIS_BUILD_DIR
-- ./gradlew -PenableClover=true cloverGenerateReport
+#- ./gradlew -PenableClover=true cloverGenerateReport
 - node_modules/karma/bin/karma start karma.conf.js --single-run --browsers ChromeHeadless
 
 # need to gradlew clean before publishing to rebuild without the clover instrumentation.

build.gradle

@@ -6,13 +6,16 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath "org.grails:grails-gradle-plugin:$grailsVersion"
+        classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
         classpath "com.bertramlabs.plugins:asset-pipeline-gradle:$assetPipelineVersion"
-        classpath 'com.bmuschko:gradle-clover-plugin:3.0.1'
+        classpath 'com.bmuschko:gradle-clover-plugin:3.0.3'
         classpath 'org.grails.plugins:quartz:2.0.13'
-        classpath "gradle.plugin.com.energizedwork.webdriver-binaries:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion"
+        classpath "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion"
     }
 }
+plugins {
+    id 'jacoco'
+}
 
 
 version "5.3-SNAPSHOT"
@@ -21,14 +24,16 @@ group "org.grails.plugins"
 apply plugin:"eclipse"
 apply plugin:"idea"
 apply plugin:"org.grails.grails-plugin"
-apply plugin:"org.grails.grails-plugin-publish"
+apply from: "${project.projectDir}/gradle/publish.gradle"
 apply plugin:"org.grails.grails-gsp"
 apply plugin:"asset-pipeline"
-apply plugin:"com.energizedwork.webdriver-binaries"
+apply plugin:"com.github.erdi.webdriver-binaries"
 if (Boolean.valueOf(enableClover)) {
     apply from: "${project.projectDir}/gradle/clover.gradle"
 }
-apply plugin:"maven-publish"
+if (Boolean.valueOf(enableJacoco)) {
+    apply from: "${project.projectDir}/gradle/jacoco.gradle"
+}
 
 
 repositories {
@@ -48,47 +53,50 @@ configurations {
 
 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:gsp"
-    compile 'commons-io:commons-io:2.6'
+    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:gsp"
+    implementation 'commons-io:commons-io:2.6'
+    implementation "org.grails.plugins:ala-auth:5.1.1"
+    implementation 'org.pac4j:pac4j-core:5.3.1'
+    implementation 'org.pac4j:pac4j-http:5.3.1'
+
     console "org.grails:grails-console"
     profile "org.grails.profiles:web-plugin"
-    provided "org.grails:grails-plugin-services"
-    provided "org.grails:grails-plugin-domain-class"
-    compile "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
-    testCompile "org.grails:grails-gorm-testing-support"
-    testCompile "org.grails.plugins:geb"
-    testCompile "org.grails:grails-web-testing-support"
-    testCompile 'com.codeborne:phantomjsdriver:1.3.0'
-    testCompile "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
-    testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
-    testRuntime "org.seleniumhq.selenium:selenium-safari-driver:$seleniumSafariDriverVersion"
-    testCompile "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion"
-    testCompile "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
-    testCompile "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
+    implementation "org.grails:grails-plugin-services"
+    implementation "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
+    testImplementation "org.grails:grails-gorm-testing-support"
+    testImplementation "org.grails.plugins:geb"
+    testImplementation "org.grails:grails-web-testing-support"
+    testImplementation 'com.codeborne:phantomjsdriver:1.3.0'
+    testImplementation "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
+    testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
+    testRuntimeOnly "org.seleniumhq.selenium:selenium-safari-driver:$seleniumSafariDriverVersion"
+    testImplementation "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion"
+    testImplementation "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
+    testImplementation "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
 
 
     if (!inplace) {
-        compile ("org.grails.plugins:ala-map-plugin:4.0.1") {
+        implementation ("org.grails.plugins:ala-map-plugin:4.0.1") {
             exclude group: 'com.bertramlabs.plugins', module: 'asset-pipeline-grails'
         }
     }
-    compile "com.bertramlabs.plugins:asset-pipeline-core:$assetPipelineVersion"
+    implementation "com.bertramlabs.plugins:asset-pipeline-core:$assetPipelineVersion"
 }
 
 tasks.withType(Test) {
@@ -114,43 +122,10 @@ assets {
     packagePlugin = true
 }
 
-
-publishing {
-    repositories {
-        maven {
-            name 'GitHubPackages'
-            url uri("https://maven.pkg.github.com/atlasoflivingaustralia/ecodata-client-plugin")
-            credentials {
-                username = System.getenv('GITHUB_ACTOR')
-                password = System.getenv('GITHUB_TOKEN')
-            }
-        }
-    }
-    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.java
-
-        }
-    }
-}
-
 if (inplace) {
     grails {
         plugins {
-            compile (project(':ala-map-plugin'))
+            implementation (project(':ala-map-plugin'))
         }
     }
 }
@@ -163,6 +138,17 @@ task _Events {
     }
 }
 
+tasks.withType(GroovyCompile) {
+    configure(groovyOptions) {
+        forkOptions.jvmArgs = ['-Xmx1024m']
+    }
+}
+
+tasks.withType(Test) {
+    useJUnitPlatform()
+}
+
+
 // the tasks used here for dependsOn may be incomplete/incorrect
 assetCompile.dependsOn(_Events)
 compileGroovy.dependsOn(_Events)

gradle.properties

@@ -1,15 +1,16 @@
-grailsVersion=4.0.10
-gormVersion=7.0.2
-grailsWrapperVersion=1.0.0
-gradleWrapperVersion=5.0
-assetPipelineVersion=3.0.10
-gebVersion=2.3
-seleniumVersion=3.12.0
-webdriverBinariesVersion=1.4
-hibernateCoreVersion=5.1.5.Final
-chromeDriverVersion=2.44
-geckodriverVersion=0.23.0
-seleniumSafariDriverVersion=3.14.0
-org.gradle.jvmargs=-Xss2048k -Xmx1024M
+groovyVersion=3.0.11
+grailsVersion=5.3.2
+gorm.version=7.1.2
+grailsGradlePluginVersion=5.3.0
+org.gradle.daemon=true
+org.gradle.parallel=true
+#grailsWrapperVersion=1.0.0
+#gradleWrapperVersion=5.0
+assetPipelineVersion=3.4.7
+seleniumVersion=4.0.0
+webdriverBinariesVersion=2.6
+seleniumSafariDriverVersion=4.0.0
+org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xss2048k -Xmx1024M
 exploded=true
 enableClover=false
+enableJacoco=true

gradle/jacoco.gradle

@@ -0,0 +1,39 @@
+apply plugin:"jacoco"
+jacoco {
+    toolVersion = "0.8.8"
+}
+
+test {
+    useJUnitPlatform()
+    jacoco {
+        excludes = ['**/Application.groovy',
+                    '**/BootStrap.groovy',
+                    '**/UrlMappings.groovy',
+                    '**/*GrailsPlugin.groovy',
+                    '**/*Mock.groovy',
+                    'com.skedgo.converter.*']
+    }
+    finalizedBy jacocoTestReport // report is always generated after tests run
+}
+
+jacocoTestReport {
+    dependsOn test
+    finalizedBy jacocoTestCoverageVerification // report is always generated after tests run
+
+    reports {
+        xml.enabled false
+        csv.enabled false
+        html.destination file("${buildDir}/reports/jacocoHtml")
+    }
+}
+
+jacocoTestCoverageVerification {
+    dependsOn test
+    violationRules {
+        rule {
+            limit {
+                minimum = 0.2
+            }
+        }
+    }
+}

gradle/publish.gradle

@@ -0,0 +1,31 @@
+apply plugin:"maven-publish"
+publishing {
+    repositories {
+        maven {
+            name 'GitHubPackages'
+            url uri("https://maven.pkg.github.com/atlasoflivingaustralia/ecodata-client-plugin")
+            credentials {
+                username = System.getenv('GITHUB_ACTOR')
+                password = System.getenv('GITHUB_TOKEN')
+            }
+        }
+    }
+    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.java
+        }
+    }
+}

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists