You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2016/03/14 21:00:17 UTC
[08/20] hadoop git commit: HADOOP-12899. External distribution
stitching scripts do not work correctly on Windows. Contributed by Chris
Nauroth.
HADOOP-12899. External distribution stitching scripts do not work correctly on Windows. Contributed by Chris Nauroth.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/adf1cdf3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/adf1cdf3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/adf1cdf3
Branch: refs/heads/HDFS-1312
Commit: adf1cdf3d5abed0dae76a4967129ce64f2e16c2f
Parents: 79961ec
Author: Chris Nauroth <cn...@apache.org>
Authored: Thu Mar 10 14:49:08 2016 -0800
Committer: Chris Nauroth <cn...@apache.org>
Committed: Thu Mar 10 14:49:08 2016 -0800
----------------------------------------------------------------------
hadoop-dist/pom.xml | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/adf1cdf3/hadoop-dist/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml
index ce1bd92..42e74cb 100644
--- a/hadoop-dist/pom.xml
+++ b/hadoop-dist/pom.xml
@@ -90,16 +90,17 @@
<id>dist</id>
<phase>prepare-package</phase>
<goals>
- <goal>exec</goal>
+ <goal>exec</goal>
</goals>
<configuration>
- <executable>${basedir}/../dev-support/bin/dist-layout-stitching</executable>
- <workingDirectory>${project.build.directory}</workingDirectory>
- <requiresOnline>false</requiresOnline>
- <arguments>
- <argument>${project.version}</argument>
- <argument>${project.build.directory}</argument>
- </arguments>
+ <executable>${shell-executable}</executable>
+ <workingDirectory>${project.build.directory}</workingDirectory>
+ <requiresOnline>false</requiresOnline>
+ <arguments>
+ <argument>${basedir}/../dev-support/bin/dist-layout-stitching</argument>
+ <argument>${project.version}</argument>
+ <argument>${project.build.directory}</argument>
+ </arguments>
</configuration>
</execution>
<execution>
@@ -109,12 +110,13 @@
<goal>exec</goal>
</goals>
<configuration>
- <executable>${basedir}/../dev-support/bin/dist-tar-stitching</executable>
+ <executable>${shell-executable}</executable>
<workingDirectory>${project.build.directory}</workingDirectory>
<requiresOnline>false</requiresOnline>
<arguments>
- <argument>${project.version}</argument>
- <argument>${project.build.directory}</argument>
+ <argument>${basedir}/../dev-support/bin/dist-tar-stitching</argument>
+ <argument>${project.version}</argument>
+ <argument>${project.build.directory}</argument>
</arguments>
</configuration>
</execution>