You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by jo...@apache.org on 2020/04/27 22:59:25 UTC

[impala] 03/03: Revert "IMPALA-9648: Exclude netty and netty-all from hadoop-hdfs mvn download"

This is an automated email from the ASF dual-hosted git repository.

joemcdonnell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git

commit c4ac9d2ee14e0bea855cbb26c962556a27983e52
Author: David Knupp <dk...@cloudera.com>
AuthorDate: Mon Apr 27 15:53:29 2020 -0700

    Revert "IMPALA-9648: Exclude netty and netty-all from hadoop-hdfs mvn download"
    
    This patch was causing CI builds to fail in certain environments where
    netty 3.10.5 was present.
    
    This reverts commit 0eef60cc943518edbeffd84504574daeb11c812d.
    
    Change-Id: Ic10ae25321988db2a92bb55b3063350000d9a6f9
    Reviewed-on: http://gerrit.cloudera.org:8080/15825
    Reviewed-by: David Knupp <dk...@cloudera.com>
    Tested-by: David Knupp <dk...@cloudera.com>
---
 fe/pom.xml | 38 --------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/fe/pom.xml b/fe/pom.xml
index 70d17d6..61e26a2 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -758,10 +758,6 @@ under the License.
                     <exclude>org.fusesource.leveldbjni:*</exclude>
                     <!-- IMPALA-9647 (re: CVE-2014-3577, CVE-2015-5262) -->
                     <exclude>org.apache.httpcomponents:fluent-hc</exclude>
-                    <!-- IMPALA-9648: Ensure that netty < v3.10.6 is not present. -->
-                    <exclude>io.netty:netty:[3.10.6,)</exclude>
-                    <!-- IMPALA-9648: Ensure that netty-all < v4.1.46 is not present. -->
-                    <exclude>io.netty:netty-all:[4.1.46,)</exclude>
                     <!-- Assert that we only use artifacts from only the specified
                          version of these components. -->
                     <exclude>org.apache.hadoop:*</exclude>
@@ -1384,40 +1380,6 @@ under the License.
         <artifactId>javax.el</artifactId>
         <version>3.0.1-b08</version>
       </dependency>
-
-      <!-- IMPALA-9648: Avoid pulling in netty -->
-      <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdfs</artifactId>
-        <exclusions>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>*</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-distcp</artifactId>
-        <exclusions>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>*</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-common</artifactId>
-        <exclusions>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>*</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <!-- end IMPALA-9648 -->
-
     </dependencies>
   </dependencyManagement>
 </project>