techdebt: [FFM-12512]: Fix build for JDK 24

Author: andybharness

build.gradle

@@ -20,8 +20,7 @@ plugins {
     id 'jacoco-report-aggregation'
     id "com.github.spotbugs" version libs.versions.spotbugs
     id "org.owasp.dependencycheck" version libs.versions.depcheck
-    id 'me.champeau.jmh' version '0.6.8' // Added JMH plugin
-    id "com.vanniktech.maven.publish" version "0.33.0"
+    id "com.vanniktech.maven.publish" version libs.versions.maven.publish
 }
 
 
@@ -57,10 +56,6 @@ dependencies {
 
     compileOnly libs.lombok
     annotationProcessor libs.lombok
-
-    // JMH dependencies
-    implementation 'org.openjdk.jmh:jmh-core:1.37'
-    annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
 }
 
 group = 'io.harness'
@@ -113,6 +108,10 @@ testing {
                 implementation libs.okhttp3.mockwebserver
                 compileOnly libs.lombok
                 annotationProcessor libs.lombok
+
+                // JMH dependencies
+                implementation libs.jmh.core
+                annotationProcessor libs.jmh.annotations
             }
 
             targets {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-rc-3-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -17,7 +17,7 @@ dependencyResolutionManagement {
             library('swagger-annotations', 'io.swagger:swagger-annotations:1.6.2')
             library('javax-annotation-api', 'javax.annotation:javax.annotation-api:1.2')
             library('slf4j-api', 'org.slf4j:slf4j-api:1.7.36')
-            library('lombok', 'org.projectlombok:lombok:1.18.30')
+            library('lombok', 'org.projectlombok:lombok:1.18.38')
             library('google-findbugs', 'com.google.code.findbugs:jsr305:3.0.2')
 
             // test libs
@@ -26,6 +26,9 @@ dependencyResolutionManagement {
             library('junit-bom', 'org.junit:junit-bom:5.10.1')
             library('mockito-junit5', 'org.mockito:mockito-junit-jupiter:4.8.1')
             library('okhttp3-mockwebserver', 'com.squareup.okhttp3', 'mockwebserver').versionRef('okhttp3')
+            version('jmh', '1.37')
+            library('jmh-core', 'org.openjdk.jmh', 'jmh-core').versionRef('jmh')
+            library('jmh-annotations', 'org.openjdk.jmh', 'jmh-generator-annprocess').versionRef('jmh')
 
             // examples
             library('bc', 'org.bouncycastle:bcpkix-jdk18on:1.78.1')
@@ -35,10 +38,11 @@ dependencyResolutionManagement {
             // do not upgrade openapi, doing so will break compatibility with customers using SpringBoot 2.5.x
             // (newer 5.x.x generators use APIs not present in okhttp 3.14.9)
             version('openapi.generator', '4.3.1')
-            version('spotless', '6.23.3')
+            version('spotless', '7.1.0')
             version('depsize', '0.2.0')
-            version('spotbugs', '6.0.4')
+            version('spotbugs', '6.1.5')
             version('depcheck', '9.0.7')
+            version('maven.publish', '0.33.0')
         }
     }
 }

src/test/java/io/harness/cf/client/api/StorageRepositoryTest.java

@@ -50,7 +50,7 @@ void shouldStoreCurrentConfig() throws Exception {
     assertNotNull(current);
 
     // check if the current version is correct
-    assertEquals(current.getVersion(), new Long(2));
+    assertEquals(current.getVersion(), 2L);
   }
 
   @Test
@@ -84,7 +84,7 @@ void shouldStoreCurrentConfigWithFileStore() throws Exception {
     assertNotNull(current);
 
     // check if the current version is correct
-    assertEquals(current.getVersion(), new Long(2));
+    assertEquals(current.getVersion(), 2L);
   }
 
   @Test
@@ -118,8 +118,8 @@ void shouldStorePreviousAndCurrentConfigWithFileStore() throws Exception {
     assertNotNull(current);
 
     // check if the current version is correct
-    assertEquals(previous.getVersion(), new Long(1));
-    assertEquals(current.getVersion(), new Long(2));
+    assertEquals(previous.getVersion(), 1L);
+    assertEquals(current.getVersion(), 2L);
   }
 
   @Test
@@ -146,8 +146,8 @@ void shouldStorePreviousAndCurrentConfig() throws Exception {
     assertNotNull(current);
 
     // check if the current version is correct
-    assertEquals(previous.getVersion(), new Long(1));
-    assertEquals(current.getVersion(), new Long(2));
+    assertEquals(previous.getVersion(), 1L);
+    assertEquals(current.getVersion(), 2L);
   }
 
   @Test
@@ -176,8 +176,8 @@ void shouldDeletePreviousAndCurrentConfig() throws Exception {
     assertNotNull(current);
 
     // check if the current version is correct
-    assertEquals(previous.getVersion(), new Long(1));
-    assertEquals(current.getVersion(), new Long(2));
+    assertEquals(previous.getVersion(), 1L);
+    assertEquals(current.getVersion(), 2L);
 
     // delete config
     repository.deleteFlag(featureIdentifier);
@@ -233,7 +233,7 @@ private List<FeatureConfig> makeFeatureList(FeatureConfig fc) {
 
   private FeatureConfig GetUpdatedFeatureConfigFromFile() throws Exception {
     FeatureConfig fc = GetFeatureConfigFromFile();
-    fc.setVersion(new Long(2));
+    fc.setVersion(2L);
     return fc;
   }
 
@@ -262,7 +262,7 @@ private List<FeatureConfig> createBenchmarkData(int flagNumber, int version) thr
     for (int i = 1; i <= flagNumber; i++) {
       FeatureConfig f = fg;
       f.setFeature("simpleBool" + i);
-      f.setVersion(new Long(version));
+      f.setVersion((long) version);
       list.add(f);
     }
     //    System.out.println(list);

src/test/java/io/harness/cf/client/api/TestUtils.java

@@ -42,7 +42,7 @@ public List<FeatureConfig> CreateBenchmarkData(int size, int version) throws Exc
     for (int i = 1; i <= size; i++) {
       FeatureConfig f = fg;
       f.setFeature("simpleBool" + i);
-      f.setVersion(new Long(version));
+      f.setVersion((long) version);
       // we are copying objects
       FeatureConfig df = gson.fromJson(gson.toJson(f), FeatureConfig.class);
       list.add(df);