From 098970b36f6cab9513004a3867a98baa5717f272 Mon Sep 17 00:00:00 2001
From: James Duong <james.duong@improving.com>
Date: Thu, 23 Nov 2023 12:32:25 -0800
Subject: [PATCH 01/10] Standardize use of maven-shade-plugin

Also set all components to use the latest version already used in the codebase (3.4.1)
---
 java/flight/flight-core/pom.xml            | 1 -
 java/flight/flight-sql-jdbc-driver/pom.xml | 1 -
 java/performance/pom.xml                   | 1 -
 java/pom.xml                               | 5 +++++
 java/vector/pom.xml                        | 1 -
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/java/flight/flight-core/pom.xml b/java/flight/flight-core/pom.xml
index 7b69179053d..1c9d3227b80 100644
--- a/java/flight/flight-core/pom.xml
+++ b/java/flight/flight-core/pom.xml
@@ -149,7 +149,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.1.1</version>
         <executions>
           <execution>
             <id>shade-main</id>
diff --git a/java/flight/flight-sql-jdbc-driver/pom.xml b/java/flight/flight-sql-jdbc-driver/pom.xml
index 263538ba48b..d301f28341e 100644
--- a/java/flight/flight-sql-jdbc-driver/pom.xml
+++ b/java/flight/flight-sql-jdbc-driver/pom.xml
@@ -159,7 +159,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
diff --git a/java/performance/pom.xml b/java/performance/pom.xml
index 102832491ec..94fba35278c 100644
--- a/java/performance/pom.xml
+++ b/java/performance/pom.xml
@@ -103,7 +103,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.2</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
diff --git a/java/pom.xml b/java/pom.xml
index 2a9997b7012..1e2ab5e5233 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -408,6 +408,11 @@
           <artifactId>maven-enforcer-plugin</artifactId>
           <version>3.0.0-M2</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>3.4.1</version>
+        </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
           <version>3.0.0-M7</version>
diff --git a/java/vector/pom.xml b/java/vector/pom.xml
index 4c8bf1e594a..9cedcfdaa44 100644
--- a/java/vector/pom.xml
+++ b/java/vector/pom.xml
@@ -174,7 +174,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.1.1</version>
         <executions>
           <execution>
             <phase>package</phase>

From bc86ebc85d9d2ffbbc2cad7a7c0f60c31f7f44af Mon Sep 17 00:00:00 2001
From: James Duong <james.duong@improving.com>
Date: Thu, 23 Nov 2023 12:33:05 -0800
Subject: [PATCH 02/10] Update maven-shade-plugin to 3.5.1

---
 java/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/pom.xml b/java/pom.xml
index 1e2ab5e5233..52803f12b6a 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -411,7 +411,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>3.4.1</version>
+          <version>3.5.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>

From 39cf91302a8ffa259bf74ddd3dff2299768c0a03 Mon Sep 17 00:00:00 2001
From: James Duong <james.duong@improving.com>
Date: Thu, 23 Nov 2023 13:38:42 -0800
Subject: [PATCH 03/10] Update CycloneDX plugin to 2.7.10

Needed because upgrading grpc-java past 1.58 breaks CycloneDX 2.7.6
and grpc-java 1.58 is needed for modules
---
 java/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/pom.xml b/java/pom.xml
index 52803f12b6a..2676d3531ba 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -361,7 +361,7 @@
       <plugin>
         <groupId>org.cyclonedx</groupId>
         <artifactId>cyclonedx-maven-plugin</artifactId>
-        <version>2.7.6</version>
+        <version>2.7.10</version>
         <executions>
           <execution>
             <phase>package</phase>

From 3af6cd2a6495c7d0072c9f546640a6b23abbb04e Mon Sep 17 00:00:00 2001
From: James Duong <james.duong@improving.com>
Date: Thu, 23 Nov 2023 12:47:50 -0800
Subject: [PATCH 04/10] Update grpc-java to 1.59

1.58 fixes issues around module support
---
 java/flight/flight-core/pom.xml |  4 ----
 java/flight/flight-grpc/pom.xml | 10 +++++-----
 java/pom.xml                    |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/java/flight/flight-core/pom.xml b/java/flight/flight-core/pom.xml
index 1c9d3227b80..30facf734b5 100644
--- a/java/flight/flight-core/pom.xml
+++ b/java/flight/flight-core/pom.xml
@@ -54,10 +54,6 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-context</artifactId>
-    </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-protobuf</artifactId>
diff --git a/java/flight/flight-grpc/pom.xml b/java/flight/flight-grpc/pom.xml
index e7bb9508d24..727c3398f18 100644
--- a/java/flight/flight-grpc/pom.xml
+++ b/java/flight/flight-grpc/pom.xml
@@ -48,12 +48,12 @@
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
-      <artifactId>grpc-core</artifactId>
+      <artifactId>grpc-stub</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-inprocess</artifactId>
     </dependency>
-     <dependency>
-       <groupId>io.grpc</groupId>
-       <artifactId>grpc-stub</artifactId>
-     </dependency>
     <dependency>
       <groupId>org.apache.arrow</groupId>
       <artifactId>arrow-memory-core</artifactId>
diff --git a/java/pom.xml b/java/pom.xml
index 2676d3531ba..26bb3b64ef9 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -34,7 +34,7 @@
     <dep.slf4j.version>1.7.25</dep.slf4j.version>
     <dep.guava-bom.version>31.1-jre</dep.guava-bom.version>
     <dep.netty-bom.version>4.1.100.Final</dep.netty-bom.version>
-    <dep.grpc-bom.version>1.56.0</dep.grpc-bom.version>
+    <dep.grpc-bom.version>1.59.0</dep.grpc-bom.version>
     <dep.protobuf-bom.version>3.23.1</dep.protobuf-bom.version>
     <dep.jackson-bom.version>2.15.1</dep.jackson-bom.version>
     <dep.hadoop.version>2.7.1</dep.hadoop.version>

From 873e03e49d5ddb0d1a2257feb771d56547d1f088 Mon Sep 17 00:00:00 2001
From: James Duong <james.duong@improving.com>
Date: Thu, 23 Nov 2023 13:40:39 -0800
Subject: [PATCH 05/10] Update maven-depndency-plugin to 3.6.1

Needed to be able to handle module-info.class files

Resolve various errors about test-only dependencies.
Note that arrow-tools doesn't need a compile-dependency
on jackson because it gets it through the shaded arrow-vector
JAR.
---
 java/algorithm/pom.xml          | 1 +
 java/flight/flight-grpc/pom.xml | 1 +
 java/flight/flight-sql/pom.xml  | 2 ++
 java/performance/pom.xml        | 6 ++++++
 java/pom.xml                    | 2 +-
 java/tools/pom.xml              | 3 +++
 6 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/java/algorithm/pom.xml b/java/algorithm/pom.xml
index 8c6a9fb0151..3e32d955ec4 100644
--- a/java/algorithm/pom.xml
+++ b/java/algorithm/pom.xml
@@ -31,6 +31,7 @@
       <artifactId>arrow-vector</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.arrow</groupId>
diff --git a/java/flight/flight-grpc/pom.xml b/java/flight/flight-grpc/pom.xml
index 727c3398f18..af765f8c436 100644
--- a/java/flight/flight-grpc/pom.xml
+++ b/java/flight/flight-grpc/pom.xml
@@ -53,6 +53,7 @@
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-inprocess</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.arrow</groupId>
diff --git a/java/flight/flight-sql/pom.xml b/java/flight/flight-sql/pom.xml
index 09100d9731a..25478e58d29 100644
--- a/java/flight/flight-sql/pom.xml
+++ b/java/flight/flight-sql/pom.xml
@@ -53,6 +53,7 @@
     <dependency>
       <groupId>org.apache.arrow</groupId>
       <artifactId>arrow-jdbc</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -70,6 +71,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
diff --git a/java/performance/pom.xml b/java/performance/pom.xml
index 94fba35278c..269ac72d833 100644
--- a/java/performance/pom.xml
+++ b/java/performance/pom.xml
@@ -26,6 +26,7 @@
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
             <version>${jmh.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
@@ -37,10 +38,12 @@
             <groupId>org.apache.arrow</groupId>
             <artifactId>arrow-vector</artifactId>
             <classifier>${arrow.vector.classifier}</classifier>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.arrow</groupId>
             <artifactId>arrow-memory-core</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.arrow</groupId>
@@ -51,10 +54,12 @@
             <groupId>org.apache.avro</groupId>
             <artifactId>avro</artifactId>
             <version>${dep.avro.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.arrow</groupId>
             <artifactId>arrow-avro</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -65,6 +70,7 @@
         <dependency>
             <groupId>org.apache.arrow</groupId>
             <artifactId>arrow-jdbc</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.arrow</groupId>
diff --git a/java/pom.xml b/java/pom.xml
index 26bb3b64ef9..d3c2422e3ad 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -378,7 +378,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.0.1</version>
+          <version>3.6.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.rat</groupId>
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index 128825c2243..2ebabe74e6b 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -37,6 +37,7 @@
         <dependency>
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
+          <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
@@ -52,10 +53,12 @@
         <dependency>
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-core</artifactId>
+          <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-databind</artifactId>
+          <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>org.slf4j</groupId>

From 5adeec3b1e1ebdf5c176f459220632b384eb124a Mon Sep 17 00:00:00 2001
From: James Duong <james.duong@improving.com>
Date: Fri, 24 Nov 2023 08:44:53 -0800
Subject: [PATCH 06/10] Downgrade maven-dependency-plugin to 3.1.2

There appear to be false positives around Jackson usage in arrow-tools
with versions greater than 3.1.2 up to at least 3.6.0.
---
 java/pom.xml       | 7 ++++++-
 java/tools/pom.xml | 2 --
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/java/pom.xml b/java/pom.xml
index d3c2422e3ad..be5e63885d5 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -378,7 +378,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.6.1</version>
+          <!--
+            This appears to report a false positive with versions
+            greater than 3.1.2 (tested up to 3.6.0) when compiling
+            arrow-tools about Jackson being only used for tests.
+          -->
+          <version>3.1.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.rat</groupId>
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index 2ebabe74e6b..4b43c513efd 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -53,12 +53,10 @@
         <dependency>
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-core</artifactId>
-          <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-databind</artifactId>
-          <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>org.slf4j</groupId>

From b547c3d71e82c59663e2097906eda3735c04f4bd Mon Sep 17 00:00:00 2001
From: James Duong <james.duong@improving.com>
Date: Fri, 24 Nov 2023 09:10:43 -0800
Subject: [PATCH 07/10] Downgrade maven-shade-plugin to 3.2.4 for arrow-vector
 only

There are issues looking up FlatBuffers in the arrow-tools
tests if arrow-vector gets shaded with a newer version up to
at least 3.5.1.
---
 java/vector/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/java/vector/pom.xml b/java/vector/pom.xml
index 9cedcfdaa44..17d8f312a52 100644
--- a/java/vector/pom.xml
+++ b/java/vector/pom.xml
@@ -174,6 +174,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
+        <!--
+          Downgrade maven-shade-plugin specifically for this module.
+          Using a newer version up to at least 3.5.1 will cause
+          issues in the arrow-tools tests looking up FlatBuffer
+          dependencies.
+         -->
+        <version>3.2.4</version>
         <executions>
           <execution>
             <phase>package</phase>

From 7b9cb137b05d8946dcfcecdef5b59d80a4bf53a5 Mon Sep 17 00:00:00 2001
From: James Duong <james.duong@improving.com>
Date: Mon, 27 Nov 2023 12:37:40 -0800
Subject: [PATCH 08/10] Update maven-compiler-plugin to 3.11.0 for
 useModulePath flag

Change the project to not use the module path for most compilation
since most compilation will target JDK8.
---
 java/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/pom.xml b/java/pom.xml
index be5e63885d5..7b7f56f56dd 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -45,7 +45,7 @@
     <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
     <errorprone.javac.version>9+181-r4173-1</errorprone.javac.version>
     <error_prone_core.version>2.22.0</error_prone_core.version>
-    <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
+    <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
     <mockito.core.version>5.5.0</mockito.core.version>
     <mockito.inline.version>5.2.0</mockito.inline.version>
   </properties>
@@ -400,6 +400,7 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>${maven-compiler-plugin.version}</version>
           <configuration>
+            <useModulePath>false</useModulePath>
             <annotationProcessorPaths>
               <path>
                 <groupId>org.immutables</groupId>

From 92fde7fca586c63f85c2c855ae627da0764fe8eb Mon Sep 17 00:00:00 2001
From: James Duong <james.duong@improving.com>
Date: Tue, 28 Nov 2023 11:38:36 -0800
Subject: [PATCH 09/10] Update jackson to 2.16.0

2.16.1 in particular had faulty module-info files.
---
 java/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/pom.xml b/java/pom.xml
index 7b7f56f56dd..bdb98383e26 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -36,7 +36,7 @@
     <dep.netty-bom.version>4.1.100.Final</dep.netty-bom.version>
     <dep.grpc-bom.version>1.59.0</dep.grpc-bom.version>
     <dep.protobuf-bom.version>3.23.1</dep.protobuf-bom.version>
-    <dep.jackson-bom.version>2.15.1</dep.jackson-bom.version>
+    <dep.jackson-bom.version>2.16.0</dep.jackson-bom.version>
     <dep.hadoop.version>2.7.1</dep.hadoop.version>
     <dep.fbs.version>1.12.0</dep.fbs.version>
     <dep.avro.version>1.10.0</dep.avro.version>

From 51dceb8733bee729b4548f0adce01a3f774e6eaa Mon Sep 17 00:00:00 2001
From: James Duong <james.duong@improving.com>
Date: Fri, 24 Nov 2023 11:08:21 -0800
Subject: [PATCH 10/10] Downgrade the maven-shade-plugin to 3.2.4 in
 flight-core

There are issues looking up gRPC in the flight-integration0tests
tests if flight-core gets shaded with a newer version up to
at least 3.5.1.
---
 java/flight/flight-core/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/java/flight/flight-core/pom.xml b/java/flight/flight-core/pom.xml
index 30facf734b5..8f41d2b65b7 100644
--- a/java/flight/flight-core/pom.xml
+++ b/java/flight/flight-core/pom.xml
@@ -145,6 +145,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
+        <!--
+          Downgrade maven-shade-plugin specifically for this module.
+          Using a newer version up to at least 3.5.1 will cause
+          issues in the arrow-tools tests looking up FlatBuffer
+          dependencies.
+         -->
+        <version>3.2.4</version>
         <executions>
           <execution>
             <id>shade-main</id>