From ba4cf45027c5ce37d67f491cf7861bf7b9f60b44 Mon Sep 17 00:00:00 2001 From: Joe Di Pol <joe.dipol@oracle.com> Date: Wed, 18 Oct 2023 12:42:11 -0700 Subject: [PATCH] Manage version of okio --- dependencies/pom.xml | 10 ++++++++++ tracing/jaeger/pom.xml | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/dependencies/pom.xml b/dependencies/pom.xml index b9705f35e46..0c72ea0f23c 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -132,6 +132,8 @@ <version.lib.oci>3.21.0</version.lib.oci> <version.lib.ojdbc8>21.3.0.0</version.lib.ojdbc8> <version.lib.database.messaging>19.3.0.0</version.lib.database.messaging> + <!-- Manage okio version for dependency convergence --> + <version.lib.okio>3.6.0</version.lib.okio> <!-- Force upgrade okhttp3 transitive dependency --> <version.lib.okhttp3>4.12.0</version.lib.okhttp3> <version.lib.opentelemetry>1.22.0</version.lib.opentelemetry> @@ -1329,6 +1331,14 @@ <type>pom</type> <scope>import</scope> </dependency> + <dependency> + <!-- For dependency convergence. Used by okhttp --> + <groupId>com.squareup.okio</groupId> + <artifactId>okio-bom</artifactId> + <version>${version.lib.okio}</version> + <type>pom</type> + <scope>import</scope> + </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-bom</artifactId> diff --git a/tracing/jaeger/pom.xml b/tracing/jaeger/pom.xml index f2ac2ddd852..dd3edcc037b 100644 --- a/tracing/jaeger/pom.xml +++ b/tracing/jaeger/pom.xml @@ -41,6 +41,11 @@ <groupId>io.opentelemetry</groupId> <artifactId>opentelemetry-sdk</artifactId> </dependency> + <!-- For dependency convergence of kotlin-stdlib --> + <dependency> + <groupId>com.squareup.okio</groupId> + <artifactId>okio</artifactId> + </dependency> <dependency> <groupId>io.opentelemetry</groupId> <artifactId>opentelemetry-exporter-jaeger</artifactId>