From aa09c4c3421a4b3062cb8d0db2a905daf41bf888 Mon Sep 17 00:00:00 2001 From: Haohui Mai Date: Fri, 2 May 2014 22:26:02 +0000 Subject: [PATCH] HADOOP-10563. Remove the dependency of jsp in trunk. Contributed by Haohui Mai. --- hadoop-client/pom.xml | 28 --- .../hadoop-annotations/pom.xml | 15 ++ .../hadoop-common/CHANGES.txt | 189 +----------------- hadoop-common-project/hadoop-common/pom.xml | 20 -- .../apache/hadoop/http/TestHttpServer.java | 7 - .../hadoop-hdfs-httpfs/pom.xml | 48 ----- hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml | 10 - hadoop-hdfs-project/hadoop-hdfs/pom.xml | 161 +-------------- .../hadoop/hdfs/server/common/JspHelper.java | 9 + .../src/main/webapps/proto-datanode-web.xml | 17 -- .../src/main/webapps/proto-journal-web.xml | 17 -- .../src/main/webapps/proto-secondary-web.xml | 17 -- .../{proto-hdfs-web.xml => proto-web.xml} | 1 - .../hdfs/server/common/TestJspHelper.java | 6 +- .../hadoop-mapreduce-client/pom.xml | 18 -- hadoop-mapreduce-project/pom.xml | 18 -- hadoop-project/pom.xml | 35 ---- .../hadoop-yarn/hadoop-yarn-api/pom.xml | 18 -- .../pom.xml | 18 -- .../pom.xml | 18 -- .../hadoop-yarn/hadoop-yarn-client/pom.xml | 18 -- .../hadoop-yarn/hadoop-yarn-common/pom.xml | 18 -- .../pom.xml | 18 -- .../hadoop-yarn-server-common/pom.xml | 18 -- .../hadoop-yarn-server-nodemanager/pom.xml | 18 -- .../pom.xml | 18 -- .../hadoop-yarn-server-tests/pom.xml | 18 -- .../hadoop-yarn-server-web-proxy/pom.xml | 18 -- 28 files changed, 34 insertions(+), 780 deletions(-) delete mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-datanode-web.xml delete mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-journal-web.xml delete mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-secondary-web.xml rename hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/{proto-hdfs-web.xml => proto-web.xml} (96%) diff --git a/hadoop-client/pom.xml b/hadoop-client/pom.xml index 6f2b447c2e7..aebdc2e21b3 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-annotations/pom.xml b/hadoop-common-project/hadoop-annotations/pom.xml index fc8d4c9ce91..fc7038b2dc8 100644 --- a/hadoop-common-project/hadoop-annotations/pom.xml +++ b/hadoop-common-project/hadoop-annotations/pom.xml @@ -71,6 +71,21 @@ + + jdk1.8 + + 1.8 + + + + jdk.tools + jdk.tools + 1.8 + system + ${java.home}/../lib/tools.jar + + + diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 48a06dbc9b1..9d4d2c6a7f1 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -24,6 +24,8 @@ Release 2.7.0 - UNRELEASED HADOOP-10847. Remove the usage of sun.security.x509.* in testing code. (Pascal Oliva via wheat9) + HADOOP-10563. Remove the dependency of jsp in trunk. (wheat9) + OPTIMIZATIONS BUG FIXES @@ -163,193 +165,6 @@ Release 2.6.0 - UNRELEASED HADOOP-10534. KeyProvider getKeysMetadata should take a list of names rather than returning all keys. (omalley) - HADOOP-10719. Add generateEncryptedKey and decryptEncryptedKey - methods to KeyProvider. (asuresh via tucu) - - HADOOP-10817. ProxyUsers configuration should support configurable - prefixes. (tucu) - - HADOOP-10881. Clarify usage of encryption and encrypted encryption - key in KeyProviderCryptoExtension. (wang) - - HADOOP-10770. KMS add delegation token support. (tucu) - - HADOOP-10698. KMS, add proxyuser support. (tucu) - - HADOOP-8896. Javadoc points to Wrong Reader and Writer classes - in SequenceFile (Ray Chiang via aw) - - HADOOP-10998. Fix bash tab completion code to work (Jim Hester via aw) - - HADOOP-10880. Move HTTP delegation tokens out of URL querystring to - a header. (tucu) - - HADOOP-11005. Fix HTTP content type for ReconfigurationServlet. - (Lei Xu via wang) - - HADOOP-10814. Update Tomcat version used by HttpFS and KMS to latest - 6.x version. (rkanter via tucu) - - HADOOP-10994. KeyProviderCryptoExtension should use CryptoCodec for - generation/decryption of keys. (tucu) - - HADOOP-11021. Configurable replication factor in the hadoop archive - command. (Zhe Zhang via wang) - - HADOOP-11030. Define a variable jackson.version instead of using constant - at multiple places. (Juan Yu via kasha) - - HADOOP-10990. Add missed NFSv3 request and response classes (brandonli) - - HADOOP-10863. KMS should have a blacklist for decrypting EEKs. - (asuresh via tucu) - - HADOOP-11054. Add a KeyProvider instantiation based on a URI. (tucu) - - HADOOP-11015. Http server/client utils to propagate and recreate - Exceptions from server to client. (tucu) - - HADOOP-11060. Create a CryptoCodec test that verifies interoperability - between the JCE and OpenSSL implementations. (hitliuyi via tucu) - - HADOOP-11070. Create MiniKMS for testing. (tucu) - - HADOOP-11057. checknative command to probe for winutils.exe on windows. - (Xiaoyu Yao via cnauroth) - - HADOOP-10758. KMS: add ACLs on per key basis. (tucu) - - HADOOP-9540. Expose the InMemoryS3 and S3N FilesystemStores implementations - for Unit testing. (Steve Lougran) - - HADOOP-10373 create tools/hadoop-amazon for aws/EMR support (stevel) - - HADOOP-11074. Move s3-related FS connector code to hadoop-aws (David S. - Wang via Colin Patrick McCabe) - - HADOOP-11091. Eliminate old configuration parameter names from s3a (David - S. Wang via Colin Patrick McCabe) - - HADOOP-10868. AuthenticationFilter should support externalizing the - secret for signing and provide rotation support. (rkanter via tucu) - - HADOOP-10922. User documentation for CredentialShell. (Larry McCay via wang) - - HADOOP-11016. KMS should support signing cookies with zookeeper secret - manager. (tucu) - - HADOOP-11106. Document considerations of HAR and Encryption. (clamb via wang) - - HADOOP-10970. Cleanup KMS configuration keys. (wang) - - HADOOP-11017. KMS delegation token secret manager should be able to use - zookeeper as store. (asuresh via tucu) - - HADOOP-11009. Add Timestamp Preservation to DistCp (Gary Steelman via aw) - - HADOOP-11101. How about inputstream close statement from catch block to - finally block in FileContext#copy() ( skrho via vinayakumarb ) - - HADOOP-8808. Update FsShell documentation to mention deprecation of some - of the commands, and mention alternatives (Akira AJISAKA via aw) - - HADOOP-10954. Adding site documents of hadoop-tools (Masatake Iwasaki - via aw) - - HADOOP-10731. Remove @date JavaDoc comment in ProgramDriver class (Henry - Saputra via aw) - - HADOOP-11153. Make number of KMS threads configurable. (wang) - - HADOOP-11007. Reinstate building of ant tasks support. (jlowe via kihwal) - - HADOOP-11178. Fix findbugs exclude file. (Arun Suresh via wang) - - HADOOP-11174. Delegation token for KMS should only be got once if it - already exists. (Yi Liu via wang) - - HADOOP-11184. Update Hadoop's lz4 to version r123. (cmccabe) - - HADOOP-11181. Generalized o.a.h.s.t.d.DelegationTokenManager to handle all - sub-classes of AbstractDelegationTokenIdentifier. (zjshen) - - HADOOP-11207. Enhanced common DelegationTokenAuthenticationHandler to support - proxy-users on Delegation-token management operations. (Zhijie Shen via - vinodkv) - - HADOOP-11216. Improve Openssl library finding. (cmccabe via yliu) - - HADOOP-11254. Changed visibility of AccessControlList to be public for - consumption by ecosystem. (Zhijie Shen via vinodkv) - - OPTIMIZATIONS - - HADOOP-10838. Byte array native checksumming. (James Thomas via todd) - - HADOOP-10696. Add optional attributes to KeyProvider Options and Metadata. - (tucu) - - HADOOP-10695. KMSClientProvider should respect a configurable timeout. - (yoderme via tucu) - - HADOOP-10757. KeyProvider KeyVersion should provide the key name. - (asuresh via tucu) - - HADOOP-10769. Create KeyProvider extension to handle delegation tokens. - (Arun Suresh via atm) - - HADOOP-10812. Delegate KeyProviderExtension#toString to underlying - KeyProvider. (wang) - - HADOOP-10736. Add key attributes to the key shell. (Mike Yoder via wang) - - HADOOP-10824. Refactor KMSACLs to avoid locking. (Benoy Antony via umamahesh) - - HADOOP-10841. EncryptedKeyVersion should have a key name property. - (asuresh via tucu) - - HADOOP-10842. CryptoExtension generateEncryptedKey method should - receive the key name. (asuresh via tucu) - - HADOOP-10750. KMSKeyProviderCache should be in hadoop-common. - (asuresh via tucu) - - HADOOP-10720. KMS: Implement generateEncryptedKey and decryptEncryptedKey - in the REST API. (asuresh via tucu) - - HADOOP-10891. Add EncryptedKeyVersion factory method to - KeyProviderCryptoExtension. (wang) - - HADOOP-10756. KMS audit log should consolidate successful similar requests. - (asuresh via tucu) - - HADOOP-10793. KeyShell args should use single-dash style. (wang) - - HADOOP-10936. Change default KeyProvider bitlength to 128. (wang) - - HADOOP-10224. JavaKeyStoreProvider has to protect against corrupting - underlying store. (asuresh via tucu) - - HADOOP-10282. Create a FairCallQueue: a multi-level call queue which - schedules incoming calls and multiplexes outgoing calls. (Chris Li via - Arpit Agarwal) - - HADOOP-10833. Remove unused cache in UserProvider. (Benoy Antony) - - HADOOP-11112. TestKMSWithZK does not use KEY_PROVIDER_URI. (tucu via wang) - - HADOOP-11111 MiniKDC to use locale EN_US for case conversions. (stevel) - - HADOOP-10681. Remove unnecessary synchronization from Snappy & Zlib - codecs. (Gopal Vijayaraghavan via acmurthy) - - HADOOP-11194. Ignore .keep files. (kasha) - - HADOOP-11195. Move Id-Name mapping in NFS to the hadoop-common area for - better maintenance (Yongjun Zhang via brandonli) - - HADOOP-11247. Fix a couple javac warnings in NFS. (Brandon Li via wheat9) - BUG FIXES HADOOP-11182. GraphiteSink emits wrong timestamps (Sascha Coenen via raviprak) diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 0315f2b4623..4ee0c72a9a6 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -121,26 +121,6 @@ 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 22acb89d373..ac03968c2d4 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 class TestHttpServer extends HttpServerFunctionalTest { 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-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml index 7d4f47b938e..0e400e9cc85 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml @@ -106,26 +106,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 @@ -134,10 +118,6 @@ org.mortbay.jetty jetty-util - - org.mortbay.jetty - jsp-api-2.1 - org.mortbay.jetty servlet-api-2.5 @@ -154,10 +134,6 @@ org.eclipse.jdt core - - commons-el - commons-el - @@ -173,26 +149,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 @@ -201,10 +161,6 @@ org.mortbay.jetty jetty-util - - org.mortbay.jetty - jsp-api-2.1 - org.mortbay.jetty servlet-api-2.5 @@ -221,10 +177,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 4265d4c1622..68f311de837 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 4c3ce8ade1c..7beffed439f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -120,11 +120,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> commons-daemon compile - - javax.servlet.jsp - jsp-api - compile - log4j log4j @@ -170,11 +165,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> jackson-mapper-asl compile - - tomcat - jasper-runtime - compile - xmlenc xmlenc @@ -228,123 +218,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 @@ -352,18 +225,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> false - - create-jsp-generated-sources-directory - initialize - - run - - - - - - - create-web-xmls compile @@ -372,32 +233,21 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - - - - - - - - - - - - - - - + @@ -418,6 +268,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 2062f371066..ec9e29b9a67 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 @@ -58,6 +58,15 @@ import org.apache.hadoop.security.authorize.ProxyServers; import org.apache.hadoop.security.authorize.ProxyUsers; import org.apache.hadoop.security.token.Token; +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 d196012673e..00000000000 --- 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 b27f82b4a46..00000000000 --- 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 325058e1a2a..00000000000 --- 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 02a733316d0..83b36b2ca58 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 b5d23c886f8..1967963f6aa 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,7 +17,6 @@ */ package org.apache.hadoop.hdfs.server.common; -import org.junit.Assert; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.hdfs.HdfsConfiguration; @@ -45,9 +44,8 @@ import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.net.InetSocketAddress; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.junit.Assert; +import static org.junit.Assert.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml index c2489da10f8..b5a626afcac 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 845e10187a5..2bf14593bd7 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 4cc951cad3d..db9e9cb47c1 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -546,36 +546,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 @@ -1019,11 +989,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 d67be146099..475bfe25e38 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 8ac2795f8ce..7191e80aefe 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 3328bd34663..2edc1c481d2 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 ecd4605f168..c1e221bfdfd 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 92507d825b9..c87f07d93a3 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 eba00fd9af0..85f2fe0e612 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 bcf1bffd0d2..7e0711be957 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 e72d489b7c5..aec6023cb84 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 6dd0b85a965..76e3585cef5 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 348958f762c..d6fc32d674b 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 f76cf9d4a71..22e2fe7960a 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 - -