From d5aa47d2ccb579b4976a4302ff1537c3ca10a634 Mon Sep 17 00:00:00 2001
From: Oleg Kalnichevski <olegk@apache.org>
Date: Sun, 7 Dec 2025 17:59:24 +0100
Subject: [PATCH] Fixed Micrometer and OpenTelemetry dependency declaration

---
 httpclient5-observation/pom.xml | 31 +++++++++----------------------
 pom.xml                         | 21 +++++++++------------
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/httpclient5-observation/pom.xml b/httpclient5-observation/pom.xml
index c54c368729..29cfe761aa 100644
--- a/httpclient5-observation/pom.xml
+++ b/httpclient5-observation/pom.xml
@@ -36,18 +36,6 @@
   <description>Optional Micrometer / OpenTelemetry support for HttpClient </description>
   <packaging>jar</packaging>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>io.opentelemetry</groupId>
-        <artifactId>opentelemetry-bom</artifactId>
-        <version>1.49.0</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <properties>
     <Automatic-Module-Name>org.apache.httpcomponents.client5.observation</Automatic-Module-Name>
   </properties>
@@ -87,17 +75,23 @@
     <dependency>
       <groupId>io.micrometer</groupId>
       <artifactId>micrometer-registry-prometheus</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk</artifactId>
-      <scope>runtime</scope>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-tracing</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.micrometer</groupId>
       <artifactId>micrometer-tracing-bridge-otel</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-sdk-testing</artifactId>
@@ -113,13 +107,6 @@
       <artifactId>commons-compress</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-tracing</artifactId>
-      <version>${micrometer.tracing.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
diff --git a/pom.xml b/pom.xml
index dab00409cc..7595fa090d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
     <zstd.jni.version>1.5.7-4</zstd.jni.version>
     <micrometer.version>1.15.2</micrometer.version>
     <micrometer.tracing.version>1.5.2</micrometer.tracing.version>
-    <otel.version>1.52.0</otel.version>     <!-- already used elsewhere -->
+    <otel.version>1.49.0</otel.version>     <!-- already used elsewhere -->
     <commons-compress.version>1.26.2</commons-compress.version>
   </properties>
 
@@ -219,37 +219,34 @@
         <groupId>io.micrometer</groupId>
         <artifactId>micrometer-core</artifactId>
         <version>${micrometer.version}</version>
-        <optional>true</optional>
       </dependency>
       <dependency>
         <groupId>io.micrometer</groupId>
         <artifactId>micrometer-observation</artifactId>
         <version>${micrometer.version}</version>
-        <optional>true</optional>
       </dependency>
       <dependency>
         <groupId>io.micrometer</groupId>
         <artifactId>micrometer-registry-prometheus</artifactId>
         <version>${micrometer.version}</version>
-        <optional>true</optional>
       </dependency>
       <dependency>
         <groupId>io.micrometer</groupId>
-        <artifactId>micrometer-tracing-bridge-otel</artifactId>
+        <artifactId>micrometer-tracing</artifactId>
         <version>${micrometer.tracing.version}</version>
-        <optional>true</optional>
+        <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>io.opentelemetry</groupId>
-        <artifactId>opentelemetry-sdk</artifactId>
-        <version>${otel.version}</version>
-        <optional>true</optional>
+        <groupId>io.micrometer</groupId>
+        <artifactId>micrometer-tracing-bridge-otel</artifactId>
+        <version>${micrometer.tracing.version}</version>
       </dependency>
       <dependency>
         <groupId>io.opentelemetry</groupId>
-        <artifactId>opentelemetry-sdk-testing</artifactId>
+        <artifactId>opentelemetry-bom</artifactId>
         <version>${otel.version}</version>
-        <scope>test</scope>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>com.aayushatharva.brotli4j</groupId>