From c037543624ee35dcc8091d8e57abb95858ff4cf7 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dhyun@apple.com>
Date: Fri, 16 Aug 2019 20:49:03 -0700
Subject: [PATCH 1/2] [SPARK-28765][BUILD] Add explict exclusions to avoid
 JDK11 dependency generation issues

---
 pom.xml                                   | 14 ++++++++++++++
 resource-managers/kubernetes/core/pom.xml |  5 +++++
 2 files changed, 19 insertions(+)

diff --git a/pom.xml b/pom.xml
index 2f028284c08c..0cc9d20ada9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -730,11 +730,25 @@
         <groupId>org.glassfish.jersey.core</groupId>
         <artifactId>jersey-server</artifactId>
         <version>${jersey.version}</version>
+        <!-- SPARK-28765 jersey-server doesn't have the following dependency -->
+        <exclusions>
+          <exclusion>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.glassfish.jersey.core</groupId>
         <artifactId>jersey-common</artifactId>
         <version>${jersey.version}</version>
+        <!-- SPARK-28765 jersey-common doesn't have the following dependency -->
+        <exclusions>
+          <exclusion>
+            <groupId>com.sun.activation</groupId>
+            <artifactId>jakarta.activation</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.glassfish.jersey.core</groupId>
diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml
index 23106cb7ec68..2c101b879f99 100644
--- a/resource-managers/kubernetes/core/pom.xml
+++ b/resource-managers/kubernetes/core/pom.xml
@@ -66,6 +66,11 @@
           <groupId>com.fasterxml.jackson.dataformat</groupId>
           <artifactId>jackson-dataformat-yaml</artifactId>
         </exclusion>
+        <!-- SPARK-28765 kubernetes-client doesn't have the following dependency -->
+        <exclusion>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 

From 7f24d262ea6f1384311d7feb420307ce96938577 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dhyun@apple.com>
Date: Sat, 17 Aug 2019 04:25:19 -0700
Subject: [PATCH 2/2] Update comments

---
 pom.xml                                   | 4 ++--
 resource-managers/kubernetes/core/pom.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0cc9d20ada9d..140d19e62672 100644
--- a/pom.xml
+++ b/pom.xml
@@ -730,7 +730,7 @@
         <groupId>org.glassfish.jersey.core</groupId>
         <artifactId>jersey-server</artifactId>
         <version>${jersey.version}</version>
-        <!-- SPARK-28765 jersey-server doesn't have the following dependency -->
+        <!-- SPARK-28765 Unused JDK11-specific dependency -->
         <exclusions>
           <exclusion>
             <groupId>jakarta.xml.bind</groupId>
@@ -742,7 +742,7 @@
         <groupId>org.glassfish.jersey.core</groupId>
         <artifactId>jersey-common</artifactId>
         <version>${jersey.version}</version>
-        <!-- SPARK-28765 jersey-common doesn't have the following dependency -->
+        <!-- SPARK-28765 Unused JDK11-specific dependency -->
         <exclusions>
           <exclusion>
             <groupId>com.sun.activation</groupId>
diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml
index 2c101b879f99..b350b050118f 100644
--- a/resource-managers/kubernetes/core/pom.xml
+++ b/resource-managers/kubernetes/core/pom.xml
@@ -66,7 +66,7 @@
           <groupId>com.fasterxml.jackson.dataformat</groupId>
           <artifactId>jackson-dataformat-yaml</artifactId>
         </exclusion>
-        <!-- SPARK-28765 kubernetes-client doesn't have the following dependency -->
+        <!-- SPARK-28765 Unused JDK11-specific dependency -->
         <exclusion>
           <groupId>javax.annotation</groupId>
           <artifactId>javax.annotation-api</artifactId>