From 3cb873ec066f2cd0f6a7576428fe27b055019179 Mon Sep 17 00:00:00 2001
From: Laurent Goujon <laurent@dremio.com>
Date: Thu, 24 Jan 2019 14:30:19 +0100
Subject: [PATCH] ARROW-4298: [Java] Add javax.annotation-api dependency for
 JDK >= 9

JDK9 and onwards removed/renamed @Generated annotation used by code
generation tool like grpc, causing build failures.

Adding javax.annotation-api dependency as a substitute and exclude it
from the dependency check as only used at compilation time but not
preserved at runtime.

Author: Laurent Goujon <laurent@dremio.com>

Closes #3459 from laurentgo/laurentgo/ARROW-4298 and squashes the following commits:

a184b822 <Laurent Goujon> ARROW-4298: Add javax.annotation-api dependency
---
 java/flight/pom.xml | 6 +++++-
 java/pom.xml        | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/java/flight/pom.xml b/java/flight/pom.xml
index fece6122e2932..67733f382946e 100644
--- a/java/flight/pom.xml
+++ b/java/flight/pom.xml
@@ -103,6 +103,10 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+     </dependency>
   </dependencies>
   <build>
     <extensions>
@@ -214,7 +218,7 @@
               <goal>analyze-only</goal>
             </goals>
             <configuration>
-              <ignoredDependencies combine.self="append">
+              <ignoredDependencies combine.children="append">
                 <ignoredDependency>io.netty:netty-tcnative-boringssl-static:*</ignoredDependency>
               </ignoredDependencies>
             </configuration>
diff --git a/java/pom.xml b/java/pom.xml
index 95b8bd596b8f2..9093bfa46d7db 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -334,6 +334,10 @@
             <configuration>
               <ignoreNonCompile>true</ignoreNonCompile>
               <failOnWarning>true</failOnWarning>
+              <ignoredDependencies>
+                <!-- source annotations (not kept in compiled code) -->
+                <ignoredDependency>javax.annotation:javax.annotation-api:*</ignoredDependency>
+              </ignoredDependencies>
             </configuration>
           </execution>
         </executions>
@@ -530,6 +534,11 @@
         <artifactId>slf4j-api</artifactId>
         <version>${dep.slf4j.version}</version>
       </dependency>
+      <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+        <version>1.3.2</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>