Author: stevel
Date: Wed Jun 18 17:08:45 2014
New Revision: 1603534
URL: http://svn.apache.org/r1603534
Log:
HADOOP-10717. Missing JSP support in Jetty
Modified:
hadoop/common/trunk/hadoop-client/pom.xml
hadoop/common/trunk/hadoop-project/pom.xml
hadoop/common/trunk/hadoop-tools/hadoop-sls/pom.xml
Modified: hadoop/common/trunk/hadoop-client/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-client/pom.xml?rev=1603534&r1=1603533&r2=1603534&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-client/pom.xml (original)
+++ hadoop/common/trunk/hadoop-client/pom.xml Wed Jun 18 17:08:45 2014
@@ -61,6 +61,10 @@
</exclusion>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1-jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
</exclusion>
<exclusion>
Modified: hadoop/common/trunk/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/pom.xml?rev=1603534&r1=1603533&r2=1603534&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-project/pom.xml (original)
+++ hadoop/common/trunk/hadoop-project/pom.xml Wed Jun 18 17:08:45 2014
@@ -392,6 +392,11 @@
<artifactId>jetty-util</artifactId>
<version>6.1.26</version>
</dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1-jetty</artifactId>
+ <version>6.1.26</version>
+ </dependency>
<dependency>
<groupId>org.glassfish</groupId>
Modified: hadoop/common/trunk/hadoop-tools/hadoop-sls/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-sls/pom.xml?rev=1603534&r1=1603533&r2=1603534&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-tools/hadoop-sls/pom.xml (original)
+++ hadoop/common/trunk/hadoop-tools/hadoop-sls/pom.xml Wed Jun 18 17:08:45 2014
@@ -70,6 +70,11 @@
<artifactId>jetty-util</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1-jetty</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>