From 7e956964090d28f9c0739673841f91cd29c94405 Mon Sep 17 00:00:00 2001
From: Marc Handalian <handalm@amazon.com>
Date: Tue, 9 May 2023 12:58:53 -0700
Subject: [PATCH] Exclude protobuf-java version included with
 hadoop-minicluster (#7480) (#7486)

Signed-off-by: Marc Handalian <handalm@amazon.com>
---
 buildSrc/version.properties             | 1 +
 test/fixtures/hdfs-fixture/build.gradle | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index ab1897bcd65e1..3f3248c109ed0 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -20,6 +20,7 @@ asm               = 9.5
 woodstox          = 6.4.0
 kotlin            = 1.7.10
 guava             = 31.1-jre
+protobuf          = 3.22.3
 
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = 5.5.0
diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle
index 6f54cc93cf254..2c018075cd91b 100644
--- a/test/fixtures/hdfs-fixture/build.gradle
+++ b/test/fixtures/hdfs-fixture/build.gradle
@@ -36,6 +36,7 @@ dependencies {
     exclude module: 'jettison'
     exclude module: 'netty'
     exclude module: 'guava'
+    exclude module: 'protobuf-java'
     exclude group: 'org.codehaus.jackson'
   }
 
@@ -53,6 +54,7 @@ dependencies {
   api 'net.minidev:json-smart:2.4.8'
   api 'org.apache.zookeeper:zookeeper:3.8.0'
   api "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"
+  api "com.google.protobuf:protobuf-java:${versions.protobuf}"
   api "org.eclipse.jetty:jetty-server:${versions.jetty}"
   api "org.eclipse.jetty.websocket:javax-websocket-server-impl:${versions.jetty}"
   runtimeOnly "com.google.guava:guava:${versions.guava}"