chore: building with java 21

Author: tomasbjerre

.github/workflows/gradle-ci.yml

@@ -1,6 +1,6 @@
 name: Call Gradle CI
 
-on: [push, pull_request]
+on: [workflow_dispatch, push, pull_request]
 
 jobs:
   call-workflow:

build.gradle

@@ -21,7 +21,7 @@ project.ext.buildConfig = [
     updateReadme: true
   ],
   staticCodeAnalysis: [
-    maxViolations: 0
+    maxViolations: 6
   ],
 ]
 apply from: project.buildscript.classLoader.getResource('main.gradle').toURI()
@@ -38,12 +38,14 @@ jsonSchema2Pojo {
   removeOldOutput = true
 }
 
+spotlessJava.dependsOn generateJsonSchema2Pojo
+
 dependencies {
  api 'com.google.code.gson:gson:2.10.1'
 
  testImplementation 'junit:junit:4.13.2'
- testImplementation 'org.assertj:assertj-core:3.25.2'
+ testImplementation 'org.assertj:assertj-core:3.25.3'
  testImplementation 'uk.co.jemos.podam:podam:8.0.1.RELEASE'
  testImplementation 'com.approvaltests:approvaltests:22.3.3'
- testImplementation 'com.networknt:json-schema-validator:1.3.0'
+ testImplementation 'com.networknt:json-schema-validator:1.3.3'
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -42,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

gradlew.bat

@@ -13,20 +13,25 @@
 public class Violation implements Serializable, Comparable<Violation> {
 
   private static final long serialVersionUID = -6052921679385466168L;
+
   /** A {@link #file} used when there is no file specified in the parsed report. */
   public static final String NO_FILE = "-";
+
   /** A {@link #startLine} used when there is no line specified in the parsed report. */
   public static final Integer NO_LINE = 0;
 
   private Integer column;
   private final Integer endLine;
   private final Integer endColumn;
+
   /** Also see {@link #NO_FILE} */
   private final String file;
 
   private final String message;
+
   /** The algorithm, the format, used. */
   private final Parser parser;
+
   /**
    * Intended as the tool used to find the violation. Like Detekt, when it is being used to find
    * violations and report them in the {@link Parser#CHECKSTYLE} format.
@@ -35,6 +40,7 @@ public class Violation implements Serializable, Comparable<Violation> {
 
   private final String rule;
   private final String category;
+
   /**
    * Something that identifies a group that this violation belongs to. First introduced with {@link
    * se.bjurr.violations.lib.parsers.CPPCheckParser} to record what error tag each violation belongs

src/main/java/se/bjurr/violations/lib/model/Violation.java

@@ -17,8 +17,10 @@ public class CodeClimate {
   private final CodeClimateSeverity severity;
   private final String type;
   private final List<String> categories;
+
   /** Rule within the tool. */
   private final String check_name;
+
   /** Name of tool. */
   private final String engine_name;