From 22cbcd16cb59b897e68ebf305a64633572f44103 Mon Sep 17 00:00:00 2001 From: Haohui Mai Date: Wed, 18 Jun 2014 20:37:25 +0000 Subject: [PATCH] HADOOP-10717. Revert r1603571. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603620 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-client/pom.xml | 4 ---- hadoop-common-project/hadoop-auth/pom.xml | 5 ----- hadoop-common-project/hadoop-common/CHANGES.txt | 2 -- hadoop-common-project/hadoop-common/pom.xml | 5 ----- hadoop-common-project/hadoop-kms/pom.xml | 5 ----- hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 4 ---- hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml | 5 ----- hadoop-hdfs-project/hadoop-hdfs/pom.xml | 5 ----- hadoop-project/pom.xml | 5 ----- hadoop-tools/hadoop-sls/pom.xml | 5 ----- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml | 4 ---- .../hadoop-yarn-server-nodemanager/pom.xml | 4 ---- .../hadoop-yarn-server-resourcemanager/pom.xml | 4 ---- 13 files changed, 57 deletions(-) diff --git a/hadoop-client/pom.xml b/hadoop-client/pom.xml index 2b71361880..2b66790f62 100644 --- a/hadoop-client/pom.xml +++ b/hadoop-client/pom.xml @@ -59,10 +59,6 @@ org.mortbay.jetty jetty-util - - org.mortbay.jetty - jsp-2.1-jetty - org.mortbay.jetty servlet-api-2.5 diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml index 30068bf0a0..8eeafa574a 100644 --- a/hadoop-common-project/hadoop-auth/pom.xml +++ b/hadoop-common-project/hadoop-auth/pom.xml @@ -57,11 +57,6 @@ jetty-util test - - org.mortbay.jetty - jsp-2.1-jetty - test - org.mortbay.jetty jetty diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 6747a199dd..ec7753cd6a 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -339,8 +339,6 @@ Trunk (Unreleased) HADOOP-10611. KMS, keyVersion name should not be assumed to be keyName@versionNumber. (tucu) - HADOOP-10717. Missing JSP support in Jetty (Dapeng Sun via stevel) - OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 9a21c50450..ce14b21c38 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -103,11 +103,6 @@ jetty-util compile - - org.mortbay.jetty - jsp-2.1-jetty - compile - com.sun.jersey jersey-core diff --git a/hadoop-common-project/hadoop-kms/pom.xml b/hadoop-common-project/hadoop-kms/pom.xml index 389e13660d..b65e67a5bb 100644 --- a/hadoop-common-project/hadoop-kms/pom.xml +++ b/hadoop-common-project/hadoop-kms/pom.xml @@ -183,11 +183,6 @@ jetty-util compile - - org.mortbay.jetty - jsp-2.1-jetty - compile - com.codahale.metrics metrics-core diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml index 812ec03df7..c1e89707b0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml @@ -119,10 +119,6 @@ org.mortbay.jetty jetty-util - - org.mortbay.jetty - jsp-2.1-jetty - org.mortbay.jetty servlet-api-2.5 diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml index 3f978763bf..42962a6c26 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml @@ -94,11 +94,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> jetty-util compile - - org.mortbay.jetty - jsp-2.1-jetty - compile - com.sun.jersey jersey-core diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index 09628be3ab..14019b2692 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -81,11 +81,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> jetty-util compile - - org.mortbay.jetty - jsp-2.1-jetty - compile - com.sun.jersey jersey-core diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index d2947193c2..f359a4dece 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -392,11 +392,6 @@ jetty-util 6.1.26 - - org.mortbay.jetty - jsp-2.1-jetty - 6.1.26 - org.glassfish diff --git a/hadoop-tools/hadoop-sls/pom.xml b/hadoop-tools/hadoop-sls/pom.xml index 7fefe5f9c3..e82390db0d 100644 --- a/hadoop-tools/hadoop-sls/pom.xml +++ b/hadoop-tools/hadoop-sls/pom.xml @@ -70,11 +70,6 @@ jetty-util provided - - org.mortbay.jetty - jsp-2.1-jetty - compile - diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml index e78c12c26b..e1567a96bf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml @@ -61,10 +61,6 @@ org.mortbay.jetty jetty-util - - org.mortbay.jetty - jsp-2.1-jetty - com.sun.jersey jersey-client diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml index 17c3f14cd4..370cc36ea4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml @@ -84,10 +84,6 @@ org.mortbay.jetty jetty-util - - org.mortbay.jetty - jsp-2.1-jetty - com.google.guava guava diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml index 2912f8db16..91dc26c01d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml @@ -146,10 +146,6 @@ org.mortbay.jetty jetty-util - - org.mortbay.jetty - jsp-2.1-jetty - com.google.guava guava