Merge branch 'master' into renovate/org.spockframework-spock-core-2.x

Author: puneetbehl

.github/renovate.json

@@ -7,6 +7,51 @@
     {
       "matchPackagePatterns": ["*"],
       "allowedVersions": "!/SNAPSHOT$/"
+    },
+    {
+      "matchPackagePatterns": [
+        "^org\\.codehaus\\.groovy"
+      ],
+      "groupName": "groovy monorepo"
+    },
+    {
+      "matchPackageNames": [
+        "org.grails:grails-bom",
+        "org.grails:grails-bootstrap",
+        "org.grails:grails-codecs",
+        "org.grails:grails-console",
+        "org.grails:grails-core",
+        "org.grails:grails-databinding",
+        "org.grails:grails-dependencies",
+        "org.grails:grails-docs",
+        "org.grails:grails-encoder",
+        "org.grails:grails-gradle-model",
+        "org.grails:grails-logging",
+        "org.grails:grails-plugin-codecs",
+        "org.grails:grails-plugin-controllers",
+        "org.grails:grails-plugin-databinding",
+        "org.grails:grails-plugin-datasource",
+        "org.grails:grails-plugin-domain-class",
+        "org.grails:grails-plugin-i18n",
+        "org.grails:grails-plugin-interceptors",
+        "org.grails:grails-plugin-mimetypes",
+        "org.grails:grails-plugin-rest",
+        "org.grails:grails-plugin-services",
+        "org.grails:grails-plugin-url-mappings",
+        "org.grails:grails-plugin-url-validation",
+        "org.grails:grails-shell",
+        "org.grails:grails-spring",
+        "org.grails:grails-test",
+        "org.grails:grails-validation",
+        "org.grails:grails-web",
+        "org.grails:grails-web-boot",
+        "org.grails:grails-web-common",
+        "org.grails:grails-web-databinding",
+        "org.grails:grails-web-fileupload",
+        "org.grails:grails-web-mvc",
+        "org.grails:grails-web-url-mappings"
+      ],
+      "groupName": "grails monorepo"
     }
   ]
 }

.github/workflows/central-sync.yml

@@ -15,7 +15,7 @@ jobs:
           ref: v${{ github.event.inputs.release_version }}
       - uses: gradle/wrapper-validation-action@v1
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
           java-version: 1.8
       - name: Syncs with Maven Central/Sonatype

.github/workflows/gradle.yml

@@ -37,14 +37,15 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'adopt'
           java-version: ${{ matrix.java }}
       - name: Optional setup step
         run: |
           [ -f ./setup.sh ] && ./setup.sh || true
       - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@1.3.0
+        uses: supercharge/mongodb-github-action@1.6.0
         with:
           mongodb-version: ${{ matrix.mongodb-version }}
       - name: Compile and Run Tests

.github/workflows/release.yml

@@ -18,8 +18,9 @@ jobs:
           token: ${{ secrets.GH_TOKEN }}
       - uses: gradle/wrapper-validation-action@v1
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'adopt'
           java-version: ${{ matrix.java }}
       - name: Set the current release version
         id: release_version

build.gradle

@@ -12,7 +12,7 @@ buildscript {
         classpath "org.grails:grails-gradle-plugin:$grailsVersion"
         classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.6.1'
         classpath "gradle.plugin.com.energizedwork.webdriver-binaries:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion"
-        classpath "org.grails.plugins:views-gradle:2.1.0.M4"
+        classpath "org.grails.plugins:views-gradle:2.1.0.RC1"
         classpath "io.github.gradle-nexus:publish-plugin:1.1.0"
     }
 }

gradle.properties

@@ -10,8 +10,8 @@ hibernateCoreVersion=5.4.0.Final
 hibernatePluginVersion=7.1.0.RC1
 hibernateValidatorVersion=6.0.13.Final
 jansiVersion=1.18
-javaParserCoreVersion=3.15.14
-junitJupiterVersion=5.7.0
+javaParserCoreVersion=3.22.1
+junitJupiterVersion=5.7.2
 mongoJavaServerVersion=1.28.0
 mongodbDriverVersion=4.0.3
 mongodbRxDriverVersion=1.10.0
@@ -20,8 +20,8 @@ projectVersion=7.1.0-SNAPSHOT
 seleniumSafariDriverVersion=3.14.0
 seleniumVersion=3.14.0
 spockVersion=2.0-groovy-3.0
-springBootVersion=2.5.2
-springVersion=5.3.8
+springBootVersion=2.5.3
+springVersion=5.3.9
 webdriverBinariesVersion=1.4
 
 # only required by sample apps

gradle/wrapper/gradle-wrapper.properties

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