From 0640da74bcbeb9bf539e7574751df6b6d4d072a9 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 15 Sep 2021 15:26:13 +0200
Subject: [PATCH] Upgrade to Checkstyle 9.0, Groovy 3.0.9, Hibernate ORM 5.5.7

Includes downgrade of Kotlin language level to 1.8 (for KotlinScriptTemplateTests)
---
 build.gradle             | 6 +++---
 gradle/toolchains.gradle | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8a3207ccc8..3cb2fa7f94 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,7 +56,7 @@ configure(allprojects) { project ->
 				entry 'aspectjtools'
 				entry 'aspectjweaver'
 			}
-			dependencySet(group: 'org.codehaus.groovy', version: '3.0.8') {
+			dependencySet(group: 'org.codehaus.groovy', version: '3.0.9') {
 				entry 'groovy'
 				entry 'groovy-jsr223'
 				entry 'groovy-templates'  // requires findbugs for warning-free compilation
@@ -123,7 +123,7 @@ configure(allprojects) { project ->
 			dependency "net.sf.ehcache:ehcache:2.10.6"
 			dependency "org.ehcache:jcache:1.0.1"
 			dependency "org.ehcache:ehcache:3.4.0"
-			dependency "org.hibernate:hibernate-core:5.4.32.Final"
+			dependency "org.hibernate:hibernate-core:5.5.7.Final"
 			dependency "org.hibernate:hibernate-validator:6.2.0.Final"
 			dependency "org.webjars:webjars-locator-core:0.47"
 			dependency "org.webjars:underscorejs:1.8.3"
@@ -339,7 +339,7 @@ configure([rootProject] + javaProjects) { project ->
 	}
 
 	checkstyle {
-		toolVersion = "8.45.1"
+		toolVersion = "9.0"
 		configDirectory.set(rootProject.file("src/checkstyle"))
 	}
 
diff --git a/gradle/toolchains.gradle b/gradle/toolchains.gradle
index 57ca9e5141..15ee3bcfc5 100644
--- a/gradle/toolchains.gradle
+++ b/gradle/toolchains.gradle
@@ -121,12 +121,12 @@ pluginManager.withPlugin("kotlin") {
 		// Fallback to JDK11
 		compileKotlin {
 			kotlinOptions {
-				jvmTarget = '11'
+				jvmTarget = '1.8'
 			}
 		}
 		compileTestKotlin {
 			kotlinOptions {
-				jvmTarget = '11'
+				jvmTarget = '1.8'
 			}
 		}
 	}