Repository: hadoop
Updated Branches:
  refs/heads/trunk 3de47ab5e -> 09653ea09


HADOOP-14634. Remove jline from main Hadoop pom.xml.
Contributed by Ray Chiang.


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

Branch: refs/heads/trunk
Commit: 09653ea098a17fddcf111b0da289085915c351d1
Parents: 3de47ab
Author: Steve Loughran <ste...@apache.org>
Authored: Mon Jul 10 11:53:13 2017 +0100
Committer: Steve Loughran <ste...@apache.org>
Committed: Mon Jul 10 11:53:13 2017 +0100

----------------------------------------------------------------------
 hadoop-client-modules/hadoop-client/pom.xml                    | 4 ----
 hadoop-common-project/hadoop-common/pom.xml                    | 4 ----
 hadoop-project/pom.xml                                         | 4 ++++
 .../hadoop-yarn-server/hadoop-yarn-server-common/pom.xml       | 6 ------
 4 files changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/09653ea0/hadoop-client-modules/hadoop-client/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-client-modules/hadoop-client/pom.xml 
b/hadoop-client-modules/hadoop-client/pom.xml
index 629f9fa..a32a2a3 100644
--- a/hadoop-client-modules/hadoop-client/pom.xml
+++ b/hadoop-client-modules/hadoop-client/pom.xml
@@ -163,10 +163,6 @@
           <artifactId>avro</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>jline</groupId>
-          <artifactId>jline</artifactId>
-        </exclusion>
-        <exclusion>
           <groupId>io.netty</groupId>
           <artifactId>netty</artifactId>
         </exclusion>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/09653ea0/hadoop-common-project/hadoop-common/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/pom.xml 
b/hadoop-common-project/hadoop-common/pom.xml
index f74290d..3e73bce 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -263,10 +263,6 @@
       <artifactId>zookeeper</artifactId>
       <exclusions>
         <exclusion>
-          <groupId>jline</groupId>
-          <artifactId>jline</artifactId>
-        </exclusion>
-        <exclusion>
           <groupId>org.jboss.netty</groupId>
           <artifactId>netty</artifactId>
         </exclusion>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/09653ea0/hadoop-project/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index a84070b..3969474 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -1024,6 +1024,10 @@
             <groupId>org.jboss.netty</groupId>
             <artifactId>netty</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>jline</groupId>
+            <artifactId>jline</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/09653ea0/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 ea0f32e..1ee7110 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
@@ -90,12 +90,6 @@
     <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>


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

Reply via email to