From 27b1deb03dbf6697715a9f368512f73b7b4e59c8 Mon Sep 17 00:00:00 2001
From: Vlad Rozov <vrozov@apache.org>
Date: Tue, 24 Oct 2017 19:10:37 -0700
Subject: [PATCH] DRILL-5905: Exclude jdk-tools from project dependencies

---
 contrib/storage-hbase/pom.xml |  4 ++--
 pom.xml                       | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml
index b0dcac5eab1..46ca15037f0 100644
--- a/contrib/storage-hbase/pom.xml
+++ b/contrib/storage-hbase/pom.xml
@@ -39,7 +39,7 @@
       <version>3.20.0-GA</version>
       <scope>test</scope>
     </dependency>
-  
+
     <dependency>
       <groupId>org.apache.drill.exec</groupId>
       <artifactId>drill-java-exec</artifactId>
@@ -147,7 +147,7 @@
             <goals>
               <goal>enforce</goal>
             </goals>
-            <configuration combine.self="override">
+            <configuration>
               <rules>
                 <bannedDependencies>
                   <includes>
diff --git a/pom.xml b/pom.xml
index 2c0d16c7bad..e71ef32aed2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -360,6 +360,7 @@
                     <exclude>org.mortbay.jetty:servlet-api</exclude>
                     <exclude>org.mortbay.jetty:servlet-api-2.5</exclude>
                     <exclude>log4j:log4j</exclude>
+                    <exclude>jdk.tools:jdk.tools</exclude>
                   </excludes>
                 </bannedDependencies>
               </rules>
@@ -695,6 +696,17 @@
         <artifactId>freemarker</artifactId>
         <version>${freemarker.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-annotations</artifactId>
+        <version>${hadoop.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>jdk.tools</groupId>
+            <artifactId>jdk.tools</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-aws</artifactId>
@@ -727,6 +739,17 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-annotations</artifactId>
+        <version>${hbase.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>jdk.tools</groupId>
+            <artifactId>jdk.tools</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
       <dependency>
         <groupId>org.apache.hive</groupId>
         <artifactId>hive-exec</artifactId>
@@ -1596,6 +1619,10 @@
                 <artifactId>asm</artifactId>
                 <groupId>asm</groupId>
               </exclusion>
+              <exclusion>
+                <groupId>org.apache.hbase</groupId>
+                <artifactId>hbase-annotations</artifactId>
+              </exclusion>
             </exclusions>
           </dependency>
           <dependency>
@@ -2201,6 +2228,10 @@
                 <artifactId>asm</artifactId>
                 <groupId>asm</groupId>
               </exclusion>
+              <exclusion>
+                <groupId>org.apache.hbase</groupId>
+                <artifactId>hbase-annotations</artifactId>
+              </exclusion>
             </exclusions>
           </dependency>
           <dependency>
@@ -2212,6 +2243,10 @@
                 <artifactId>log4j</artifactId>
                 <groupId>log4j</groupId>
               </exclusion>
+              <exclusion>
+                <groupId>jdk.tools</groupId>
+                <artifactId>jdk.tools</artifactId>
+              </exclusion>
             </exclusions>
           </dependency>
           <dependency>