You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by wh...@apache.org on 2014/11/05 00:04:58 UTC
git commit: HADOOP-10717. HttpServer2 should load jsp DTD from local
jars instead of going remote. Contributed by Dapeng Sun.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 06bc026c2 -> 7e2bdd525
HADOOP-10717. HttpServer2 should load jsp DTD from local jars instead of going remote. Contributed by Dapeng Sun.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7e2bdd52
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7e2bdd52
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7e2bdd52
Branch: refs/heads/branch-2
Commit: 7e2bdd52551f5894c07b47dd540468a82e8b9702
Parents: 06bc026
Author: Haohui Mai <wh...@apache.org>
Authored: Tue Jun 24 17:51:21 2014 +0000
Committer: Haohui Mai <wh...@apache.org>
Committed: Tue Nov 4 15:02:25 2014 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
hadoop-common-project/hadoop-common/pom.xml | 5 +++++
hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 4 ++++
3 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e2bdd52/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 9d4d2c6..37bbc6d 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -538,6 +538,9 @@ Release 2.5.1 - 2014-09-05
HADOOP-10956. Fix create-release script to include docs and necessary txt
files. (kasha)
+ HADOOP-10717. HttpServer2 should load jsp DTD from local jars instead of
+ going remote. (Dapeng Sun via wheat9)
+
OPTIMIZATIONS
BUG FIXES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e2bdd52/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 4ee0c72..3018bf0 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -105,6 +105,11 @@
</dependency>
<dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<scope>compile</scope>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e2bdd52/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
index 0e400e9..b5d17ac 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
@@ -111,6 +111,10 @@
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
</exclusion>