Update okhttp dependency to okhttp-jvm (#7517)

Author: jaydeluca

dependencyManagement/build.gradle.kts

@@ -7,6 +7,19 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 val dependencyVersions = hashMapOf<String, String>()
 rootProject.extra["versions"] = dependencyVersions
 
+
+val autoValueVersion = "1.11.0"
+val errorProneVersion = "2.41.0"
+val jmhVersion = "1.37"
+// Mockito 5.x.x requires Java 11 https://github.com/mockito/mockito/releases/tag/v5.0.0
+val mockitoVersion = "4.11.0"
+val slf4jVersion = "2.0.17"
+val opencensusVersion = "0.31.1"
+val prometheusServerVersion = "1.3.10"
+val armeriaVersion = "1.32.5"
+val junitVersion = "5.13.4"
+val okhttpVersion = "5.1.0"
+
 val DEPENDENCY_BOMS = listOf(
   // for some reason boms show up as runtime dependencies in license and vulnerability scans
   // even if they are only used by test dependencies, so not using junit bom here
@@ -16,7 +29,7 @@ val DEPENDENCY_BOMS = listOf(
   "com.fasterxml.jackson:jackson-bom:2.19.2",
   "com.google.guava:guava-bom:33.4.8-jre",
   "com.google.protobuf:protobuf-bom:4.31.1",
-  "com.squareup.okhttp3:okhttp-bom:5.1.0",
+  "com.squareup.okhttp3:okhttp-bom:$okhttpVersion",
   "com.squareup.okio:okio-bom:3.15.0", // applies to transitive dependencies of okhttp
   "io.grpc:grpc-bom:1.74.0",
   "io.netty:netty-bom:4.2.3.Final",
@@ -27,17 +40,6 @@ val DEPENDENCY_BOMS = listOf(
   "org.snakeyaml:snakeyaml-engine:2.10"
 )
 
-val autoValueVersion = "1.11.0"
-val errorProneVersion = "2.41.0"
-val jmhVersion = "1.37"
-// Mockito 5.x.x requires Java 11 https://github.com/mockito/mockito/releases/tag/v5.0.0
-val mockitoVersion = "4.11.0"
-val slf4jVersion = "2.0.17"
-val opencensusVersion = "0.31.1"
-val prometheusServerVersion = "1.3.10"
-val armeriaVersion = "1.32.5"
-val junitVersion = "5.13.4"
-
 val DEPENDENCIES = listOf(
   "org.junit.jupiter:junit-jupiter-api:${junitVersion}",
   "org.junit.jupiter:junit-jupiter-params:${junitVersion}",
@@ -72,6 +74,7 @@ val DEPENDENCIES = listOf(
   "com.google.code.findbugs:jsr305:3.0.2",
   "com.google.guava:guava-beta-checker:1.0",
   "com.sun.net.httpserver:http:20070405",
+  "com.squareup.okhttp3:okhttp-jvm:$okhttpVersion",
   "com.tngtech.archunit:archunit-junit5:1.4.1",
   "com.uber.nullaway:nullaway:0.12.7",
   "edu.berkeley.cs.jqf:jqf-fuzz:1.7", // jqf-fuzz version 1.8+ requires Java 11+

exporters/otlp/all/build.gradle.kts

@@ -34,7 +34,7 @@ dependencies {
   jmhImplementation("com.linecorp.armeria:armeria")
   jmhImplementation("com.linecorp.armeria:armeria-grpc")
   jmhImplementation("io.opentelemetry.proto:opentelemetry-proto")
-  jmhRuntimeOnly("com.squareup.okhttp3:okhttp")
+  jmhRuntimeOnly("com.squareup.okhttp3:okhttp-jvm")
   jmhRuntimeOnly("io.grpc:grpc-netty")
 }
 
@@ -64,8 +64,12 @@ testing {
               }
             }
           }
+          if (it.equals("LATEST")) {
+            implementation("com.squareup.okhttp3:okhttp-jvm")
+          } else {
+            implementation("com.squareup.okhttp3:okhttp")
+          }
 
-          implementation("com.squareup.okhttp3:okhttp")
           implementation("io.grpc:grpc-stub")
         }
 

exporters/otlp/testing-internal/build.gradle.kts

@@ -27,7 +27,7 @@ dependencies {
 
   api("io.opentelemetry.proto:opentelemetry-proto")
   api("org.junit.jupiter:junit-jupiter-api")
-  implementation("com.squareup.okhttp3:okhttp")
+  implementation("com.squareup.okhttp3:okhttp-jvm")
   implementation("org.junit.jupiter:junit-jupiter-params")
 
   implementation("com.linecorp.armeria:armeria-grpc-protocol")

exporters/sender/okhttp/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
   implementation(project(":exporters:common"))
   implementation(project(":sdk:common"))
 
-  implementation("com.squareup.okhttp3:okhttp")
+  implementation("com.squareup.okhttp3:okhttp-jvm")
 
   compileOnly("io.grpc:grpc-stub")
   compileOnly("com.fasterxml.jackson.core:jackson-core")

sdk-extensions/jaeger-remote-sampler/build.gradle.kts

@@ -20,7 +20,7 @@ dependencies {
   implementation(project(":exporters:common"))
   implementation(project(":exporters:sender:okhttp"))
 
-  implementation("com.squareup.okhttp3:okhttp")
+  implementation("com.squareup.okhttp3:okhttp-jvm")
 
   compileOnly("io.grpc:grpc-api")
   compileOnly("io.grpc:grpc-protobuf")