CCPOKR-14012 | [SF Monorepo] Update Misk Dependencies to match artifa… (#3274)

* CCPOKR-14012 | [SF Monorepo] Update Misk Dependencies to match artifact short names used by Topographer

* CCPOKR-14012 | [SF Monorepo] Update Misk Dependencies to match artifact short names used by Topographer

* CCPOKR-14012 | Lint fix

Author: katukota

gradle/libs.versions.toml

@@ -3,21 +3,21 @@ dependencyAnalysisPlugin = "1.29.0"
 kotlinBinaryCompatibilityPlugin = "0.13.1"
 
 [libraries]
-apacheCommonsLang3 = { module = "org.apache.commons:commons-lang3", version = "3.11" }
-apacheCommonsPool2 = { module = "org.apache.commons:commons-pool2", version = "2.11.1" }
+apacheCommonsLang = { module = "org.apache.commons:commons-lang3", version = "3.11" }
+apacheCommonsPool = { module = "org.apache.commons:commons-pool2", version = "2.11.1" }
 assertj = { module = "org.assertj:assertj-core", version = "3.25.3" }
 awaitility = { module = "org.awaitility:awaitility", version = "4.1.0" }
 awaitilityKotlin = { module = "org.awaitility:awaitility-kotlin", version = "4.1.0" }
+aws2Auth = { module = "software.amazon.awssdk:auth", version = "2.21.24" }
 aws2Bom = { module = "software.amazon.awssdk:bom", version = "2.21.24" }
 aws2Dynamodb = { module = "software.amazon.awssdk:dynamodb", version = "2.21.24" }
 aws2DynamodbEnhanced = { module = "software.amazon.awssdk:dynamodb-enhanced", version = "2.21.24" }
-awsAuth = { module = "software.amazon.awssdk:auth", version = "2.21.24" }
-awsCore = { module = "software.amazon.awssdk:aws-core", version = "2.21.24" }
+aws2Regions = { module = "software.amazon.awssdk:regions", version = "2.21.24" }
 awsDynamodb = { module = "com.amazonaws:aws-java-sdk-dynamodb", version = "1.12.576" }
-awsJavaSdkCore = { module = "com.amazonaws:aws-java-sdk-core", version = "1.12.576" }
-awsRegions = { module = "software.amazon.awssdk:regions", version = "2.21.24" }
 awsS3 = { module = "com.amazonaws:aws-java-sdk-s3", version = "1.12.576" }
-awsSdkCore = { module = "software.amazon.awssdk:sdk-core", version = "2.21.24" }
+awsSdkAwsCore= { module = "software.amazon.awssdk:aws-core", version = "2.21.24" }
+awsSdkCore = { module = "com.amazonaws:aws-java-sdk-core", version = "1.12.576" }
+awsSdkSdkCore = { module = "software.amazon.awssdk:sdk-core", version = "2.21.24" }
 awsSqs = { module = "com.amazonaws:aws-java-sdk-sqs", version = "1.12.576" }
 bouncycastle = { module = "org.bouncycastle:bcprov-jdk15on", version = "1.70" }
 bouncycastlePgp = { module = "org.bouncycastle:bcpg-jdk15on", version = "1.70" }
@@ -36,11 +36,11 @@ detektTest = { module = "io.gitlab.arturbosch.detekt:detekt-test", version = "1.
 detektTestUtils = { module = "io.gitlab.arturbosch.detekt:detekt-test-utils", version = "1.23.1" }
 dockerApi = { module = "com.github.docker-java:docker-java-api", version = "3.3.1" }
 dockerCore = { module = "com.github.docker-java:docker-java-core", version = "3.3.1" }
-dockerTransport = { module = "com.github.docker-java:docker-java-transport", version = "3.3.1" }
-dockerTransportHttpClient = { module = "com.github.docker-java:docker-java-transport-httpclient5", version = "3.3.1" }
+dockerTransport = { module = "com.github.docker-java:docker-java-transport-httpclient5", version = "3.3.1" }
+dockerTransportCore = { module = "com.github.docker-java:docker-java-transport", version = "3.3.1" }
 dokkaGradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "1.9.20" }
 errorproneAnnotations = { module = "com.google.errorprone:error_prone_annotations", version = "2.20.0" }
-findBugs = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" }
+findbugsJsr305 = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" }
 gax = { module = "com.google.api:gax", version = "2.5.0" }
 gcpCloudCore = { module = "com.google.cloud:google-cloud-core", version = "1.95.4" }
 gcpCloudStorage = { module = "com.google.cloud:google-cloud-storage", version = "1.117.1" }
@@ -78,7 +78,7 @@ hopliteToml = { module = "com.sksamuel.hoplite:hoplite-toml", version = "2.7.4"
 hopliteYaml = { module = "com.sksamuel.hoplite:hoplite-yaml", version = "2.7.4" }
 hsqldb = { module = "org.hsqldb:hsqldb", version = "2.6.1" }
 jCommander = { module = "com.beust:jcommander", version = "1.72" }
-jacksonAnotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version = "2.14.2" }
+jacksonAnnotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version = "2.14.2" }
 jacksonBom = { module = "com.fasterxml.jackson:jackson-bom", version = "2.14.2" }
 jacksonCore = { module = "com.fasterxml.jackson.core:jackson-core", version = "2.14.2" }
 jacksonDatabind = { module = "com.fasterxml.jackson.core:jackson-databind", version = "2.14.2" }
@@ -129,7 +129,7 @@ kotlinReflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version = "1.8
 kotlinRetry = { module = "com.michael-bull.kotlin-retry:kotlin-retry", version = "1.0.9" }
 kotlinStdLibJdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version = "1.9.21" }
 kotlinTest = { module = "org.jetbrains.kotlin:kotlin-test", version = "1.9.21" }
-kotlinxCoroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.7.3" }
+kotlinxCoroutinesCore = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.7.3" }
 kotlinxHtml = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version = "0.8.1" }
 kubernetesClient = { module = "io.kubernetes:client-java", version = "18.0.1" }
 kubernetesClientApi = { module = "io.kubernetes:client-java-api", version = "18.0.1" }
@@ -138,18 +138,18 @@ logbackClassic = { module = "ch.qos.logback:logback-classic", version = "1.4.8"
 logbackCore = { module = "ch.qos.logback:logback-core", version = "1.4.8" }
 mavenPublishGradlePlugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.27.0" }
 micrometerCore = { module = "io.micrometer:micrometer-core", version = "1.11.1" }
-micrometerPrometheus = { module = "io.micrometer:micrometer-registry-prometheus", version = "1.11.1" }
+micrometerRegistryPrometheus = { module = "io.micrometer:micrometer-registry-prometheus", version = "1.11.1" }
 mockitoCore = { module = "org.mockito:mockito-core", version = "5.4.0" }
-moshi = { module = "com.squareup.moshi:moshi", version = "1.15.1" }
 moshiAdapters = { module = "com.squareup.moshi:moshi-adapters", version = "1.15.1" }
+moshiCore = { module = "com.squareup.moshi:moshi", version = "1.15.1" }
 moshiKotlin = { module = "com.squareup.moshi:moshi-kotlin", version = "1.15.1" }
 mysql = { module = "com.mysql:mysql-connector-j", version = "8.0.33" }
 nettyBom = { module = "io.netty:netty-bom", version = "4.1.92.Final" }
 nettyHandler = { module = "io.netty:netty-handler", version = "4.1.92.Final" }
 okHttp = { module = "com.squareup.okhttp3:okhttp", version = "4.12.0" }
 okHttpMockWebServer = { module = "com.squareup.okhttp3:mockwebserver", version = "4.12.0" }
 okio = { module = "com.squareup.okio:okio", version = "3.8.0" }
-openTracingApi = { module = "io.opentracing:opentracing-api", version = "0.33.0" }
+openTracing = { module = "io.opentracing:opentracing-api", version = "0.33.0" }
 openTracingConcurrent = { module = "io.opentracing.contrib:opentracing-concurrent", version = "0.4.0" }
 openTracingDatadog = { module = "com.datadoghq:dd-trace-ot", version = "1.31.2" }
 openTracingJdbc = { module = "io.opentracing.contrib:opentracing-jdbc", version = "0.2.15" }

misk-action-scopes/build.gradle.kts

@@ -16,8 +16,8 @@ dependencies {
   api(project(":misk-inject"))
   implementation(libs.kotlinReflect)
   implementation(libs.kotlinStdLibJdk8)
-  implementation(libs.kotlinxCoroutines)
-  implementation(libs.moshi)
+  implementation(libs.kotlinxCoroutinesCore)
+  implementation(libs.moshiCore)
 
   testImplementation(libs.assertj)
   testImplementation(libs.junitApi)

misk-admin/build.gradle.kts

@@ -13,7 +13,7 @@ dependencies {
   api(libs.guice)
   api(libs.jakartaInject)
   api(libs.kotlinxHtml)
-  api(libs.moshi)
+  api(libs.moshiCore)
   api(libs.okio)
   api(project(":wisp:wisp-deployment"))
   api(project(":misk"))

misk-aws-dynamodb/build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 
 dependencies {
   api(libs.awsDynamodb)
-  api(libs.awsJavaSdkCore)
+  api(libs.awsSdkCore)
   api(libs.guava)
   api(libs.guice)
   api(libs.jakartaInject)

misk-aws/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 dependencies {
-  api(libs.awsJavaSdkCore)
+  api(libs.awsSdkCore)
   api(libs.awsS3)
   api(libs.awsSqs)
   api(libs.guava)
@@ -24,8 +24,8 @@ dependencies {
   api(project(":misk-inject"))
   api(project(":misk-jobqueue"))
   implementation(libs.kotlinLogging)
-  implementation(libs.moshi)
-  implementation(libs.openTracingApi)
+  implementation(libs.moshiCore)
+  implementation(libs.openTracing)
   implementation(libs.openTracingDatadog)
   implementation(libs.prometheusClient)
   implementation(libs.slf4jApi)

misk-aws2-dynamodb/build.gradle.kts

@@ -11,15 +11,15 @@ plugins {
 
 dependencies {
   api(libs.aws2Dynamodb)
-  api(libs.awsAuth)
-  api(libs.awsSdkCore)
+  api(libs.aws2Auth)
+  api(libs.awsSdkSdkCore)
   api(libs.guava)
   api(libs.guice)
   api(libs.jakartaInject)
   api(project(":misk-aws"))
   api(project(":misk-inject"))
-  implementation(libs.awsCore)
-  implementation(libs.awsRegions)
+  implementation(libs.awsSdkAwsCore)
+  implementation(libs.aws2Regions)
   implementation(project(":misk-exceptions-dynamodb"))
   implementation(project(":misk-service"))
 

misk-config/build.gradle.kts

@@ -10,14 +10,14 @@ plugins {
 
 dependencies {
   api(libs.guice)
-  api(libs.jacksonAnotations)
+  api(libs.jacksonAnnotations)
   api(libs.jacksonDatabind)
   api(libs.jakartaInject)
   api(project(":wisp:wisp-config"))
   api(project(":wisp:wisp-deployment"))
   api(project(":wisp:wisp-resource-loader"))
   api(project(":misk-inject"))
-  implementation(libs.apacheCommonsLang3)
+  implementation(libs.apacheCommonsLang)
   implementation(libs.guava)
   implementation(libs.jacksonCore)
   implementation(libs.jacksonDataformatYaml)

misk-core/build.gradle.kts

@@ -28,7 +28,7 @@ dependencies {
   testImplementation(libs.assertj)
   testImplementation(libs.junitApi)
   testImplementation(libs.kotlinTest)
-  testImplementation(libs.kotlinxCoroutines)
+  testImplementation(libs.kotlinxCoroutinesCore)
   testImplementation(libs.logbackClassic)
   testImplementation(project(":wisp:wisp-logging"))
   testImplementation(project(":wisp:wisp-logging-testing"))

misk-crypto/build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-  api(libs.awsJavaSdkCore)
+  api(libs.awsSdkCore)
   api(libs.awsS3)
   api(libs.guice)
   api(libs.jakartaInject)
@@ -25,7 +25,7 @@ dependencies {
   implementation(libs.bouncycastlePgp)
   implementation(libs.guava)
   implementation(libs.kotlinLogging)
-  implementation(libs.moshi)
+  implementation(libs.moshiCore)
   implementation(libs.okio)
   implementation(project(":wisp:wisp-logging"))
   implementation(project(":misk"))

misk-datadog/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
   api(libs.kotlinLogging)
   api(project(":misk-inject"))
   implementation(libs.guice)
-  implementation(libs.openTracingApi)
+  implementation(libs.openTracing)
   implementation(libs.openTracingUtil)
   implementation(libs.slf4jApi)
   implementation(libs.tracingDatadog)

misk-exceptions-dynamodb/build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
 
 dependencies {
   api(libs.awsDynamodb)
-  api(libs.awsJavaSdkCore)
+  api(libs.awsSdkCore)
   api(libs.jakartaInject)
   api(libs.slf4jApi)
   api(project(":misk"))

misk-feature-testing/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
   api(project(":misk-inject"))
   implementation(libs.guice)
   implementation(libs.kotlinStdLibJdk8)
-  implementation(libs.moshi)
+  implementation(libs.moshiCore)
   implementation(project(":misk-service"))
 }
 

misk-feature/build.gradle.kts

@@ -21,15 +21,15 @@ dependencies {
   testFixturesApi(project(":misk-inject"))
   testFixturesImplementation(libs.guice)
   testFixturesImplementation(libs.kotlinStdLibJdk8)
-  testFixturesImplementation(libs.moshi)
+  testFixturesImplementation(libs.moshiCore)
   testFixturesImplementation(project(":misk-service"))
 
   testImplementation(libs.assertj)
   testImplementation(libs.guice)
   testImplementation(libs.jakartaInject)
   testImplementation(libs.junitApi)
   testImplementation(libs.kotlinTest)
-  testImplementation(libs.moshi)
+  testImplementation(libs.moshiCore)
   testImplementation(project(":wisp:wisp-feature-testing"))
   testImplementation(project(":wisp:wisp-moshi"))
   testImplementation(project(":misk-feature"))

misk-gcp/build.gradle.kts

@@ -27,9 +27,9 @@ dependencies {
   api(libs.guice)
   api(libs.jakartaInject)
   api(libs.logbackClassic)
-  api(libs.moshi)
+  api(libs.moshiCore)
   api(libs.okio)
-  api(libs.openTracingApi)
+  api(libs.openTracing)
   api(project(":wisp:wisp-config"))
   api(project(":wisp:wisp-deployment"))
   api(project(":misk-config"))
@@ -53,8 +53,8 @@ dependencies {
 
   testFixturesApi(libs.dockerApi)
   testFixturesApi(libs.dockerCore)
-  testFixturesApi(libs.dockerTransportHttpClient)
-  testFixturesApi(libs.findBugs)
+  testFixturesApi(libs.dockerTransport)
+  testFixturesApi(libs.findbugsJsr305)
   testFixturesApi(libs.gcpCloudCore)
   testFixturesApi(libs.gcpCloudStorage)
   testFixturesApi(libs.gcpDatastore) {
@@ -70,16 +70,16 @@ dependencies {
   testFixturesApi(project(":misk-gcp"))
   testFixturesApi(project(":misk-inject"))
   testFixturesImplementation(libs.assertj)
-  testFixturesImplementation(libs.dockerTransport)
+  testFixturesImplementation(libs.dockerTransportCore)
   testFixturesImplementation(libs.gax)
   testFixturesImplementation(libs.gcpSpanner)
   testFixturesImplementation(libs.googleAuthLibraryCredentials)
   testFixturesImplementation(libs.googleHttpClientJackson)
   testFixturesImplementation(libs.junitApi)
   testFixturesImplementation(libs.kotlinRetry)
   testFixturesImplementation(libs.kotlinTest)
-  testFixturesImplementation(libs.kotlinxCoroutines)
-  testFixturesImplementation(libs.moshi)
+  testFixturesImplementation(libs.kotlinxCoroutinesCore)
+  testFixturesImplementation(libs.moshiCore)
   testFixturesImplementation(project(":wisp:wisp-containers-testing"))
   testFixturesImplementation(project(":wisp:wisp-moshi"))
   testFixturesImplementation(project(":misk-service"))
@@ -89,7 +89,7 @@ dependencies {
   testImplementation(libs.dockerApi)
   testImplementation(libs.dockerCore)
   testImplementation(libs.dockerTransport)
-  testImplementation(libs.dockerTransportHttpClient)
+  testImplementation(libs.dockerTransportCore)
   testImplementation(libs.junitApi)
   testImplementation(libs.kotlinTest)
   testImplementation(libs.openTracingDatadog)

misk-hibernate/build.gradle.kts

@@ -36,7 +36,7 @@ dependencies {
   api(project(":wisp:wisp-config"))
   implementation(libs.kotlinLogging)
   implementation(libs.kotlinReflect)
-  implementation(libs.moshi)
+  implementation(libs.moshiCore)
   implementation(libs.okHttp)
   implementation(libs.okio)
   implementation(libs.tink)

misk-jdbc/build.gradle.kts

@@ -16,16 +16,16 @@ dependencies {
   api(libs.guava)
   api(libs.guice)
   api(libs.jakartaInject)
-  api(libs.moshi)
-  api(libs.openTracingApi)
+  api(libs.moshiCore)
+  api(libs.openTracing)
   api(libs.prometheusClient)
   api(project(":misk-config"))
   api(project(":misk-core"))
   api(project(":misk-inject"))
   api(project(":wisp:wisp-config"))
   api(project(":wisp:wisp-deployment"))
   implementation(libs.dockerTransport)
-  implementation(libs.dockerTransportHttpClient)
+  implementation(libs.dockerTransportCore)
   implementation(libs.hikariCp)
   implementation(libs.kotlinLogging)
   implementation(libs.mysql)
@@ -40,7 +40,7 @@ dependencies {
 
   testFixturesApi(libs.datasourceProxy)
   testFixturesApi(libs.jakartaInject)
-  testFixturesApi(libs.moshi)
+  testFixturesApi(libs.moshiCore)
   testFixturesApi(libs.okHttp)
   testFixturesApi(project(":misk-inject"))
   testFixturesApi(project(":misk-jdbc"))

misk-jobqueue/build.gradle.kts

@@ -28,7 +28,7 @@ dependencies {
   testImplementation(libs.kotlinLogging)
   testImplementation(libs.kotlinTest)
   testImplementation(libs.logbackClassic)
-  testImplementation(libs.moshi)
+  testImplementation(libs.moshiCore)
   testImplementation(project(":wisp:wisp-logging"))
   testImplementation(project(":wisp:wisp-logging-testing"))
   testImplementation(project(":wisp:wisp-time-testing"))

misk-jooq/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
   api(project(":misk-jdbc"))
   implementation(libs.jakartaInject)
   implementation(libs.kotlinRetry)
-  implementation(libs.kotlinxCoroutines)
+  implementation(libs.kotlinxCoroutinesCore)
   implementation(project(":wisp:wisp-logging"))
 
   testImplementation(libs.assertj)

misk-launchdarkly-core/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
   testImplementation(libs.logbackClassic)
   testImplementation(libs.micrometerCore)
   testImplementation(libs.mockitoCore)
-  testImplementation(libs.moshi)
+  testImplementation(libs.moshiCore)
   testImplementation(project(":wisp:wisp-logging-testing"))
   testImplementation(project(":wisp:wisp-moshi"))
 }

misk-launchdarkly/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
   implementation(libs.kotlinStdLibJdk8)
   implementation(libs.launchDarkly)
   implementation(libs.micrometerCore)
-  implementation(libs.moshi)
+  implementation(libs.moshiCore)
   implementation(project(":misk-core"))
   implementation(project(":misk-feature"))
   implementation(project(":misk-launchdarkly-core"))

misk-metrics/build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
 dependencies {
   api(project(":misk-inject"))
   api(libs.prometheusClient)
-  implementation(libs.findBugs)
+  implementation(libs.findbugsJsr305)
   implementation(libs.guava)
   implementation(libs.guice)
   implementation(libs.jakartaInject)
@@ -24,7 +24,7 @@ dependencies {
   testFixturesImplementation(libs.guice)
   testFixturesImplementation(libs.kotlinStdLibJdk8)
   testFixturesImplementation(libs.micrometerCore)
-  testFixturesImplementation(libs.micrometerPrometheus)
+  testFixturesImplementation(libs.micrometerRegistryPrometheus)
 
   testImplementation(project(":misk-testing"))
   testImplementation(project(":misk-metrics"))