From cb5294e8bef1ab9377d2a1f34221a77724f39958 Mon Sep 17 00:00:00 2001
From: Rafael Telles <rafael@telles.dev>
Date: Thu, 2 Sep 2021 15:06:33 -0300
Subject: [PATCH] Flight SQL Ratification Based On Community Feedback #8 (#113)

* Change scope of arrow-memory-netty to test for flight-sql

* Remove unused dependency arrow-memory-netty

* Update common-pool2 and common-dbcp2 dependencies

* Remove 'executions' from parent pom.xml for plugin protobuf-maven-plugin

* Adjust protobuf-maven-plugin settings on pom.xml files

* Move dep.protobuf.version and dep.grpc.version to top pom.xml

* Remove <url> from arrow-flight's pom.xml
---
 java/flight/flight-grpc/pom.xml | 60 ++++++++++++++-------------------
 java/flight/flight-sql/pom.xml  | 15 ++-------
 java/flight/pom.xml             | 18 ----------
 java/pom.xml                    | 31 ++++++-----------
 4 files changed, 37 insertions(+), 87 deletions(-)

diff --git a/java/flight/flight-grpc/pom.xml b/java/flight/flight-grpc/pom.xml
index b569628336138..e2ecac1de485b 100644
--- a/java/flight/flight-grpc/pom.xml
+++ b/java/flight/flight-grpc/pom.xml
@@ -24,8 +24,6 @@
   <packaging>jar</packaging>
 
   <properties>
-    <dep.grpc.version>1.41.0</dep.grpc.version>
-    <dep.protobuf.version>3.7.1</dep.protobuf.version>
     <forkCount>1</forkCount>
   </properties>
 
@@ -93,39 +91,31 @@
   </dependencies>
 
   <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>
-      <plugins>
-        <plugin>
-          <groupId>org.xolstice.maven.plugins</groupId>
-          <artifactId>protobuf-maven-plugin</artifactId>
-          <configuration>
-            <protocArtifact>com.google.protobuf:protoc:${dep.protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
-            <clearOutputDirectory>false</clearOutputDirectory>
-            <pluginId>grpc-java</pluginId>
-            <pluginArtifact>io.grpc:protoc-gen-grpc-java:${dep.grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
-          </configuration>
-          <executions>
-            <execution>
-              <id>test</id>
-              <configuration>
-                <protoSourceRoot>${basedir}/src/test/protobuf</protoSourceRoot>
-                <outputDirectory>${project.build.directory}/generated-test-sources//protobuf</outputDirectory>
-              </configuration>
-              <goals>
-                <goal>compile</goal>
-                <goal>compile-custom</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
+    <plugins>
+      <plugin>
+        <groupId>org.xolstice.maven.plugins</groupId>
+        <artifactId>protobuf-maven-plugin</artifactId>
+        <configuration>
+          <protocArtifact>com.google.protobuf:protoc:${dep.protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
+          <clearOutputDirectory>false</clearOutputDirectory>
+          <pluginId>grpc-java</pluginId>
+          <pluginArtifact>io.grpc:protoc-gen-grpc-java:${dep.grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
+        </configuration>
+        <executions>
+          <execution>
+            <id>test</id>
+            <configuration>
+              <protoSourceRoot>${basedir}/src/test/protobuf</protoSourceRoot>
+              <outputDirectory>${project.build.directory}/generated-test-sources//protobuf</outputDirectory>
+            </configuration>
+            <goals>
+              <goal>compile</goal>
+              <goal>compile-custom</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
   </build>
 
 </project>
diff --git a/java/flight/flight-sql/pom.xml b/java/flight/flight-sql/pom.xml
index 387598fdf5948..f1ace2ee0eada 100644
--- a/java/flight/flight-sql/pom.xml
+++ b/java/flight/flight-sql/pom.xml
@@ -57,12 +57,6 @@
       <artifactId>arrow-format</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.arrow</groupId>
-      <artifactId>arrow-memory-netty</artifactId>
-      <version>${project.version}</version>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.arrow</groupId>
       <artifactId>arrow-jdbc</artifactId>
@@ -111,7 +105,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-dbcp2</artifactId>
-      <version>2.7.0</version>
+      <version>2.9.0</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -123,7 +117,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-pool2</artifactId>
-      <version>2.8.1</version>
+      <version>2.11.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -137,11 +131,6 @@
       <plugin>
         <groupId>org.xolstice.maven.plugins</groupId>
         <artifactId>protobuf-maven-plugin</artifactId>
-        <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>
diff --git a/java/flight/pom.xml b/java/flight/pom.xml
index 2eec2a31e5971..9c3e6990c4215 100644
--- a/java/flight/pom.xml
+++ b/java/flight/pom.xml
@@ -21,30 +21,12 @@
 
     <name>Arrow Flight</name>
     <artifactId>arrow-flight</artifactId>
-    <url>https://arrow.apache.org/blog/2019/10/13/introducing-arrow-flight/</url>
 
     <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>
-        <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>
-    </build>
-
 </project>
diff --git a/java/pom.xml b/java/pom.xml
index 6bf04ac1a168a..2a70ddd714389 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -38,6 +38,8 @@
     <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>
@@ -84,6 +86,14 @@
   </issueManagement>
 
   <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>
 
     <plugins>
       <plugin>
@@ -508,27 +518,6 @@
             <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>