Skip to content

Commit

Permalink
Merge pull request #1 from lidavidm/flight-sql-jdbc
Browse files Browse the repository at this point in the history
[Java] Fix build
  • Loading branch information
jduo authored Aug 16, 2022
2 parents cc746c7 + 892b2b1 commit f64cea9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 30 deletions.
3 changes: 3 additions & 0 deletions java/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ install_manifest.txt
target/
?/
!/c/

# Generated properties file
flight/flight-jdbc-driver/src/main/resources/properties/flight.properties
2 changes: 2 additions & 0 deletions java/dev/checkstyle/suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
35 changes: 5 additions & 30 deletions java/flight/flight-jdbc-driver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>

Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@
<exclude>**/client/build/**</exclude>
<exclude>**/*.tbl</exclude>
<exclude>**/*.iml</exclude>
<exclude>**/flight.properties</exclude>
</excludes>
</configuration>
</plugin>
Expand Down

0 comments on commit f64cea9

Please sign in to comment.