Author: stevel
Date: Wed Nov 13 20:46:54 2013
New Revision: 1541702
URL: http://svn.apache.org/r1541702
Log:
MAPREDUCE-5624 Move grizzly-test and junit dependencies to test scope
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/ (props changed)
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (contents, props
changed)
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project:r1541699
Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1541702&r1=1541701&r2=1541702&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Wed Nov 13
20:46:54 2013
@@ -173,6 +173,9 @@ Release 2.3.0 - UNRELEASED
MAPREDUCE-5431. Missing pom dependency in MR-client (Timothy St. Clair
via stevel)
+ MAPREDUCE-5624 Move grizzly-test and junit dependencies to test scope
+ (Ted Yu via stevel)
+
OPTIMIZATIONS
MAPREDUCE-5484. YarnChild unnecessarily loads job conf twice (Sandy Ryza)
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt:r1541699
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml?rev=1541702&r1=1541701&r2=1541702&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
Wed Nov 13 20:46:54 2013
@@ -163,6 +163,11 @@
<artifactId>commons-collections</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.jersey.jersey-test-framework</groupId>
+ <artifactId>jersey-test-framework-grizzly2</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml?rev=1541702&r1=1541701&r2=1541702&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
Wed Nov 13 20:46:54 2013
@@ -93,6 +93,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.jersey.jersey-test-framework</groupId>
+ <artifactId>jersey-test-framework-grizzly2</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-hs</artifactId>
