Merge pull request #842 from AtlasOfLivingAustralia/dev

Preparing v4.2

.github/workflows/build.yml

@@ -42,17 +42,17 @@ jobs:
           mongodb-version: '5.0'
 
       - name: Build and run jacoco coverage report with Gradle
-        uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: -PenableJacoco=true jacocoTestCoverageVerification
 
       - name: Clean to remove clover instrumentation
-        uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: clean
 
       - name: Publish the JAR to the repository
-        uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: publish
         env:

build.gradle

@@ -22,7 +22,7 @@ plugins {
     id 'jacoco'
 }
 
-version "4.1"
+version "4.2-SNAPSHOT"
 group "au.org.ala"
 description "Ecodata"
 
@@ -88,8 +88,6 @@ dependencies {
     implementation "org.grails:grails-plugin-databinding"
     implementation "org.grails:grails-plugin-codecs"
     implementation "org.grails.plugins:mongodb:$gormMongoVersion"
-    // Without this override, 4.6.0 is being included which fails
-    //implementation "org.mongodb:bson:4.3.0"
     implementation "org.grails.plugins:gorm-graphql-plugin:2.0.0"
     // Without this override, 18.1 is being included which is not compatible with the graphql-plugin
     implementation "com.graphql-java:graphql-java:14.0"
@@ -156,8 +154,7 @@ dependencies {
     testImplementation "org.grails:grails-gorm-testing-support"
     testImplementation "org.grails.plugins:geb"
     testImplementation "org.grails:grails-web-testing-support"
-    testImplementation(platform('org.junit:junit-bom:5.9.1'))
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
+
     testImplementation "com.github.tomakehurst:wiremock-jre8-standalone:2.33.2"
     testImplementation "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
     testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
@@ -207,6 +204,7 @@ tasks.withType(Test) {
     testLogging {
         events "passed", "skipped", "failed"
         exceptionFormat 'full'
+        showStandardStreams true
     }
 }
 

gradle/jacoco.gradle

@@ -15,7 +15,7 @@ test {
     finalizedBy jacocoTestReport
 }
 jacocoTestReport {
-    dependsOn test
+    dependsOn check
 
     finalizedBy jacocoTestCoverageVerification
     afterEvaluate {
@@ -39,7 +39,7 @@ jacocoTestCoverageVerification {
     violationRules {
         rule {
             limit {
-                minimum = 0.16
+                minimum = 0.1
             }
         }
     }