Author: szetszwo
Date: Sat Jan 18 02:24:38 2014
New Revision: 1559305
URL: http://svn.apache.org/r1559305
Log:
Merge r1555021 through r1559304 from trunk.
Modified:
hadoop/common/branches/HDFS-5535/ (props changed)
hadoop/common/branches/HDFS-5535/BUILDING.txt
hadoop/common/branches/HDFS-5535/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml
Propchange: hadoop/common/branches/HDFS-5535/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1558255-1559304
Modified: hadoop/common/branches/HDFS-5535/BUILDING.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/BUILDING.txt?rev=1559305&r1=1559304&r2=1559305&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/BUILDING.txt (original)
+++ hadoop/common/branches/HDFS-5535/BUILDING.txt Sat Jan 18 02:24:38 2014
@@ -183,11 +183,11 @@ Building on Windows
Requirements:
* Windows System
-* JDK 1.6
-* Maven 3.0
-* Windows SDK or Visual Studio 2010 Professional
-* ProtocolBuffer 2.4.1+ (for MapReduce and HDFS)
+* JDK 1.6+
+* Maven 3.0 or later
* Findbugs 1.3.9 (if running findbugs)
+* ProtocolBuffer 2.5.0
+* Windows SDK or Visual Studio 2010 Professional
* Unix command-line tools from GnuWin32 or Cygwin: sh, mkdir, rm, cp, tar, gzip
* Internet connection for first build (to fetch all Maven and Hadoop
dependencies)
Modified:
hadoop/common/branches/HDFS-5535/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml?rev=1559305&r1=1559304&r2=1559305&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5535/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
(original)
+++
hadoop/common/branches/HDFS-5535/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
Sat Jan 18 02:24:38 2014
@@ -207,8 +207,7 @@
<outputDirectory>/share/hadoop/${hadoop.component}/lib</outputDirectory>
<!-- Exclude hadoop artifacts. They will be found via HADOOP* env -->
<excludes>
- <exclude>org.apache.hadoop:hadoop-common</exclude>
- <exclude>org.apache.hadoop:hadoop-hdfs</exclude>
+ <exclude>org.apache.hadoop:*</exclude>
<!-- use slf4j from common to avoid multiple binding warnings -->
<exclude>org.slf4j:slf4j-api</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude>
Modified: hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml?rev=1559305&r1=1559304&r2=1559305&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml Sat Jan 18 02:24:38
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>
