Skip to content

Commit 0640da7

Browse files
committed
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)
1 parent f53bf8e commit 0640da7

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ configure(allprojects) { project ->
5656
entry 'aspectjtools'
5757
entry 'aspectjweaver'
5858
}
59-
dependencySet(group: 'org.codehaus.groovy', version: '3.0.8') {
59+
dependencySet(group: 'org.codehaus.groovy', version: '3.0.9') {
6060
entry 'groovy'
6161
entry 'groovy-jsr223'
6262
entry 'groovy-templates' // requires findbugs for warning-free compilation
@@ -123,7 +123,7 @@ configure(allprojects) { project ->
123123
dependency "net.sf.ehcache:ehcache:2.10.6"
124124
dependency "org.ehcache:jcache:1.0.1"
125125
dependency "org.ehcache:ehcache:3.4.0"
126-
dependency "org.hibernate:hibernate-core:5.4.32.Final"
126+
dependency "org.hibernate:hibernate-core:5.5.7.Final"
127127
dependency "org.hibernate:hibernate-validator:6.2.0.Final"
128128
dependency "org.webjars:webjars-locator-core:0.47"
129129
dependency "org.webjars:underscorejs:1.8.3"
@@ -339,7 +339,7 @@ configure([rootProject] + javaProjects) { project ->
339339
}
340340

341341
checkstyle {
342-
toolVersion = "8.45.1"
342+
toolVersion = "9.0"
343343
configDirectory.set(rootProject.file("src/checkstyle"))
344344
}
345345

gradle/toolchains.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,12 @@ pluginManager.withPlugin("kotlin") {
121121
// Fallback to JDK11
122122
compileKotlin {
123123
kotlinOptions {
124-
jvmTarget = '11'
124+
jvmTarget = '1.8'
125125
}
126126
}
127127
compileTestKotlin {
128128
kotlinOptions {
129-
jvmTarget = '11'
129+
jvmTarget = '1.8'
130130
}
131131
}
132132
}

0 commit comments

Comments
 (0)