From a785c6dbe92cccdbb66574fefcddb7b7fe42907a Mon Sep 17 00:00:00 2001
From: zhangliang <zhangliang@apache.org>
Date: Fri, 20 Oct 2023 10:51:05 +0800
Subject: [PATCH] Resolve conflict of agent dependencies version

---
 .../tracing/type/opentelemetry/pom.xml        | 20 +++++++++++++++++++
 test/e2e/agent/plugins/common/pom.xml         |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/agent/plugins/tracing/type/opentelemetry/pom.xml b/agent/plugins/tracing/type/opentelemetry/pom.xml
index d41f68072be6e..53fd101794fb8 100644
--- a/agent/plugins/tracing/type/opentelemetry/pom.xml
+++ b/agent/plugins/tracing/type/opentelemetry/pom.xml
@@ -29,6 +29,7 @@
     <properties>
         <opentelemetry-bom.version>1.22.0</opentelemetry-bom.version>
         <opentelemetry-autoconfigure.version>1.22.0-alpha</opentelemetry-autoconfigure.version>
+        <okhttp.version>4.12.0</okhttp.version>
     </properties>
     
     <dependencyManagement>
@@ -40,6 +41,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp</artifactId>
+                <version>${okhttp.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     
@@ -55,6 +61,20 @@
         <dependency>
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-exporter-jaeger</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib-common</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib-jdk8</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.opentelemetry</groupId>
diff --git a/test/e2e/agent/plugins/common/pom.xml b/test/e2e/agent/plugins/common/pom.xml
index 1a8f74e9a0cc2..649b45884a428 100644
--- a/test/e2e/agent/plugins/common/pom.xml
+++ b/test/e2e/agent/plugins/common/pom.xml
@@ -27,7 +27,7 @@
     <name>${project.artifactId}</name>
     
     <properties>
-        <okhttp.version>3.7.0</okhttp.version>
+        <okhttp.version>4.12.0</okhttp.version>
     </properties>
     
     <dependencies>