From 82ceeb6bede0f93d412ad53748cb7cd01ddbed2b 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 |  2 +-
 java/flight/pom.xml             | 28 ++++++++++++++++++----------
 java/pom.xml                    | 32 --------------------------------
 3 files changed, 19 insertions(+), 43 deletions(-)

diff --git a/java/flight/flight-grpc/pom.xml b/java/flight/flight-grpc/pom.xml
index 15ede7e6b858f..f41da3f9b5f4c 100644
--- a/java/flight/flight-grpc/pom.xml
+++ b/java/flight/flight-grpc/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <artifactId>arrow-flight</artifactId>
     <groupId>org.apache.arrow</groupId>
-    <version>8.0.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/java/flight/pom.xml b/java/flight/pom.xml
index ba5a72acfb1c0..4a0422acc14fa 100644
--- a/java/flight/pom.xml
+++ b/java/flight/pom.xml
@@ -26,7 +26,7 @@
 
     <properties>
         <dep.grpc.version>1.30.2</dep.grpc.version>
-        <dep.protobuf.version>3.7.1</dep.protobuf.version>
+        <dep.protobuf.version>3.17.3</dep.protobuf.version>
     </properties>
 
     <modules>
@@ -38,14 +38,22 @@
     </modules>
 
     <build>
-        <extensions>
-            <!-- provides os.detected.classifier (i.e. linux-x86_64, osx-x86_64) property -->
-            <extension>
-                <groupId>kr.motd.maven</groupId>
-                <artifactId>os-maven-plugin</artifactId>
-                <version>1.5.0.Final</version>
-            </extension>
-        </extensions>
+        <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 418f98d793b8d..495cdab0576ff 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -506,38 +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>
-          <executions>
-            <execution>
-              <id>proto-compile</id>
-              <phase>generate-sources</phase>
-              <configuration>
-                <protoSourceRoot>${basedir}/../format/</protoSourceRoot>
-              </configuration>
-              <goals>
-                <goal>compile</goal>
-                <goal>compile-custom</goal>
-              </goals>
-            </execution>
-            <execution>
-              <id>proto-test-compile</id>
-              <phase>generate-test-sources</phase>
-              <goals>
-                <goal>test-compile</goal>
-                <goal>test-compile-custom</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>