瀏覽代碼

HDFS-11563. Ozone: enforce DependencyConvergence uniqueVersions.

Tsz-Wo Nicholas Sze 7 年之前
父節點
當前提交
cf1001e450
共有 2 個文件被更改,包括 2 次插入16 次删除
  1. 1 13
      hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
  2. 1 3
      hadoop-project/pom.xml

+ 1 - 13
hadoop-hdfs-project/hadoop-hdfs-client/pom.xml

@@ -114,11 +114,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
     </dependency>
 
     <dependency>
-      <groupId>org.apache.ratis</groupId>
-      <artifactId>ratis-proto-shaded</artifactId>
-    </dependency>
-    <dependency>
-      <artifactId>ratis-common</artifactId>
+      <artifactId>ratis-server</artifactId>
       <groupId>org.apache.ratis</groupId>
       <exclusions>
         <exclusion>
@@ -127,14 +123,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <artifactId>ratis-client</artifactId>
-      <groupId>org.apache.ratis</groupId>
-    </dependency>
-    <dependency>
-      <artifactId>ratis-server</artifactId>
-      <groupId>org.apache.ratis</groupId>
-    </dependency>
     <dependency>
       <artifactId>ratis-netty</artifactId>
       <groupId>org.apache.ratis</groupId>

+ 1 - 3
hadoop-project/pom.xml

@@ -1615,9 +1615,7 @@
             <configuration>
               <rules>
                 <DependencyConvergence>
-                  <!--
-                  <uniqueversions>true</uniqueversions>
-                  -->
+                  <uniqueVersions>true</uniqueVersions>
                 </DependencyConvergence>
                 <bannedDependencies>
                   <excludes>