hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjs...@apache.org
Subject hadoop git commit: YARN-2815. Excluded transitive dependency of JLine in hadoop-yarn-server-common. Contributed by Ferdinand Xu.
Date Sat, 17 Jan 2015 00:38:53 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 8e765b851 -> dcd6eed13


YARN-2815. Excluded transitive dependency of JLine in hadoop-yarn-server-common. Contributed
by Ferdinand Xu.

(cherry picked from commit 43302f6f44f97d67069eefdda986b6da2933393e)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dcd6eed1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dcd6eed1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dcd6eed1

Branch: refs/heads/branch-2
Commit: dcd6eed13a12a75cd73397224d99e61d2f413e5d
Parents: 8e765b8
Author: Zhijie Shen <zjshen@apache.org>
Authored: Fri Jan 16 16:31:10 2015 -0800
Committer: Zhijie Shen <zjshen@apache.org>
Committed: Fri Jan 16 16:38:36 2015 -0800

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                                | 3 +++
 .../hadoop-yarn-server/hadoop-yarn-server-common/pom.xml       | 6 ++++++
 2 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/dcd6eed1/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index d4b7a7d..f9d4f54 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -343,6 +343,9 @@ Release 2.7.0 - UNRELEASED
     YARN-3064. TestRMRestart/TestContainerResourceUsage/TestNodeManagerResync 
     failure with allocation timeout. (Jian He via junping_du)
 
+    YARN-2815. Excluded transitive dependency of JLine in hadoop-yarn-server-common.
+    (Ferdinand Xu via zjshen)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/dcd6eed1/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
index 4333dc8..a71bc94 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
@@ -84,6 +84,12 @@
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>jline</groupId>
+          <artifactId>jline</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.fusesource.leveldbjni</groupId>


Mime
View raw message