hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject hadoop git commit: HADOOP-11885. hadoop-dist dist-layout-stitching.sh does not work with dash. (wang)
Date Fri, 29 May 2015 21:59:28 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 17fb442a4 -> bdaa0fed1


HADOOP-11885. hadoop-dist dist-layout-stitching.sh does not work with dash. (wang)

(cherry picked from commit 7673d4f205b26a6a26cfc47d999ece96f3c42782)

 Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml
	hadoop-mapreduce-project/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bdaa0fed
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bdaa0fed
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bdaa0fed

Branch: refs/heads/branch-2
Commit: bdaa0fed134aaa3995dfcb24d58f8ca481262406
Parents: 17fb442
Author: Andrew Wang <andrew.wang@cloudera.com>
Authored: Fri May 29 14:54:18 2015 -0700
Committer: Andrew Wang <andrew.wang@cloudera.com>
Committed: Fri May 29 14:55:52 2015 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt                  | 3 +++
 hadoop-common-project/hadoop-common/pom.xml                      | 2 +-
 hadoop-common-project/hadoop-kms/pom.xml                         | 4 ++--
 hadoop-dist/pom.xml                                              | 4 ++--
 hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml                   | 4 ++--
 hadoop-hdfs-project/hadoop-hdfs/pom.xml                          | 2 +-
 hadoop-mapreduce-project/pom.xml                                 | 2 +-
 hadoop-project-dist/pom.xml                                      | 4 ++--
 .../hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml    | 2 +-
 hadoop-yarn-project/pom.xml                                      | 2 +-
 pom.xml                                                          | 2 ++
 11 files changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/bdaa0fed/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 398e7c3..06a3343 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -155,6 +155,9 @@ Release 2.8.0 - UNRELEASED
     HADOOP-11242. Record the time of calling in tracing span of
     IPC server. (Masatake Iwasaki via aajisaka)
 
+    HADOOP-11885. hadoop-dist dist-layout-stitching.sh does not work with dash.
+    (wang)
+
   BUG FIXES
 
     HADOOP-11802: DomainSocketWatcher thread terminates sometimes after there

http://git-wip-us.apache.org/repos/asf/hadoop/blob/bdaa0fed/hadoop-common-project/hadoop-common/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 03c0f60..06700b9 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -625,7 +625,7 @@
                 <goals><goal>run</goal></goals>
                 <configuration>
                   <target>
-                    <exec executable="sh" failonerror="true" dir="${project.build.directory}/native">
+                    <exec executable="${shell-executable}" failonerror="true" dir="${project.build.directory}/native">
                       <arg value="-c"/>
                       <arg value="[ x$SKIPTESTS = xtrue ] || ${project.build.directory}/native/test_bulk_crc32"/>
                       <env key="SKIPTESTS" value="${skipTests}"/>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/bdaa0fed/hadoop-common-project/hadoop-kms/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-kms/pom.xml b/hadoop-common-project/hadoop-kms/pom.xml
index a49cc8e..1181dfb 100644
--- a/hadoop-common-project/hadoop-kms/pom.xml
+++ b/hadoop-common-project/hadoop-kms/pom.xml
@@ -383,7 +383,7 @@
                       cd "${project.build.directory}/tomcat.exp"
                       gzip -cd ../../downloads/apache-tomcat-${tomcat.version}.tar.gz | tar
xf -
                     </echo>
-                    <exec executable="sh" dir="${project.build.directory}"
+                    <exec executable="${shell-executable}" dir="${project.build.directory}"
                           failonerror="true">
                       <arg line="./tomcat-untar.sh"/>
                     </exec>
@@ -426,7 +426,7 @@
                       cd "${project.build.directory}"
                       tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz
                     </echo>
-                    <exec executable="sh" dir="${project.build.directory}"
+                    <exec executable="${shell-executable}" dir="${project.build.directory}"
                           failonerror="true">
                       <arg line="./dist-maketar.sh"/>
                     </exec>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/bdaa0fed/hadoop-dist/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml
index 08deba6..e09e108 100644
--- a/hadoop-dist/pom.xml
+++ b/hadoop-dist/pom.xml
@@ -130,7 +130,7 @@
                       echo "Hadoop dist layout available at: ${project.build.directory}/hadoop-${project.version}"
                       echo
                     </echo>
-                    <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+                    <exec executable="${shell-executable}" dir="${project.build.directory}"
failonerror="true">
                       <arg line="./dist-layout-stitching.sh"/>
                     </exec>
                   </target>
@@ -163,7 +163,7 @@
                       echo "Hadoop dist tar available at: ${project.build.directory}/hadoop-${project.version}.tar.gz"
                       echo
                     </echo>
-                    <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+                    <exec executable="${shell-executable}" dir="${project.build.directory}"
failonerror="true">
                       <arg line="./dist-tar-stitching.sh"/>
                     </exec>
                   </target>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/bdaa0fed/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
index 3345cc6..c2fe2bf 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
@@ -517,7 +517,7 @@
                       cd "${project.build.directory}/tomcat.exp"
                       gzip -cd ../../downloads/apache-tomcat-${tomcat.version}.tar.gz | tar
xf -
                     </echo>
-                    <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+                    <exec executable="${shell-executable}" dir="${project.build.directory}"
failonerror="true">
                       <arg line="./tomcat-untar.sh"/>
                     </exec>
 
@@ -557,7 +557,7 @@
                       cd "${project.build.directory}"
                       tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz
                     </echo>
-                    <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+                    <exec executable="${shell-executable}" dir="${project.build.directory}"
failonerror="true">
                       <arg line="./dist-maketar.sh"/>
                     </exec>
                   </target>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/bdaa0fed/hadoop-hdfs-project/hadoop-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index 0f9f555..cf236a0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -594,7 +594,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
                 <phase>test-compile</phase>
                 <configuration>
                   <target>
-                    <exec executable="sh">
+                    <exec executable="${shell-executable}">
                       <arg value="-c"/>
                       <arg value="for i in {1..${testsThreadCount}}; do mkdir -p ${test.build.data}/$i;
mkdir -p ${hadoop.tmp.dir}/$i; done"/>
                     </exec>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/bdaa0fed/hadoop-mapreduce-project/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/pom.xml b/hadoop-mapreduce-project/pom.xml
index 669b09b..26497ca 100644
--- a/hadoop-mapreduce-project/pom.xml
+++ b/hadoop-mapreduce-project/pom.xml
@@ -170,7 +170,7 @@
                   cd "${project.build.directory}"
                   tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz
                 </echo>
-                <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+                <exec executable="${shell-executable}" dir="${project.build.directory}"
failonerror="true">
                   <arg line="./dist-maketar.sh"/>
                 </exec>
               </target>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/bdaa0fed/hadoop-project-dist/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-project-dist/pom.xml b/hadoop-project-dist/pom.xml
index 9779f13..5a48bcd 100644
--- a/hadoop-project-dist/pom.xml
+++ b/hadoop-project-dist/pom.xml
@@ -377,7 +377,7 @@
                         fi
                       fi
                     </echo>
-                    <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+                    <exec executable="${shell-executable}" dir="${project.build.directory}"
failonerror="true">
                       <arg line="./dist-copynativelibs.sh"/>
                     </exec>
                   </target>
@@ -396,7 +396,7 @@
                       cd "${project.build.directory}"
                       tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz
                     </echo>
-                    <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+                    <exec executable="${shell-executable}" dir="${project.build.directory}"
failonerror="true">
                       <arg line="./dist-maketar.sh"/>
                     </exec>
                   </target>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/bdaa0fed/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
index e1f40f8..1768d5c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
@@ -203,7 +203,7 @@
                 <phase>test</phase>
                 <configuration>
                   <target>
-                    <exec executable="sh" failonerror="true" dir="${project.build.directory}/native">
+                    <exec executable="${shell-executable}" failonerror="true" dir="${project.build.directory}/native">
                       <arg value="-c"/>
                       <arg value="[ x$SKIPTESTS = xtrue ] || test-container-executor"/>
                       <env key="SKIPTESTS" value="${skipTests}"/>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/bdaa0fed/hadoop-yarn-project/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/pom.xml b/hadoop-yarn-project/pom.xml
index 5eb82c0..2cd5ce8 100644
--- a/hadoop-yarn-project/pom.xml
+++ b/hadoop-yarn-project/pom.xml
@@ -96,7 +96,7 @@
                   cd "${project.build.directory}"
                   tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz
                 </echo>
-                <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+                <exec executable="${shell-executable}" dir="${project.build.directory}"
failonerror="true">
                   <arg line="./dist-maketar.sh"/>
                 </exec>
               </target>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/bdaa0fed/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d485e8f..6ea2219 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,6 +104,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <maven-bundle-plugin.version>2.5.0</maven-bundle-plugin.version>
     <maven-checkstyle-plugin.version>2.15</maven-checkstyle-plugin.version>
     <checkstyle.version>6.6</checkstyle.version>
+
+    <shell-executable>bash</shell-executable>
   </properties>
 
   <modules>


Mime
View raw message