Author: vinodkv
Date: Fri Jan 17 20:57:53 2014
New Revision: 1559250
URL: http://svn.apache.org/r1559250
Log:
YARN-321. Forwarding YARN-321 branch to latest trunk.
Modified:
hadoop/common/branches/YARN-321/ (props changed)
hadoop/common/branches/YARN-321/hadoop-project/pom.xml
Propchange: hadoop/common/branches/YARN-321/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1559007-1559249
Modified: hadoop/common/branches/YARN-321/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-project/pom.xml?rev=1559250&r1=1559249&r2=1559250&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-project/pom.xml Fri Jan 17 20:57:53
2014
@@ -422,7 +422,7 @@
<version>${jersey.version}</version>
<exclusions>
<exclusion>
- <groupId>javax.xml.stream</groupId>
+ <groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
@@ -770,6 +770,12 @@
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
