From a4dc4ec9839c3bcc16a829ec857720b8330f2873 Mon Sep 17 00:00:00 2001
From: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
Date: Thu, 30 Jan 2025 13:36:56 +0100
Subject: [PATCH] bom should not include guava - it was only for internal code
 reuse

Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
---
 pom.xml                                          | 12 ++----------
 prometheus-metrics-instrumentation-guava/pom.xml |  1 +
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index d85f3883c..43dba94e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <automatic.module.name>--module-name-need-to-be-overriden--</automatic.module.name>
+        <guava.version>33.4.0-jre</guava.version>
         <junit-jupiter.version>5.11.4</junit-jupiter.version>
         <otel.instrumentation.version>2.12.0-alpha</otel.instrumentation.version>
         <java.version>8</java.version>
@@ -82,16 +83,6 @@
         <module>prometheus-metrics-simpleclient-bridge</module>
     </modules>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>33.4.0-jre</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
@@ -128,6 +119,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/prometheus-metrics-instrumentation-guava/pom.xml b/prometheus-metrics-instrumentation-guava/pom.xml
index 08ea80411..06393868d 100644
--- a/prometheus-metrics-instrumentation-guava/pom.xml
+++ b/prometheus-metrics-instrumentation-guava/pom.xml
@@ -37,6 +37,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>