CWMS-2566: Switch to Netbeans Lookup directly (#313)

Legacy hec-lookup does not work properly with Java 21. Most HEC Java 21 applications ship with lookup-compat to allow the old API to use the Netbeans library. Update CDA Client to directly use the nb library rather than relying on the compat lib.

Also update to metrics 4.0.0 which uses netbeans lookup.

Author: stephen-rma

buildSrc/src/main/groovy/cwms-data-api-client.java-conventions.gradle

@@ -12,7 +12,7 @@ compileJava {
 }
 
 dependencies {
-    annotationProcessor(libs.service.annotations)
+    annotationProcessor(libs.lookup)
 
     testImplementation(libs.junit.api)
     testRuntimeOnly(libs.junit.engine)

cwms-http-client/build.gradle

@@ -40,7 +40,6 @@ dependencies {
     implementation(libs.jwt)
 
     runtimeOnly(libs.metrics.codahale)
-    annotationProcessor(libs.service.annotations)
 
     testImplementation(libs.junit.api)
     testImplementation(platform(libs.okhttp.bom))

cwms-http-client/src/main/java/mil/army/usace/hec/cwms/http/client/CwmsHttpClientMetrics.java

@@ -24,8 +24,8 @@
 
 package mil.army.usace.hec.cwms.http.client;
 
-import rma.util.lookup.Lookup;
-import rma.util.lookup.Lookups;
+import org.openide.util.Lookup;
+import org.openide.util.lookup.Lookups;
 import usace.metrics.services.Metrics;
 import usace.metrics.services.MetricsService;
 import usace.metrics.services.MetricsServiceProvider;

cwms-http-client/src/main/java/mil/army/usace/hec/cwms/http/client/CwmsHttpMetricsServiceProvider.java

@@ -32,8 +32,9 @@
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import rma.services.annotations.ServiceProvider;
-import rma.util.lookup.Lookup;
+
+import org.openide.util.Lookup;
+import org.openide.util.lookup.ServiceProvider;
 import usace.metrics.services.MetricsApp;
 import usace.metrics.services.MetricsService;
 import usace.metrics.services.MetricsServiceProvider;

gradle/libs.versions.toml

@@ -1,9 +1,7 @@
 [versions]
 
 #HEC Dependencies
-metrics = "2.0"
-service-annotations = "2.0.1"
-lookup = "2.0"
+metrics = "4.0.0"
 
 #Third Party Dependencies
 jackson = "2.17.2"
@@ -14,20 +12,17 @@ annotation-api = "3.0.0"
 swagger-codegen = "3.0.61"
 jwt = "4.4.0"
 okhttp = "4.12.0"
+lookup = "RELEASE280"
 
 #Test Dependencies
 junit = "5.10.3"
 mockito = "5.12.0"
 
 [libraries]
 #HEC Dependencies
-
 metrics = { module = "mil.army.usace.hec:metrics-services", version.ref = "metrics" }
 metrics-codahale = { module = "mil.army.usace.hec:metrics-codahale", version.ref = "metrics" }
 
-lookup = { module = "mil.army.usace.hec:lookup", version.ref = "lookup" }
-service-annotations = { module = "mil.army.usace.hec:service-annotations", version.ref = "service-annotations" }
-
 #Third-Party
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
 jackson-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" }
@@ -44,6 +39,7 @@ okhttp-urlconnection = { module = "com.squareup.okhttp3:okhttp-urlconnection", v
 okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
 okhttp-bom = { module = "com.squareup.okhttp3:okhttp-bom", version.ref = "okhttp" }
 swagger-parser = { module = "io.swagger.parser.v3:swagger-parser-v3", version.ref = "swagger-parser"}
+lookup = { module = "org.netbeans.api:org-openide-util-lookup", version.ref = "lookup" }
 
 #Test Dependencies
 junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }