Merge branch 'master' into renovate/gradle-8.x

apereo · Jul 11, 2024 · 9c0ab18 · 9c0ab18
2 parents d2ad2b9 + 598d0c1
commit 9c0ab18
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/src/main/resources/common/gradle/tasks.gradle.mustache b/app/src/main/resources/common/gradle/tasks.gradle.mustache
@@ -187,7 +187,8 @@ task unzipWAR(type: Copy, group: "CAS", description: "Explodes the CAS web appli
 task verifyRequiredJavaVersion {
     def currentVersion = org.gradle.api.JavaVersion.current()
     logger.info "Checking current Java version ${currentVersion} for required Java version ${project.targetCompatibility}"
-    if (!currentVersion.name.equalsIgnoreCase("${project.targetCompatibility}")) {
+    def targetVersion = JavaVersion.toVersion(project.targetCompatibility)
+    if (!currentVersion.isCompatibleWith(targetVersion)) {
         logger.warn("Careful: Current Java version ${currentVersion} does not match required Java version ${project.targetCompatibility}")
     }
 }