Pārlūkot izejas kodu

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

Anu Engineer 8 gadi atpakaļ
vecāks
revīzija
36b20e9fbf

+ 0 - 11
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>

+ 0 - 5
hadoop-hdfs-project/hadoop-hdfs/pom.xml

@@ -173,11 +173,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
       <artifactId>netty</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-all</artifactId>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>xerces</groupId>
       <artifactId>xercesImpl</artifactId>