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/440ba1e5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/440ba1e5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/440ba1e5 Branch: refs/heads/YARN-2928 Commit: 440ba1e564e7f40c2be945e01f551435e082a958 Parents: 31274c1 Author: Haohui Mai <[email protected]> Authored: Tue May 19 18:28:20 2015 -0700 Committer: Zhijie Shen <[email protected]> Committed: Fri May 22 12:42:56 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/440ba1e5/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/440ba1e5/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 2c53318..0889241 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> @@ -483,7 +483,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> @@ -494,7 +494,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> @@ -613,7 +613,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>
