From 4b92d597c54d558022cb7b530d4220dd4273b5d8 Mon Sep 17 00:00:00 2001
From: Nathaniel Bauernfeind <natebauernfeind@deephaven.io>
Date: Mon, 4 Nov 2024 17:34:05 -0700
Subject: [PATCH] Fixup mvn install

---
 java/barrage-core/pom.xml | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/java/barrage-core/pom.xml b/java/barrage-core/pom.xml
index e85634d..821f6d9 100644
--- a/java/barrage-core/pom.xml
+++ b/java/barrage-core/pom.xml
@@ -31,6 +31,7 @@
   <properties>
     <dep.grpc.version>1.65.0</dep.grpc.version>
     <dep.protobuf.version>3.25.4</dep.protobuf.version>
+    <dep.guava-bom.version>33.3.1-jre</dep.guava-bom.version>
     <forkCount>1</forkCount>
   </properties>
 
@@ -45,6 +46,10 @@
       <artifactId>grpc-protobuf</artifactId>
       <version>${dep.grpc.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-stub</artifactId>
@@ -72,6 +77,17 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava-bom</artifactId>
+        <version>${dep.guava-bom.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <build>
     <extensions>
       <extension>
@@ -184,8 +200,8 @@
             </goals>
             <configuration>
                 <ignoredDependencies>
-                    <ignoredDependency>io.grpc:grpc-core:jar:1.30.2</ignoredDependency>
-                    <ignoredDependency>io.grpc:grpc-context:jar:1.30.2</ignoredDependency>
+                    <ignoredDependency>io.grpc:grpc-core:jar:${dep.grpc.version}</ignoredDependency>
+                    <ignoredDependency>io.grpc:grpc-context:jar:${dep.grpc.version}</ignoredDependency>
                 </ignoredDependencies>
             </configuration>
           </execution>