From 8cb78dfaeedb1d7a92ad1f5abcf5021ebe350cd5 Mon Sep 17 00:00:00 2001 From: Janet Gainer-Dewar Date: Mon, 29 Jul 2024 13:00:01 -0400 Subject: [PATCH] WX-1763 Update to jakarta Bard client (#7475) --- project/Dependencies.scala | 4 ++-- project/Merging.scala | 2 ++ .../scala/cromwell/services/metrics/bard/BardService.scala | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index caeea95fe2f..93e8124109c 100644 --- 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 index 4ed133b82ac..3586035f923 100644 --- 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 index 37c993f1523..f7cc59b2605 100644 --- 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