WX-1763 Update to jakarta Bard client (#7475)

broadinstitute · Jul 29, 2024 · 8cb78df · 8cb78df
1 parent d5cc343
commit 8cb78df
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -68,7 +68,7 @@ object Dependencies {
   private val heterodonV = "1.0.0-beta3"
   private val hsqldbV = "2.6.1"
   private val http4sV = "0.21.31" // this release is EOL. We need to upgrade further for cats3. https://http4s.org/versions/
-  private val jacksonV = "2.13.3"
+  private val jacksonV = "2.14.0"
   private val jakartaActivationV = "1.2.1"
   private val jakartaAnnotationV = "1.3.5"
   private val jakartaInjectV = "2.6.1"
@@ -595,7 +595,7 @@ object Dependencies {
   val servicesDependencies: List[ModuleID] = List(
     "com.google.api" % "gax-grpc" % googleGaxGrpcV,
     "org.apache.commons" % "commons-csv" % commonsCsvV,
-    "bio.terra" % "bard-client-resttemplate-javax" % bardClientV
+    "bio.terra" % "bard-client-resttemplate" % bardClientV
       exclude("org.springframework", "spring-aop")
       exclude("org.springframework", "spring-jcl"),
     "org.apache.httpcomponents.client5" % "httpclient5" % apacheHttpClient5V // Needed for rest-template connection pooling

diff --git a/project/Merging.scala b/project/Merging.scala
@@ -39,6 +39,8 @@ object Merging {
           MergeStrategy.first
         case "versions" :: _ if path.last == "module-info.class" =>
           MergeStrategy.discard
+        case "spring" :: _ if path.last == "aot.factories" =>
+          MergeStrategy.first
         case "native-image" :: _ if Set("native-image.properties", "reflection-config.json").contains(path.last) =>
           /*
           Discard GraalVM configuration files.

diff --git a/services/src/main/scala/cromwell/services/metrics/bard/BardService.scala b/services/src/main/scala/cromwell/services/metrics/bard/BardService.scala
@@ -8,8 +8,8 @@ import cats.data.NonEmptyList
 import com.typesafe.scalalogging.LazyLogging
 import cromwell.services.instrumentation.CromwellInstrumentation
 import cromwell.services.metrics.bard.model.BardEvent
-import org.apache.http.impl.client.HttpClients
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager
+import org.apache.hc.client5.http.impl.classic.HttpClients
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory
 import org.springframework.web.client.RestTemplate