Merge remote-tracking branch 'origin/7.0.x'

Author: puneetbehl

.github/dependabot.yml

@@ -6,3 +6,14 @@ updates:
       interval: "daily"
     labels:
       - "type: dependency upgrade"
+- package-ecosystem: gradle
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  target-branch: 7.0.x
+  ignore:
+  - dependency-name: com.gradle.build-scan
+    versions:
+    - 3.5.1
+    - "3.6"

build.gradle

@@ -25,7 +25,7 @@ logger.info("GORM VERSION = ${project.gormVersion}")
 
 ext {
     isTravisBuild = System.getenv().get("TRAVIS") == 'true'
-    isCiBuild = project.hasProperty("isCiBuild")
+    isCiBuild = project.hasProperty("isCiBuild") || System.getenv().get("CI") as Boolean
     isBuildSnapshot = version.endsWith('-SNAPSHOT')
     isReleaseVersion = !isBuildSnapshot
     nexusUsername = System.getenv("SONATYPE_USERNAME") ?: project.hasProperty("sonatypeOssUsername") ? project.sonatypeOssUsername : ''
@@ -114,8 +114,6 @@ subprojects { project ->
         }
 
         dependencies {
-            //TODO: Remove spring-boot-starter-webflux, and reactor-test once update to Spring Boot 2.4.1
-            implementation 'org.springframework.boot:spring-boot-starter-webflux'
             testImplementation "io.projectreactor:reactor-test:3.4.0"
             testImplementation "org.codehaus.groovy:groovy-test-junit5:$groovyVersion"
             testImplementation("org.spockframework:spock-core:$spockVersion") { transitive = false}

grails-datastore-gorm-hibernate5/build.gradle

@@ -60,7 +60,7 @@ dependencies {
 }
 
 test {
-    if (isTravisBuild) {
+    if (isTravisBuild || isCiBuild) {
         maxParallelForks = 1
         forkEvery = 10
     }