diff --git a/hadoop-client/pom.xml b/hadoop-client/pom.xml index 9884480e34..2b66790f62 100644 --- a/hadoop-client/pom.xml +++ b/hadoop-client/pom.xml @@ -39,22 +39,10 @@ hadoop-common compile - - tomcat - jasper-compiler - - - tomcat - jasper-runtime - javax.servlet servlet-api - - javax.servlet.jsp - jsp-api - commons-logging commons-logging-api @@ -71,10 +59,6 @@ org.mortbay.jetty jetty-util - - org.mortbay.jetty - jsp-api-2.1 - org.mortbay.jetty servlet-api-2.5 @@ -111,10 +95,6 @@ com.jcraft jsch - - commons-el - commons-el - @@ -147,14 +127,6 @@ javax.servlet servlet-api - - javax.servlet.jsp - jsp-api - - - tomcat - jasper-runtime - diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index ba0824141b..31492e03bf 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -144,6 +144,8 @@ Trunk (Unreleased) HADOOP-10534. KeyProvider getKeysMetadata should take a list of names rather than returning all keys. (omalley) + HADOOP-10563. Remove the dependency of jsp in trunk. (wheat9) + BUG FIXES HADOOP-9451. Fault single-layer config if node group topology is enabled. diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index b4e623a0d8..7f0b79a8d2 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -119,26 +119,6 @@ jersey-server compile - - tomcat - jasper-compiler - runtime - - - tomcat - jasper-runtime - runtime - - - javax.servlet.jsp - jsp-api - runtime - - - commons-el - commons-el - runtime - commons-logging commons-logging diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java index 03294b527a..64823fd743 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java @@ -259,13 +259,6 @@ public void run() { conn.connect(); assertEquals(200, conn.getResponseCode()); assertEquals("text/html; charset=utf-8", conn.getContentType()); - - // JSPs should default to text/html with utf8 - servletUrl = new URL(baseUrl, "/testjsp.jsp"); - conn = (HttpURLConnection)servletUrl.openConnection(); - conn.connect(); - assertEquals(200, conn.getResponseCode()); - assertEquals("text/html; charset=utf-8", conn.getContentType()); } /** diff --git a/hadoop-common-project/hadoop-common/src/test/resources/webapps/test/testjsp.jsp b/hadoop-common-project/hadoop-common/src/test/resources/webapps/test/testjsp.jsp deleted file mode 100644 index 23465da295..0000000000 --- a/hadoop-common-project/hadoop-common/src/test/resources/webapps/test/testjsp.jsp +++ /dev/null @@ -1,21 +0,0 @@ -<%! -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -%> -<%@ page contentType="text/html; charset=UTF-8" %> -Hello world! diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml index 33272d95fe..c1e89707b0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml @@ -107,26 +107,10 @@ commons-httpclient commons-httpclient - - tomcat - jasper-compiler - - - tomcat - jasper-runtime - javax.servlet servlet-api - - javax.servlet - jsp-api - - - javax.servlet.jsp - jsp-api - org.mortbay.jetty jetty @@ -135,10 +119,6 @@ org.mortbay.jetty jetty-util - - org.mortbay.jetty - jsp-api-2.1 - org.mortbay.jetty servlet-api-2.5 @@ -151,10 +131,6 @@ org.eclipse.jdt core - - commons-el - commons-el - @@ -170,26 +146,10 @@ commons-httpclient commons-httpclient - - tomcat - jasper-compiler - - - tomcat - jasper-runtime - javax.servlet servlet-api - - javax.servlet - jsp-api - - - javax.servlet.jsp - jsp-api - org.mortbay.jetty jetty @@ -198,10 +158,6 @@ org.mortbay.jetty jetty-util - - org.mortbay.jetty - jsp-api-2.1 - org.mortbay.jetty servlet-api-2.5 @@ -214,10 +170,6 @@ org.eclipse.jdt core - - commons-el - commons-el - diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml index 7b0c31ecdb..42962a6c26 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml @@ -134,11 +134,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> commons-daemon compile - - javax.servlet.jsp - jsp-api - compile - log4j log4j @@ -179,11 +174,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> jackson-mapper-asl compile - - tomcat - jasper-runtime - compile - xmlenc xmlenc diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index 9218c4a73b..16dadcf196 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -121,11 +121,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> commons-daemon compile - - javax.servlet.jsp - jsp-api - compile - log4j log4j @@ -166,11 +161,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> jackson-mapper-asl compile - - tomcat - jasper-runtime - compile - xmlenc xmlenc @@ -201,123 +191,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - org.codehaus.mojo.jspc - jspc-maven-plugin - - - hdfs - generate-sources - - compile - - - false - ${project.build.directory}/generated-sources/java - ${project.build.directory}/hdfs-jsp-servlet-definitions.xml - org.apache.hadoop.hdfs.server.namenode - - ${basedir}/src/main/webapps/hdfs - - *.jsp - - - - - - secondary - generate-sources - - compile - - - false - ${project.build.directory}/generated-sources/java - ${project.build.directory}/secondary-jsp-servlet-definitions.xml - org.apache.hadoop.hdfs.server.namenode - - ${basedir}/src/main/webapps/secondary - - *.jsp - - - - - - journal - generate-sources - - compile - - - false - ${project.build.directory}/generated-sources/java - ${project.build.directory}/journal-jsp-servlet-definitions.xml - org.apache.hadoop.hdfs.server.journalservice - - ${basedir}/src/main/webapps/journal - - *.jsp - - - - - - datanode - generate-sources - - compile - - - false - ${project.build.directory}/generated-sources/java - ${project.build.directory}/datanode-jsp-servlet-definitions.xml - org.apache.hadoop.hdfs.server.datanode - - ${basedir}/src/main/webapps/datanode - - *.jsp - - - - - - - - org.codehaus.mojo.jspc - jspc-compiler-tomcat5 - 2.0-alpha-3 - - - org.slf4j - slf4j-log4j12 - 1.4.1 - - - org.slf4j - jcl104-over-slf4j - 1.4.1 - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-jsp-generated-sources-directory - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/java - - - - - org.apache.maven.plugins maven-antrun-plugin @@ -325,18 +198,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> false - - create-jsp-generated-sources-directory - initialize - - run - - - - - - - create-web-xmls compile @@ -345,32 +206,21 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - - - - - - - - - - - - - - - + @@ -391,6 +241,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> + diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/JspHelper.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/JspHelper.java index 8f7b41a798..545fc042f0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/JspHelper.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/JspHelper.java @@ -18,58 +18,16 @@ package org.apache.hadoop.hdfs.server.common; -import static org.apache.hadoop.fs.CommonConfigurationKeys.DEFAULT_HADOOP_HTTP_STATIC_USER; -import static org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_HTTP_STATIC_USER; - -import java.io.ByteArrayInputStream; -import java.io.DataInputStream; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.Socket; -import java.net.URL; -import java.net.URLEncoder; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.JspWriter; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hdfs.BlockReader; -import org.apache.hadoop.hdfs.BlockReaderFactory; -import org.apache.hadoop.hdfs.ClientContext; -import org.apache.hadoop.hdfs.DFSClient; -import org.apache.hadoop.hdfs.DFSUtil; -import org.apache.hadoop.hdfs.RemotePeerFactory; -import org.apache.hadoop.hdfs.net.Peer; -import org.apache.hadoop.hdfs.net.TcpPeerServer; -import org.apache.hadoop.hdfs.protocol.DatanodeID; -import org.apache.hadoop.hdfs.protocol.DatanodeInfo; -import org.apache.hadoop.hdfs.protocol.ExtendedBlock; -import org.apache.hadoop.hdfs.protocol.LocatedBlock; -import org.apache.hadoop.hdfs.protocol.LocatedBlocks; -import org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier; -import org.apache.hadoop.hdfs.security.token.block.DataEncryptionKey; import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier; -import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor; -import org.apache.hadoop.hdfs.server.datanode.CachingStrategy; import org.apache.hadoop.hdfs.server.namenode.NameNode; import org.apache.hadoop.hdfs.server.namenode.NameNodeHttpServer; import org.apache.hadoop.hdfs.web.resources.DelegationParam; import org.apache.hadoop.hdfs.web.resources.DoAsParam; import org.apache.hadoop.hdfs.web.resources.UserParam; -import org.apache.hadoop.http.HtmlQuoting; -import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.security.AccessControlException; import org.apache.hadoop.security.SecurityUtil; @@ -78,9 +36,16 @@ import org.apache.hadoop.security.authentication.util.KerberosName; import org.apache.hadoop.security.authorize.ProxyUsers; import org.apache.hadoop.security.token.Token; -import org.apache.hadoop.util.VersionInfo; -import com.google.common.base.Charsets; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import java.io.IOException; +import java.net.InetSocketAddress; + +import static org.apache.hadoop.fs.CommonConfigurationKeys.DEFAULT_HADOOP_HTTP_STATIC_USER; +import static org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_HTTP_STATIC_USER; @InterfaceAudience.Private public class JspHelper { diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-datanode-web.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-datanode-web.xml deleted file mode 100644 index d196012673..0000000000 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-datanode-web.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - -@datanode.servlet.definitions@ - diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-journal-web.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-journal-web.xml deleted file mode 100644 index b27f82b4a4..0000000000 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-journal-web.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - -@journal.servlet.definitions@ - diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-secondary-web.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-secondary-web.xml deleted file mode 100644 index 325058e1a2..0000000000 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-secondary-web.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - -@secondary.servlet.definitions@ - diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-hdfs-web.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-web.xml similarity index 96% rename from hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-hdfs-web.xml rename to hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-web.xml index 02a733316d..83b36b2ca5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-hdfs-web.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-web.xml @@ -13,5 +13,4 @@ limitations under the License. See accompanying LICENSE file. --> -@hdfs.servlet.definitions@ diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java index 5e8155e571..1b45e33fe5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java @@ -17,37 +17,11 @@ */ package org.apache.hadoop.hdfs.server.common; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.io.IOException; -import java.io.StringReader; -import java.net.InetSocketAddress; -import java.util.ArrayList; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.JspWriter; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.hdfs.HdfsConfiguration; -import org.apache.hadoop.hdfs.protocol.DatanodeID; import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier; -import org.apache.hadoop.hdfs.server.blockmanagement.BlockManagerTestUtil; -import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor; import org.apache.hadoop.hdfs.server.namenode.NameNodeHttpServer; -import org.apache.hadoop.hdfs.server.protocol.DatanodeStorage; -import org.apache.hadoop.hdfs.server.protocol.StorageReport; import org.apache.hadoop.hdfs.web.resources.DoAsParam; import org.apache.hadoop.hdfs.web.resources.UserParam; import org.apache.hadoop.io.DataInputBuffer; @@ -63,14 +37,15 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.mockito.ArgumentCaptor; -import org.mockito.Mockito; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import com.google.common.base.Strings; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.net.InetSocketAddress; + +import static org.junit.Assert.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; public class TestJspHelper { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml index 6657662b35..72b9cd43b3 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml @@ -72,24 +72,6 @@ org.apache.hadoop hadoop-common provided - - - commons-el - commons-el - - - tomcat - jasper-runtime - - - tomcat - jasper-compiler - - - org.mortbay.jetty - jsp-2.1-jetty - - diff --git a/hadoop-mapreduce-project/pom.xml b/hadoop-mapreduce-project/pom.xml index fdd817427b..628f41f6b9 100644 --- a/hadoop-mapreduce-project/pom.xml +++ b/hadoop-mapreduce-project/pom.xml @@ -81,24 +81,6 @@ org.apache.hadoop hadoop-common provided - - - commons-el - commons-el - - - tomcat - jasper-runtime - - - tomcat - jasper-compiler - - - org.mortbay.jetty - jsp-2.1-jetty - - diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 8661de1d34..47ff38150d 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -482,36 +482,6 @@ jetty-servlet-tester 6.1.26 - - tomcat - jasper-compiler - 5.5.23 - - - javax.servlet - jsp-api - - - ant - ant - - - - - tomcat - jasper-runtime - 5.5.23 - - - javax.servlet.jsp - jsp-api - 2.1 - - - commons-el - commons-el - 1.0 - commons-logging commons-logging @@ -874,11 +844,6 @@ avro-maven-plugin ${avro.version} - - org.codehaus.mojo.jspc - jspc-maven-plugin - 2.0-alpha-3 - org.apache.maven.plugins maven-project-info-reports-plugin diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml index 09990f4bb6..affbe03b43 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml @@ -51,24 +51,6 @@ org.apache.hadoop hadoop-common provided - - - commons-el - commons-el - - - tomcat - jasper-runtime - - - tomcat - jasper-compiler - - - org.mortbay.jetty - jsp-2.1-jetty - - diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml index 850f05a356..d91c67bfb2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml @@ -38,24 +38,6 @@ org.apache.hadoop hadoop-common provided - - - commons-el - commons-el - - - tomcat - jasper-runtime - - - tomcat - jasper-compiler - - - org.mortbay.jetty - jsp-2.1-jetty - - diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml index 0cd95d93f1..1eb0a8cc66 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml @@ -50,24 +50,6 @@ org.apache.hadoop hadoop-common provided - - - commons-el - commons-el - - - tomcat - jasper-runtime - - - tomcat - jasper-compiler - - - org.mortbay.jetty - jsp-2.1-jetty - - 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 6091686a03..e1567a96bf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml @@ -35,24 +35,6 @@ org.apache.hadoop hadoop-common provided - - - commons-el - commons-el - - - tomcat - jasper-runtime - - - tomcat - jasper-compiler - - - org.mortbay.jetty - jsp-2.1-jetty - - diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml index ad8e96594a..9f2e8b5aa8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -38,24 +38,6 @@ org.apache.hadoop hadoop-common provided - - - commons-el - commons-el - - - tomcat - jasper-runtime - - - tomcat - jasper-compiler - - - org.mortbay.jetty - jsp-2.1-jetty - - diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml index 59be859c7c..616c7f0aa0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml @@ -45,24 +45,6 @@ org.apache.hadoop hadoop-common provided - - - commons-el - commons-el - - - tomcat - jasper-runtime - - - tomcat - jasper-compiler - - - org.mortbay.jetty - jsp-2.1-jetty - - 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 49d91c9ee3..26fc908f32 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 @@ -38,24 +38,6 @@ org.apache.hadoop hadoop-common provided - - - commons-el - commons-el - - - tomcat - jasper-runtime - - - tomcat - jasper-compiler - - - org.mortbay.jetty - jsp-2.1-jetty - - 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 d680bfc407..7f34a2db3e 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 @@ -40,24 +40,6 @@ org.apache.hadoop hadoop-common provided - - - commons-el - commons-el - - - tomcat - jasper-runtime - - - tomcat - jasper-compiler - - - org.mortbay.jetty - jsp-2.1-jetty - - 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 dd23392e96..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 @@ -42,24 +42,6 @@ org.apache.hadoop hadoop-common provided - - - commons-el - commons-el - - - tomcat - jasper-runtime - - - tomcat - jasper-compiler - - - org.mortbay.jetty - jsp-2.1-jetty - - diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml index c32ea16fb6..30f334d075 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml @@ -37,24 +37,6 @@ org.apache.hadoop hadoop-common provided - - - commons-el - commons-el - - - tomcat - jasper-runtime - - - tomcat - jasper-compiler - - - org.mortbay.jetty - jsp-2.1-jetty - - diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml index eec1ea43f1..fdba1fe2f2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml @@ -43,24 +43,6 @@ org.apache.hadoop hadoop-common provided - - - commons-el - commons-el - - - tomcat - jasper-runtime - - - tomcat - jasper-compiler - - - org.mortbay.jetty - jsp-2.1-jetty - -