From 1ad01b52bfdbce0a27137d3758b6ea587bb34cf7 Mon Sep 17 00:00:00 2001
From: Vibhatha Lakmal Abeykoon <vibhatha@gmail.com>
Date: Tue, 20 Feb 2024 09:00:52 +0530
Subject: [PATCH 1/2] fix: minor build issue

---
 java/flight/flight-core/pom.xml                                 | 2 +-
 .../{main => test}/java/org/apache/arrow/tools/Integration.java | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename java/tools/src/{main => test}/java/org/apache/arrow/tools/Integration.java (100%)

diff --git a/java/flight/flight-core/pom.xml b/java/flight/flight-core/pom.xml
index b565572b383..1f1085e9f19 100644
--- a/java/flight/flight-core/pom.xml
+++ b/java/flight/flight-core/pom.xml
@@ -244,7 +244,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.6.1</version>
         <executions>
           <execution>
             <id>analyze</id>
diff --git a/java/tools/src/main/java/org/apache/arrow/tools/Integration.java b/java/tools/src/test/java/org/apache/arrow/tools/Integration.java
similarity index 100%
rename from java/tools/src/main/java/org/apache/arrow/tools/Integration.java
rename to java/tools/src/test/java/org/apache/arrow/tools/Integration.java

From 0dce49f984ff2609bc27e2de0191834f07abdf78 Mon Sep 17 00:00:00 2001
From: Vibhatha Abeykoon <vibhatha@gmail.com>
Date: Wed, 29 May 2024 14:03:27 +0530
Subject: [PATCH 2/2] fix: rebasing and updating

---
 java/pom.xml       | 4 +++-
 java/tools/pom.xml | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/pom.xml b/java/pom.xml
index 289810daba3..a0c98c67636 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -285,8 +285,10 @@
             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.
+
+            Additional Note: adding scope to test resolves that warning.
           -->
-          <version>3.1.2</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 5d9db75e525..2e9066316e0 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -57,10 +57,12 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>