open-telemetry
/
opentelemetry-java
mirror of https://github.com/open-telemetry/opentelemetry-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove kotlin stdlib (#3590)

This commit is contained in:
Trask Stalnaker 2021-09-09 16:38:50 -07:00 committed by GitHub
parent 68c2d48080
commit 47fd8814e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dependencyManagement/build.gradle.kts
View File

@ -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",
@ -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",

2
integration-tests/src/test/java/io/opentelemetry/B3PropagationIntegrationTest.java
View File

@ -35,7 +35,7 @@ import java.net.URI;
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;