Skip to content

Commit ff4d326

Browse files
authored
Update okhttp dependency to okhttp-jvm (open-telemetry#7517)
1 parent 17b4065 commit ff4d326

File tree

5 files changed

+24
-17
lines changed

5 files changed

+24
-17
lines changed

dependencyManagement/build.gradle.kts

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,19 @@ data class DependencySet(val group: String, val version: String, val modules: Li
77
val dependencyVersions = hashMapOf<String, String>()
88
rootProject.extra["versions"] = dependencyVersions
99

10+
11+
val autoValueVersion = "1.11.0"
12+
val errorProneVersion = "2.41.0"
13+
val jmhVersion = "1.37"
14+
// Mockito 5.x.x requires Java 11 https://github.com/mockito/mockito/releases/tag/v5.0.0
15+
val mockitoVersion = "4.11.0"
16+
val slf4jVersion = "2.0.17"
17+
val opencensusVersion = "0.31.1"
18+
val prometheusServerVersion = "1.3.10"
19+
val armeriaVersion = "1.32.5"
20+
val junitVersion = "5.13.4"
21+
val okhttpVersion = "5.1.0"
22+
1023
val DEPENDENCY_BOMS = listOf(
1124
// for some reason boms show up as runtime dependencies in license and vulnerability scans
1225
// even if they are only used by test dependencies, so not using junit bom here
@@ -16,7 +29,7 @@ val DEPENDENCY_BOMS = listOf(
1629
"com.fasterxml.jackson:jackson-bom:2.19.2",
1730
"com.google.guava:guava-bom:33.4.8-jre",
1831
"com.google.protobuf:protobuf-bom:4.31.1",
19-
"com.squareup.okhttp3:okhttp-bom:5.1.0",
32+
"com.squareup.okhttp3:okhttp-bom:$okhttpVersion",
2033
"com.squareup.okio:okio-bom:3.15.0", // applies to transitive dependencies of okhttp
2134
"io.grpc:grpc-bom:1.74.0",
2235
"io.netty:netty-bom:4.2.3.Final",
@@ -27,17 +40,6 @@ val DEPENDENCY_BOMS = listOf(
2740
"org.snakeyaml:snakeyaml-engine:2.10"
2841
)
2942

30-
val autoValueVersion = "1.11.0"
31-
val errorProneVersion = "2.41.0"
32-
val jmhVersion = "1.37"
33-
// Mockito 5.x.x requires Java 11 https://github.com/mockito/mockito/releases/tag/v5.0.0
34-
val mockitoVersion = "4.11.0"
35-
val slf4jVersion = "2.0.17"
36-
val opencensusVersion = "0.31.1"
37-
val prometheusServerVersion = "1.3.10"
38-
val armeriaVersion = "1.32.5"
39-
val junitVersion = "5.13.4"
40-
4143
val DEPENDENCIES = listOf(
4244
"org.junit.jupiter:junit-jupiter-api:${junitVersion}",
4345
"org.junit.jupiter:junit-jupiter-params:${junitVersion}",
@@ -72,6 +74,7 @@ val DEPENDENCIES = listOf(
7274
"com.google.code.findbugs:jsr305:3.0.2",
7375
"com.google.guava:guava-beta-checker:1.0",
7476
"com.sun.net.httpserver:http:20070405",
77+
"com.squareup.okhttp3:okhttp-jvm:$okhttpVersion",
7578
"com.tngtech.archunit:archunit-junit5:1.4.1",
7679
"com.uber.nullaway:nullaway:0.12.7",
7780
"edu.berkeley.cs.jqf:jqf-fuzz:1.7", // jqf-fuzz version 1.8+ requires Java 11+

exporters/otlp/all/build.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencies {
3434
jmhImplementation("com.linecorp.armeria:armeria")
3535
jmhImplementation("com.linecorp.armeria:armeria-grpc")
3636
jmhImplementation("io.opentelemetry.proto:opentelemetry-proto")
37-
jmhRuntimeOnly("com.squareup.okhttp3:okhttp")
37+
jmhRuntimeOnly("com.squareup.okhttp3:okhttp-jvm")
3838
jmhRuntimeOnly("io.grpc:grpc-netty")
3939
}
4040

@@ -64,8 +64,12 @@ testing {
6464
}
6565
}
6666
}
67+
if (it.equals("LATEST")) {
68+
implementation("com.squareup.okhttp3:okhttp-jvm")
69+
} else {
70+
implementation("com.squareup.okhttp3:okhttp")
71+
}
6772

68-
implementation("com.squareup.okhttp3:okhttp")
6973
implementation("io.grpc:grpc-stub")
7074
}
7175

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies {
2727

2828
api("io.opentelemetry.proto:opentelemetry-proto")
2929
api("org.junit.jupiter:junit-jupiter-api")
30-
implementation("com.squareup.okhttp3:okhttp")
30+
implementation("com.squareup.okhttp3:okhttp-jvm")
3131
implementation("org.junit.jupiter:junit-jupiter-params")
3232

3333
implementation("com.linecorp.armeria:armeria-grpc-protocol")

exporters/sender/okhttp/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
implementation(project(":exporters:common"))
1313
implementation(project(":sdk:common"))
1414

15-
implementation("com.squareup.okhttp3:okhttp")
15+
implementation("com.squareup.okhttp3:okhttp-jvm")
1616

1717
compileOnly("io.grpc:grpc-stub")
1818
compileOnly("com.fasterxml.jackson.core:jackson-core")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020
implementation(project(":exporters:common"))
2121
implementation(project(":exporters:sender:okhttp"))
2222

23-
implementation("com.squareup.okhttp3:okhttp")
23+
implementation("com.squareup.okhttp3:okhttp-jvm")
2424

2525
compileOnly("io.grpc:grpc-api")
2626
compileOnly("io.grpc:grpc-protobuf")

0 commit comments

Comments
 (0)