From d1294a82af53a184bd6094908435c8c6efad28ec Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Thu, 9 Apr 2026 14:29:21 +0000 Subject: [PATCH] fix: okhttp4 resource path rename and unpin testing-internal okhttp version - generateMainResources was missing eachFile path rename, causing version.properties to land at the wrong package path in the jar - testing-internal hardcoded okhttp 5.3.2; let dependencyManagement own it Signed-off-by: Gregor Zeitlinger --- exporters/otlp/testing-internal/build.gradle.kts | 2 +- exporters/sender/okhttp4/build.gradle.kts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/exporters/otlp/testing-internal/build.gradle.kts b/exporters/otlp/testing-internal/build.gradle.kts index 61ff4b17327..1d6bff53854 100644 --- a/exporters/otlp/testing-internal/build.gradle.kts +++ b/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:5.3.2") + implementation("com.squareup.okhttp3:okhttp") implementation("org.junit.jupiter:junit-jupiter-params") implementation("com.linecorp.armeria:armeria-grpc") diff --git a/exporters/sender/okhttp4/build.gradle.kts b/exporters/sender/okhttp4/build.gradle.kts index a28ff4b4e0b..d7a15e7e495 100644 --- a/exporters/sender/okhttp4/build.gradle.kts +++ b/exporters/sender/okhttp4/build.gradle.kts @@ -32,6 +32,7 @@ val generateMainResources by tasks.registering(Sync::class) { from(okhttpDir.resolve("src/main/resources")) into(layout.buildDirectory.dir("generated/sources/okhttp4/main/resources")) filter { line: String -> line.replace("sender.okhttp.internal", "sender.okhttp4.internal") } + eachFile { path = path.replace("sender/okhttp/internal", "sender/okhttp4/internal") } includeEmptyDirs = false }