drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prog...@apache.org
Subject [2/5] drill git commit: DRILL-5905: Exclude jdk-tools from project dependencies
Date Mon, 30 Oct 2017 21:14:08 GMT
DRILL-5905: Exclude jdk-tools from project dependencies

closes #1009


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/fd58e294
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/fd58e294
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/fd58e294

Branch: refs/heads/master
Commit: fd58e2944b4d03538ed981359940ef486279b626
Parents: c8d01b3
Author: Vlad Rozov <vrozov@apache.org>
Authored: Tue Oct 24 19:10:37 2017 -0700
Committer: Paul Rogers <progers@maprtech.com>
Committed: Mon Oct 30 13:23:18 2017 -0700

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


http://git-wip-us.apache.org/repos/asf/drill/blob/fd58e294/contrib/storage-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml
index b0dcac5..46ca150 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>

http://git-wip-us.apache.org/repos/asf/drill/blob/fd58e294/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2d3a0ac..71dc99b 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>
@@ -697,6 +698,17 @@
       </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>
         <version>${hadoop.version}</version>
         <scope>test</scope>
@@ -728,6 +740,17 @@
         </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>
         <version>${hive.version}</version>
@@ -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>


Mime
View raw message