Repository: hadoop Updated Branches: refs/heads/branch-2 1c235a444 -> 59e0ea877
HDFS-7277. Remove explicit dependency on netty 3.2 in BKJournal. Contributed by Haohui Mai. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/59e0ea87 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/59e0ea87 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/59e0ea87 Branch: refs/heads/branch-2 Commit: 59e0ea8779f7867875700ab25049fa1240418d90 Parents: 1c235a4 Author: Haohui Mai <[email protected]> Authored: Wed Oct 22 14:45:35 2014 -0700 Committer: Haohui Mai <[email protected]> Committed: Wed Oct 22 17:32:30 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../hadoop-hdfs/src/contrib/bkjournal/pom.xml | 18 ------------------ 2 files changed, 2 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/59e0ea87/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 43361fd..149c6a1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -65,6 +65,8 @@ Release 2.7.0 - UNRELEASED HDFS-7226. Fix TestDNFencing.testQueueingWithAppend. (Yongjun Zhang via jing9) + HDFS-7277. Remove explicit dependency on netty 3.2 in BKJournal. (wheat9) + Release 2.6.0 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/59e0ea87/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml index 60388ac..8893960 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml @@ -36,26 +36,8 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <hadoop.common.build.dir>${basedir}/../../../../../hadoop-common-project/hadoop-common/target</hadoop.common.build.dir> </properties> - <dependencyManagement> - <dependencies> - <!-- This is a really old version of netty, that gets privatized - via shading and hence it is not managed via a parent pom --> - <dependency> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - <version>3.2.4.Final</version> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <dependency> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <scope>compile</scope>
