You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ad...@apache.org on 2016/06/17 14:43:34 UTC

drill git commit: DRILL-4727: Exclude netty from HBase Client's transitive dependencies

Repository: drill
Updated Branches:
  refs/heads/master 2e2b54af5 -> 7c7e9d171


DRILL-4727: Exclude netty from HBase Client's transitive dependencies

Excluded `netty-all` from the list of transitive dependencies pulled by `hbase-client`

Closes #525.


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

Branch: refs/heads/master
Commit: 7c7e9d1713300ed358285eaff6c44d6376b00c21
Parents: 2e2b54a
Author: Aditya Kishore <ad...@apache.org>
Authored: Thu Jun 16 13:39:21 2016 -0700
Committer: Aditya Kishore <ad...@apache.org>
Committed: Thu Jun 16 13:59:52 2016 -0700

----------------------------------------------------------------------
 pom.xml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/7c7e9d17/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4e15aea..8e228f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
       <snapshots>
         <enabled>false</enabled>
       </snapshots>
-    </repository>    
+    </repository>
 
     <repository>
       <id>mapr-drill-thirdparty</id>
@@ -574,8 +574,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <!-- Mockito needs to be on the class path after JUnit (or Hamcrest) as 
-           long as Mockito _contains_ older Hamcrest classes.  See DRILL-2130. --> 
+      <!-- Mockito needs to be on the class path after JUnit (or Hamcrest) as
+           long as Mockito _contains_ older Hamcrest classes.  See DRILL-2130. -->
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
       <version>1.9.5</version>
@@ -1041,7 +1041,7 @@
               <exclusion>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-all</artifactId>
-              </exclusion>              
+              </exclusion>
               <exclusion>
                 <groupId>javax.servlet</groupId>
                 <artifactId>servlet-api</artifactId>
@@ -1130,6 +1130,10 @@
             <version>1.1.3</version>
             <exclusions>
               <exclusion>
+                <artifactId>netty-all</artifactId>
+                <groupId>io.netty</groupId>
+              </exclusion>
+              <exclusion>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>servlet-api-2.5</artifactId>
               </exclusion>
@@ -1500,7 +1504,7 @@
               <exclusion>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-all</artifactId>
-              </exclusion>              
+              </exclusion>
               <exclusion>
                 <artifactId>commons-logging</artifactId>
                 <groupId>commons-logging</groupId>
@@ -1720,6 +1724,10 @@
             <version>${hbase.version}</version>
             <exclusions>
               <exclusion>
+                <artifactId>netty-all</artifactId>
+                <groupId>io.netty</groupId>
+              </exclusion>
+              <exclusion>
                 <groupId>javax.servlet</groupId>
                 <artifactId>servlet-api</artifactId>
               </exclusion>