From 892b2b125bf727bd3568a09dc047b9dbcda146a2 Mon Sep 17 00:00:00 2001
From: David Li <li.davidm96@gmail.com>
Date: Fri, 5 Aug 2022 09:13:27 -0400
Subject: [PATCH] [Java] Fix build

---
 java/.gitignore                        |  3 +++
 java/dev/checkstyle/suppressions.xml   |  2 ++
 java/flight/flight-jdbc-driver/pom.xml | 35 ++++----------------------
 java/pom.xml                           |  1 +
 4 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/java/.gitignore b/java/.gitignore
index 376e06946d7de..f2b9d4a018d97 100644
--- a/java/.gitignore
+++ b/java/.gitignore
@@ -23,3 +23,6 @@ install_manifest.txt
 target/
 ?/
 !/c/
+
+# Generated properties file
+flight/flight-jdbc-driver/src/main/resources/properties/flight.properties
diff --git a/java/dev/checkstyle/suppressions.xml b/java/dev/checkstyle/suppressions.xml
index c3f61f46c92be..585985bf32dbc 100644
--- a/java/dev/checkstyle/suppressions.xml
+++ b/java/dev/checkstyle/suppressions.xml
@@ -39,4 +39,6 @@
   <!-- Suppress certain checks requiring many code changes, that add little benefit -->
   <suppress checks="NoFinalizer|OverloadMethodsDeclarationOrder|VariableDeclarationUsageDistance" files=".*" />
 
+  <!-- No license header in generated file -->
+  <suppress checks="header" files="flight.properties"/>
 </suppressions>
diff --git a/java/flight/flight-jdbc-driver/pom.xml b/java/flight/flight-jdbc-driver/pom.xml
index 7bd98ca0233bd..b127998cc8b74 100644
--- a/java/flight/flight-jdbc-driver/pom.xml
+++ b/java/flight/flight-jdbc-driver/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <artifactId>arrow-flight</artifactId>
         <groupId>org.apache.arrow</groupId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>9.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -28,10 +28,10 @@
     <url>http://maven.apache.org</url>
 
     <properties>
-        <org.apache.arrow.flight.name>${pom.parent.groupId}:${pom.parent.artifactId}</org.apache.arrow.flight.name>
-        <org.apache.arrow.flight.version>${pom.parent.version}</org.apache.arrow.flight.version>
-        <org.apache.arrow.flight.jdbc-driver.name>${pom.name}</org.apache.arrow.flight.jdbc-driver.name>
-        <org.apache.arrow.flight.jdbc-driver.version>${pom.version}</org.apache.arrow.flight.jdbc-driver.version>
+        <org.apache.arrow.flight.name>${project.parent.groupId}:${project.parent.artifactId}</org.apache.arrow.flight.name>
+        <org.apache.arrow.flight.version>${project.parent.version}</org.apache.arrow.flight.version>
+        <org.apache.arrow.flight.jdbc-driver.name>${project.name}</org.apache.arrow.flight.jdbc-driver.name>
+        <org.apache.arrow.flight.jdbc-driver.version>${project.version}</org.apache.arrow.flight.jdbc-driver.version>
         <jacoco.ut.execution.data.file>${project.build.directory}/coverage-reports/jacoco-ut.html</jacoco.ut.execution.data.file>
     </properties>
 
@@ -93,7 +93,6 @@
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
-            <version>${dep.protobuf.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
@@ -165,30 +164,6 @@
             </resource>
         </resources>
         <plugins>
-            <plugin>
-                <groupId>org.apache.rat</groupId>
-                <artifactId>apache-rat-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/flight.properties</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <configuration>
-                    <resourceExcludes>**/flight.properties</resourceExcludes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>8</source>
-                    <target>8</target>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
diff --git a/java/pom.xml b/java/pom.xml
index 38ab4f9810f6b..10e0bddeec994 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -150,6 +150,7 @@
             <exclude>**/client/build/**</exclude>
             <exclude>**/*.tbl</exclude>
             <exclude>**/*.iml</exclude>
+            <exclude>**/flight.properties</exclude>
           </excludes>
         </configuration>
       </plugin>