Repository: hadoop Updated Branches: refs/heads/trunk 7401e5b5e -> ce53c8eb0
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/ce53c8eb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ce53c8eb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ce53c8eb Branch: refs/heads/trunk Commit: ce53c8eb0ccc582957ba1f4c0b7938db00f6ca31 Parents: 7401e5b Author: Haohui Mai <whe...@apache.org> Authored: Tue May 19 18:28:20 2015 -0700 Committer: Haohui Mai <whe...@apache.org> Committed: Tue May 19 18:28:20 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/ce53c8eb/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 3e7cb39..b0b8fb7 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -587,6 +587,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/ce53c8eb/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index f23a2dd..78903fa 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> @@ -461,7 +461,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> @@ -472,7 +472,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> @@ -591,7 +591,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>