From 2fffd9cbd28921aacc4f84e4b9f5cf62e4796f09 Mon Sep 17 00:00:00 2001
From: Rafael Telles <rafael@telles.dev>
Date: Fri, 3 Sep 2021 14:56:27 -0300
Subject: [PATCH] Fix maven build from different directories (#114)

---
 java/flight/flight-grpc/pom.xml |  4 ++--
 java/flight/pom.xml             | 25 +++++++++++++++++++++++++
 java/pom.xml                    | 13 -------------
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/java/flight/flight-grpc/pom.xml b/java/flight/flight-grpc/pom.xml
index e2ecac1de485b..5e5f1284f1fee 100644
--- a/java/flight/flight-grpc/pom.xml
+++ b/java/flight/flight-grpc/pom.xml
@@ -11,10 +11,10 @@
   language governing permissions and limitations under the License. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>arrow-java-root</artifactId>
+    <artifactId>arrow-flight</artifactId>
     <groupId>org.apache.arrow</groupId>
     <version>6.0.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/java/flight/pom.xml b/java/flight/pom.xml
index 9c3e6990c4215..38e50bc10ae93 100644
--- a/java/flight/pom.xml
+++ b/java/flight/pom.xml
@@ -24,9 +24,34 @@
 
     <packaging>pom</packaging>
 
+    <properties>
+        <dep.grpc.version>1.30.2</dep.grpc.version>
+        <dep.protobuf.version>3.17.3</dep.protobuf.version>
+    </properties>
+
     <modules>
         <module>flight-core</module>
         <module>flight-grpc</module>
         <module>flight-sql</module>
     </modules>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.xolstice.maven.plugins</groupId>
+                    <artifactId>protobuf-maven-plugin</artifactId>
+                    <version>0.6.1</version>
+                    <configuration>
+                        <protocArtifact>
+                            com.google.protobuf:protoc:${dep.protobuf.version}:exe:${os.detected.classifier}
+                        </protocArtifact>
+                        <pluginId>grpc-java</pluginId>
+                        <pluginArtifact>io.grpc:protoc-gen-grpc-java:${dep.grpc.version}:exe:${os.detected.classifier}
+                        </pluginArtifact>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 </project>
diff --git a/java/pom.xml b/java/pom.xml
index 2a70ddd714389..5d2899253b510 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -38,8 +38,6 @@
     <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>
-    <dep.grpc.version>1.30.2</dep.grpc.version>
-    <dep.protobuf.version>3.17.3</dep.protobuf.version>
     <arrow.vector.classifier />
     <forkCount>2</forkCount>
     <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
@@ -508,17 +506,6 @@
             </lifecycleMappingMetadata>
           </configuration>
         </plugin>
-
-        <plugin>
-          <groupId>org.xolstice.maven.plugins</groupId>
-          <artifactId>protobuf-maven-plugin</artifactId>
-          <version>0.6.1</version>
-          <configuration>
-            <protocArtifact>com.google.protobuf:protoc:${dep.protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
-            <pluginId>grpc-java</pluginId>
-            <pluginArtifact>io.grpc:protoc-gen-grpc-java:${dep.grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
-          </configuration>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>