Maintenance (#666)

- Updates Checkstyle version - Updates JaCoCo version - Adds toolchains to build files - Prepares for the next Gradle upgrade - Fixes two violations noticed by the new Checkstyle {patch} Signed-off-by: Esta Nagy <[email protected]>
nagyesta · Aug 10, 2023 · b61af50 · b61af50
1 parent f54c4b0
commit b61af50
Show file tree

Hide file tree

Showing 7 changed files with 302 additions and 103 deletions.
diff --git a/build.gradle b/build.gradle
@@ -70,12 +70,15 @@ configure(subprojects.findAll({
 
     version = rootProject.version
     //noinspection GroovyUnusedAssignment
-    sourceCompatibility = '11'
     repositories {
         mavenCentral()
     }
 
     java {
+        sourceCompatibility = JavaVersion.VERSION_11
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(11)
+        }
         withJavadocJar()
         withSourcesJar()
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -18,8 +18,8 @@ cucumber = "7.13.0"
 mockitoCore = "5.4.0"
 jupiter = "5.10.0"
 abortMission = "4.2.30"
-checkstyle = "9.2.1"
-jacoco = "0.8.2"
+checkstyle = "10.12.2"
+jacoco = "0.8.10"
 jacksonBom = { strictly = "2.15.2" }
 jackson = { strictly = "2.15.2" }
 openApiUi = "1.7.0"

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
diff --git a/.../src/main/java/com/github/nagyesta/lowkeyvault/service/certificate/impl/KeyUsageEnum.java b/.../src/main/java/com/github/nagyesta/lowkeyvault/service/certificate/impl/KeyUsageEnum.java
@@ -96,7 +96,7 @@ public static Collector<KeyUsageEnum, AtomicInteger, KeyUsage> toKeyUsage() {
         return new MergingKeyUsageCollector();
     }
 
-    private static class MergingKeyUsageCollector implements Collector<KeyUsageEnum, AtomicInteger, KeyUsage> {
+    private static final class MergingKeyUsageCollector implements Collector<KeyUsageEnum, AtomicInteger, KeyUsage> {
         @Override
         public Supplier<AtomicInteger> supplier() {
             return AtomicInteger::new;

diff --git a/...ta/lowkeyvault/model/json/util/CertificateLifetimeActionSerializationIntegrationTest.java b/...ta/lowkeyvault/model/json/util/CertificateLifetimeActionSerializationIntegrationTest.java
@@ -80,7 +80,7 @@ void testDeserializeShouldReturnExpectedEnumWhenCalledWithInvalidJsonObject(fina
     }
 
     @Data
-    private static class TestObjectType {
+    private static final class TestObjectType {
         @JsonSerialize(using = CertificateLifetimeActionSerializer.class)
         @JsonDeserialize(using = CertificateLifetimeActionDeserializer.class)
         private CertificateLifetimeActionActivity action;

diff --git a/lowkey-vault-client/build.gradle b/lowkey-vault-client/build.gradle
@@ -28,6 +28,7 @@ dependencies {
     annotationProcessor libs.lombok
     testImplementation libs.mockito.core
     testImplementation libs.jupiter
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testImplementation libs.logback.classic
 }
 

diff --git a/lowkey-vault-docker/build.gradle b/lowkey-vault-docker/build.gradle
@@ -7,12 +7,15 @@ plugins {
 
 version = rootProject.version
 //noinspection GroovyUnusedAssignment
-sourceCompatibility = '11'
 repositories {
     mavenCentral()
 }
 
 java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
     withJavadocJar()
     withSourcesJar()
 }