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 2015/05/20 03:28:38 UTC
hadoop git commit: HADOOP-11995. Make jetty version configurable from
the maven command line. Contributed by Sriharsha Devineni.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 b5ba6979b -> ed320da2b
HADOOP-11995. Make jetty version configurable from the maven command line. Contributed by Sriharsha Devineni.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ed320da2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ed320da2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ed320da2
Branch: refs/heads/branch-2
Commit: ed320da2ba5b7c32f34a69ab213f35d988a7ecba
Parents: b5ba697
Author: Haohui Mai <wh...@apache.org>
Authored: Tue May 19 18:28:20 2015 -0700
Committer: Haohui Mai <wh...@apache.org>
Committed: Tue May 19 18:28:34 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
hadoop-project/pom.xml | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ed320da2/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 f2a1572..266bca4 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -122,6 +122,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-11103. Clean up RemoteException (Sean Busbey via vinayakumarb)
+ HADOOP-11995. Make jetty version configurable from the maven command line.
+ (Sriharsha Devineni via wheat9)
+
OPTIMIZATIONS
HADOOP-11785. Reduce the number of listStatus operation in distcp
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ed320da2/hadoop-project/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 635596e..da84fe2 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -32,7 +32,7 @@
<properties>
<failIfNoTests>false</failIfNoTests>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
-
+ <jetty.version>6.1.26</jetty.version>
<test.exclude>_</test.exclude>
<test.exclude.pattern>_</test.exclude.pattern>
@@ -460,7 +460,7 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.26</version>
+ <version>${jetty.version}</version>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
@@ -471,7 +471,7 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>6.1.26</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
@@ -590,7 +590,7 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-servlet-tester</artifactId>
- <version>6.1.26</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>