Merge pull request #310 from hmcts/gradle-9-support

Added support for gradle 9

Author: Ben-Edwards-cgi

README.md

@@ -1,4 +1,4 @@
-# HMCTS Gradle Java Plugin ![Java CI](https://github.com/hmcts/gradle-java-plugin/workflows/Java%20CI/badge.svg) ![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/hmcts/gradle-java-plugin?label=release)
+# HMCTS Gradle Java Plugin ![Java CI](https://github.com/hmcts/gradle-java-plugin/workflows/Java%20CI/badge.svg) ![GitHub tag (latest SemVer)](https://img.shields.io/github/v/release/hmcts/gradle-java-plugin)
 
 Applies and configures a standard set of code analysis tools for use in HMCTS Java projects.
 

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'java-gradle-plugin'
     id 'groovy'
     id 'com.gradle.plugin-publish' version '1.3.1'
-    id "uk.gov.hmcts.java" version "0.12.65"
+    id "uk.gov.hmcts.java" version "0.12.66"
 }
 
 repositories {
@@ -11,9 +11,9 @@ repositories {
 
 dependencies {
     implementation 'org.owasp:dependency-check-gradle:10.0.3'
-
+    implementation 'org.apache.maven:maven-artifact:3.9.10'
     compileOnly 'org.projectlombok:lombok:1.18.38'
-	annotationProcessor 'org.projectlombok:lombok:1.18.38'
+    annotationProcessor 'org.projectlombok:lombok:1.18.38'
 
     testImplementation group: 'com.google.guava', name: 'guava', version: '33.4.8-jre'
     testImplementation group: 'commons-io', name: 'commons-io', version: '2.19.0'
@@ -32,8 +32,8 @@ compileJava {
 
 def version = System.getenv("RELEASE_VERSION")?.replace("refs/tags/", "") ?: "DEV-SNAPSHOT"
 
-group 'uk.gov.hmcts.reform'
-project.version version
+group = 'uk.gov.hmcts.reform'
+project.version = version
 
 gradlePlugin {
     // Define the plugin
@@ -58,7 +58,7 @@ sourceSets {
 gradlePlugin.testSourceSets(sourceSets.integrationTest)
 configurations.integrationTestImplementation.extendsFrom(configurations.testImplementation)
 
-task integrationTest(type: Test) {
+tasks.register('integrationTest', Test) {
     testClassesDirs = sourceSets.integrationTest.output.classesDirs
     classpath = sourceSets.integrationTest.runtimeClasspath
 }

src/main/java/uk/gov/hmcts/tools/CheckstyleSetup.java

@@ -1,13 +1,13 @@
 package uk.gov.hmcts.tools;
 
 import lombok.SneakyThrows;
+import org.apache.maven.artifact.versioning.ComparableVersion;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.Project;
 import org.gradle.api.plugins.quality.Checkstyle;
 import org.gradle.api.plugins.quality.CheckstyleExtension;
 import org.gradle.api.plugins.quality.CheckstylePlugin;
 import org.gradle.api.tasks.TaskAction;
-import org.gradle.util.VersionNumber;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -22,7 +22,7 @@ public class CheckstyleSetup extends DefaultTask {
 
     // Recent checkstyle versions flag an annotation array indentation which is widely used at HMCTS.
     // Consequently we don't force recent versions onto teams (but they may opt in).
-    public static final String minCheckstyleVersion = "8.31";
+    public static final ComparableVersion minCheckstyleVersion = new ComparableVersion("8.31");
 
     public static void apply(Project project) {
         project.getPlugins().apply(CheckstylePlugin.class);
@@ -39,9 +39,9 @@ public static void apply(Project project) {
                 if (checkstyleTask.getConfigFile() == null || !checkstyleTask.getConfigFile().exists()) {
                     // If using bundled checkstyle config, set a floor for checkstyle version since older versions may
                     // not support our bundled config.
-                    if (VersionNumber.parse(minCheckstyleVersion)
-                        .compareTo(VersionNumber.parse(ext.getToolVersion())) > 0) {
-                        ext.setToolVersion(minCheckstyleVersion);
+                    ComparableVersion currentCheckStyleVersion = new ComparableVersion(ext.getToolVersion());
+                    if (minCheckstyleVersion.compareTo(currentCheckStyleVersion) > 0) {
+                        ext.setToolVersion(ext.getToolVersion());
                     }
 
                     checkstyleTask.setConfigFile(writer.configFile);