Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use older okhttp version to avoid dependency on kotlin stdlib #3590

Merged
merged 1 commit into from
Sep 9, 2021
+6 −3
Merged

Use older okhttp version to avoid dependency on kotlin stdlib #3590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ val DEPENDENCY_BOMS = listOf(
"com.google.guava:guava-bom:30.1.1-jre",
"com.google.protobuf:protobuf-bom:3.17.3",
"com.linecorp.armeria:armeria-bom:1.9.2",
"com.squareup.okhttp3:okhttp-bom:4.9.1",
"io.grpc:grpc-bom:1.39.0",
"io.zipkin.brave:brave-bom:5.13.3",
"io.zipkin.reporter2:zipkin-reporter-bom:2.16.3",
Expand Down Expand Up @@ -79,7 +78,11 @@ val DEPENDENCIES = listOf(
"com.google.code.gson:gson:2.8.7",
"com.google.guava:guava-beta-checker:1.0",
"com.lmax:disruptor:3.4.4",
"com.squareup.okhttp3:okhttp:4.9.1",
// using old version of okhttp to avoid pulling in kotlin stdlib
// not using (old) okhttp bom because that is pulling in old guava version
// and overriding the guava bom
"com.squareup.okhttp3:okhttp:3.12.13",
"com.squareup.okhttp3:okhttp-tls:3.12.13",
"com.sun.net.httpserver:http:20070405",
"com.tngtech.archunit:archunit-junit4:0.20.1",
"com.uber.nullaway:nullaway:0.9.2",
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/src/test/java/io/opentelemetry/B3PropagationIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import java.util.List;
import java.util.function.Supplier;
import java.util.stream.Stream;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.extension.ExtensionContext;
Expand Down