Resolve conflict of agent dependencies version (#28812)

* Resolve conflict of dependencies version * Resolve conflict of agent dependencies version * Resolve conflict of agent dependencies version * Resolve conflict of agent dependencies version * Resolve conflict of agent dependencies version
apache · Oct 20, 2023 · 98bc28e · 98bc28e
1 parent 3a97b5e
commit 98bc28e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/agent/plugins/tracing/type/opentelemetry/pom.xml b/agent/plugins/tracing/type/opentelemetry/pom.xml
@@ -27,8 +27,9 @@
     <name>${project.artifactId}</name>
 
     <properties>
-        <opentelemetry-bom.version>1.22.0</opentelemetry-bom.version>
-        <opentelemetry-autoconfigure.version>1.22.0-alpha</opentelemetry-autoconfigure.version>
+        <opentelemetry-bom.version>1.31.0</opentelemetry-bom.version>
+        <okhttp.version>4.12.0</okhttp.version>
+        <kotlin-stdlib.version>1.9.10</kotlin-stdlib.version>
     </properties>
 
     <dependencyManagement>
@@ -40,6 +41,26 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp</artifactId>
+                <version>${okhttp.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib</artifactId>
+                <version>${kotlin-stdlib.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib-common</artifactId>
+                <version>${kotlin-stdlib.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib-jdk8</artifactId>
+                <version>${kotlin-stdlib.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -67,7 +88,6 @@
         <dependency>
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
-            <version>${opentelemetry-autoconfigure.version}</version>
         </dependency>
         <dependency>
             <groupId>io.opentelemetry</groupId>

diff --git a/pom.xml b/pom.xml
@@ -88,6 +88,7 @@
         <calcite.version>1.35.0</calcite.version>
         <immutables.version>2.9.3</immutables.version>
         <netty.version>4.1.99.Final</netty.version>
+        <netty-tcnative.version>2.0.62.Final</netty-tcnative.version>
         <bouncycastle.version>1.70</bouncycastle.version>
 
         <javax.transaction.version>1.1</javax.transaction.version>
@@ -372,6 +373,11 @@
                 <classifier>linux-aarch_64</classifier>
                 <scope>runtime</scope>
             </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-tcnative-boringssl-static</artifactId>
+                <version>${netty-tcnative.version}</version>
+            </dependency>
             <dependency>
                 <groupId>javax.transaction</groupId>
                 <artifactId>jta</artifactId>

diff --git 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>