Author: harsh
Date: Mon May 28 14:58:13 2012
New Revision: 1343275
URL: http://svn.apache.org/viewvc?rev=1343275&view=rev
Log:
svn merge -c 1343272 from trunk. Backport HADOOP-8268 to branch-2. Contributed
by Radim Kolar (harsh)
Modified:
hadoop/common/branches/branch-2/hadoop-assemblies/pom.xml
hadoop/common/branches/branch-2/hadoop-dist/pom.xml
hadoop/common/branches/branch-2/hadoop-project-dist/pom.xml
hadoop/common/branches/branch-2/hadoop-project/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-archives/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-extras/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-tools-dist/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/pom.xml
hadoop/common/branches/branch-2/pom.xml
Modified: hadoop/common/branches/branch-2/hadoop-assemblies/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-assemblies/pom.xml?rev=1343275&r1=1343274&r2=1343275&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-assemblies/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-assemblies/pom.xml Mon May 28
14:58:13 2012
@@ -15,7 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hadoop</groupId>
Modified: hadoop/common/branches/branch-2/hadoop-dist/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-dist/pom.xml?rev=1343275&r1=1343274&r2=1343275&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-dist/pom.xml Mon May 28 14:58:13 2012
@@ -12,7 +12,10 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hadoop</groupId>
Modified: hadoop/common/branches/branch-2/hadoop-project-dist/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project-dist/pom.xml?rev=1343275&r1=1343274&r2=1343275&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project-dist/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project-dist/pom.xml Mon May 28
14:58:13 2012
@@ -12,7 +12,10 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hadoop</groupId>
@@ -340,7 +343,7 @@
<!-- Using Unix script to preserve symlinks -->
<echo
file="${project.build.directory}/dist-copynativelibs.sh">
- which cygpath 2> /dev/null
+ which cygpath 2> /dev/null
if [ $? = 1 ]; then
BUILD_DIR="${project.build.directory}"
else
@@ -377,7 +380,7 @@
<!-- Using Unix script to preserve symlinks -->
<echo file="${project.build.directory}/dist-maketar.sh">
- which cygpath 2> /dev/null
+ which cygpath 2> /dev/null
if [ $? = 1 ]; then
BUILD_DIR="${project.build.directory}"
else
Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1343275&r1=1343274&r2=1343275&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Mon May 28 14:58:13
2012
@@ -12,7 +12,10 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hadoop</groupId>
Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-archives/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-archives/pom.xml?rev=1343275&r1=1343274&r2=1343275&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-archives/pom.xml
(original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-archives/pom.xml Mon
May 28 14:58:13 2012
@@ -12,7 +12,10 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hadoop</groupId>
Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml?rev=1343275&r1=1343274&r2=1343275&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml
(original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml Mon May
28 14:58:13 2012
@@ -12,7 +12,10 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hadoop</groupId>
Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-extras/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-extras/pom.xml?rev=1343275&r1=1343274&r2=1343275&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-extras/pom.xml
(original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-extras/pom.xml Mon May
28 14:58:13 2012
@@ -12,7 +12,10 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hadoop</groupId>
Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/pom.xml?rev=1343275&r1=1343274&r2=1343275&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/pom.xml Mon May
28 14:58:13 2012
@@ -12,7 +12,10 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hadoop</groupId>
Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml?rev=1343275&r1=1343274&r2=1343275&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml
(original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml Mon
May 28 14:58:13 2012
@@ -12,7 +12,10 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hadoop</groupId>
Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-tools-dist/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-tools-dist/pom.xml?rev=1343275&r1=1343274&r2=1343275&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-tools-dist/pom.xml
(original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-tools-dist/pom.xml Mon
May 28 14:58:13 2012
@@ -12,7 +12,10 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hadoop</groupId>
Modified: hadoop/common/branches/branch-2/hadoop-tools/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/pom.xml?rev=1343275&r1=1343274&r2=1343275&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-tools/pom.xml Mon May 28 14:58:13
2012
@@ -12,7 +12,10 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hadoop</groupId>
Modified: hadoop/common/branches/branch-2/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/pom.xml?rev=1343275&r1=1343274&r2=1343275&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/pom.xml (original)
+++ hadoop/common/branches/branch-2/pom.xml Mon May 28 14:58:13 2012
@@ -12,7 +12,9 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-main</artifactId>
