From be4c90159ad72ed8a74451d4813460fa655d6ab5 Mon Sep 17 00:00:00 2001
From: Logan Riggs <logan.riggs@dremio.com>
Date: Tue, 9 Jan 2024 12:02:35 -0800
Subject: [PATCH] Revert "ARROW-16996: [Java] Configure Netty/GRPC/Protobuf
 base on BOM configuration + upgrade of dependencies by CVE (#13544)"

This reverts commit 9b18459b20065b1f36fabf3aac587e0fadb38fd6.
---
 docs/source/developers/java/building.rst |  3 +++
 java/flight/flight-core/pom.xml          |  5 +++++
 java/flight/flight-sql/pom.xml           | 12 ------------
 java/pom.xml                             | 12 +++++++-----
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/docs/source/developers/java/building.rst b/docs/source/developers/java/building.rst
index f63f99cee8376..9f4712cea64b5 100644
--- a/docs/source/developers/java/building.rst
+++ b/docs/source/developers/java/building.rst
@@ -341,6 +341,9 @@ Arrow repository, and update the following settings:
   Settings > Build, Execution, Deployment > Compiler > Java Compiler and disable
   "Use '--release' option for cross-compilation (Java 9 and later)". Otherwise
   you will get an error like "package sun.misc does not exist".
+* You may want to disable error-prone entirely if it gives spurious
+  warnings (disable both error-prone profiles in the Maven tool window
+  and "Reload All Maven Projects").
 * If using IntelliJ's Maven integration to build, you may need to change
   ``<fork>`` to ``false`` in the pom.xml files due to an `IntelliJ bug
   <https://youtrack.jetbrains.com/issue/IDEA-278903>`__.
diff --git a/java/flight/flight-core/pom.xml b/java/flight/flight-core/pom.xml
index eb5ad094a91a7..b35e9a0a93db3 100644
--- a/java/flight/flight-core/pom.xml
+++ b/java/flight/flight-core/pom.xml
@@ -98,6 +98,11 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-services</artifactId>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/java/flight/flight-sql/pom.xml b/java/flight/flight-sql/pom.xml
index 298b1652e6c70..d8371e4355564 100644
--- a/java/flight/flight-sql/pom.xml
+++ b/java/flight/flight-sql/pom.xml
@@ -57,26 +57,14 @@
       <artifactId>arrow-jdbc</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-protobuf</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-stub</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.arrow</groupId>
       <artifactId>arrow-vector</artifactId>
diff --git a/java/pom.xml b/java/pom.xml
index b32b403eec5dd..5087066a290d1 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -543,11 +543,6 @@
         <artifactId>flatbuffers-java</artifactId>
         <version>${dep.fbs.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>${dep.guava.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
         <artifactId>jsr305</artifactId>
@@ -587,6 +582,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava-bom</artifactId>
+        <version>${dep.guava-bom.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-bom</artifactId>