You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2017/09/25 06:13:14 UTC
hadoop git commit: HDFS-11563. Ozone: enforce DependencyConvergence
uniqueVersions.
Repository: hadoop
Updated Branches:
refs/heads/HDFS-7240 97ff55eab -> cf1001e45
HDFS-11563. Ozone: enforce DependencyConvergence uniqueVersions.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cf1001e4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cf1001e4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cf1001e4
Branch: refs/heads/HDFS-7240
Commit: cf1001e450feb318ea2b439cdfb022f6d54ab15e
Parents: 97ff55e
Author: Tsz-Wo Nicholas Sze <sz...@hortonworks.com>
Authored: Mon Sep 25 14:12:55 2017 +0800
Committer: Tsz-Wo Nicholas Sze <sz...@hortonworks.com>
Committed: Mon Sep 25 14:12:55 2017 +0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs-client/pom.xml | 14 +-------------
hadoop-project/pom.xml | 4 +---
2 files changed, 2 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cf1001e4/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
index 18fe57c..1944b0e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
+++ b/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>
@@ -128,14 +124,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
</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>
</dependency>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cf1001e4/hadoop-project/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 9c5ee56..5cc51f1 100755
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -1615,9 +1615,7 @@
<configuration>
<rules>
<DependencyConvergence>
- <!--
- <uniqueversions>true</uniqueversions>
- -->
+ <uniqueVersions>true</uniqueVersions>
</DependencyConvergence>
<bannedDependencies>
<excludes>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org