Author: jlowe
Date: Tue Feb 5 16:06:58 2013
New Revision: 1442641
URL: http://svn.apache.org/viewvc?rev=1442641&view=rev
Log:
svn merge -c 1442639 FIXES: HADOOP-9260. Hadoop version may be not correct when
starting name node or data node. Contributed by Chris Nauroth
Modified:
hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Modified:
hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml?rev=1442641&r1=1442640&r2=1442641&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Tue Feb 5 16:06:58 2013
@@ -91,14 +91,20 @@
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
<include>${project.artifactId}-${project.version}-tests.jar</include>
- <include>${project.artifactId}-${project.version}-sources.jar</include>
-
<include>${project.artifactId}-${project.version}-test-sources.jar</include>
</includes>
<excludes>
<exclude>hadoop-tools-dist-*.jar</exclude>
</excludes>
</fileSet>
<fileSet>
+ <directory>${project.build.directory}</directory>
+
<outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>${project.artifactId}-${project.version}-sources.jar</include>
+
<include>${project.artifactId}-${project.version}-test-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>${basedir}/dev-support/jdiff</directory>
<outputDirectory>/share/hadoop/${hadoop.component}/jdiff</outputDirectory>
</fileSet>
