Repository: hadoop Updated Branches: refs/heads/HDFS-7240 6564e10d9 -> 896414e30
HDFS-12341. Ozone: maven dist compilation fails with "Duplicate classes found" error. Contributed by Mukul Kumar Singh. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/896414e3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/896414e3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/896414e3 Branch: refs/heads/HDFS-7240 Commit: 896414e305ee079c7a4ab3e08d51febd43003338 Parents: 6564e10 Author: Anu Engineer <[email protected]> Authored: Thu Aug 24 21:03:39 2017 -0700 Committer: Anu Engineer <[email protected]> Committed: Thu Aug 24 21:03:39 2017 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs-client/pom.xml | 21 ++++++++------------- hadoop-hdfs-project/hadoop-hdfs/pom.xml | 5 ----- 2 files changed, 8 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/896414e3/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 71ed98a..fa79d14 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml @@ -64,11 +64,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <scope>test</scope> </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.mock-server</groupId> <artifactId>mockserver-netty</artifactId> <scope>test</scope> @@ -105,14 +100,14 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <scope>test</scope> <type>test-jar</type> </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> http://git-wip-us.apache.org/repos/asf/hadoop/blob/896414e3/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 bebb8d1..105c8bd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -169,11 +169,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>org.apache.htrace</groupId> <artifactId>htrace-core4</artifactId> </dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
