Applied review comments

Author: Ben-Edwards-cgi

build.gradle

@@ -2,6 +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.66"
 }
 
 repositories {
@@ -10,7 +11,7 @@ repositories {
 
 dependencies {
     implementation 'org.owasp:dependency-check-gradle:10.0.3'
-
+    implementation 'org.apache.maven:maven-artifact:4.0.0-rc-4'
     compileOnly 'org.projectlombok:lombok:1.18.38'
     annotationProcessor 'org.projectlombok:lombok:1.18.38'
 

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

@@ -1,6 +1,7 @@
 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;
@@ -22,7 +23,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 +40,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);