hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aengin...@apache.org
Subject hadoop git commit: HDFS-11496. Ozone: Merge with trunk needed a ignore duplicate entry in pom file due to shading. Contributed by Tsz Wo Nicholas Sze.
Date Tue, 21 Mar 2017 22:27:36 GMT
Repository: hadoop
Updated Branches:
  refs/heads/HDFS-7240 a9f92c466 -> 36b20e9fb


HDFS-11496. Ozone: Merge with trunk needed a ignore duplicate entry in pom file due to shading.
Contributed by Tsz Wo Nicholas Sze.


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

Branch: refs/heads/HDFS-7240
Commit: 36b20e9fbf98412b3625a3f3b31b8ea0ca3b72bd
Parents: a9f92c4
Author: Anu Engineer <aengineer@apache.org>
Authored: Tue Mar 21 15:23:56 2017 -0700
Committer: Anu Engineer <aengineer@apache.org>
Committed: Tue Mar 21 15:23:56 2017 -0700

----------------------------------------------------------------------
 .../hadoop-client-check-test-invariants/pom.xml          | 11 -----------
 hadoop-hdfs-project/hadoop-hdfs/pom.xml                  |  5 -----
 2 files changed, 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/36b20e9f/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml b/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
index 4b19a21f..a2ba0bf 100644
--- a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
+++ b/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
@@ -103,17 +103,6 @@
                         <ignoreClass>*</ignoreClass>
                       </ignoreClasses>
                     </dependency>
-                    <dependency>
-                      <!--Duplicate classes found:-->
-                      <!--Found in:-->
-                      <!--org.apache.hadoop:hadoop-client-runtime:jar:3.0.0-alpha3-SNAPSHOT:compile-->
-                      <!--org.apache.hadoop:hadoop-client-minicluster:jar:3.0.0-alpha3-SNAPSHOT:compile-->
-                      <ignoreClasses>
-                        <groupId>io.netty</groupId>
-                        <artifactId>netty</artifactId>
-                        <ignoreClass>*</ignoreClass>
-                      </ignoreClasses>
-                    </dependency>
                   </dependencies>
                 </banDuplicateClasses>
               </rules>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/36b20e9f/hadoop-hdfs-project/hadoop-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index 2588f89..ceee0b4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -174,11 +174,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-all</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>xerces</groupId>
       <artifactId>xercesImpl</artifactId>
       <scope>compile</scope>


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message