From b3bcbe274d0cea1c8fec4aa0691cd6421c7e8b31 Mon Sep 17 00:00:00 2001
From: Alejandro Abdelnur <tucu@apache.org>
Date: Fri, 6 Jan 2012 00:02:04 +0000
Subject: [PATCH] HADOOP-7907. hadoop-tools JARs are not part of the distro.
 (tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227901 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/resources/assemblies/hadoop-dist.xml |  3 +
 .../hadoop-common/CHANGES.txt                 |  2 +
 hadoop-dist/pom.xml                           |  1 +
 hadoop-project/pom.xml                        | 11 +++
 hadoop-tools/hadoop-tools-dist/pom.xml        | 68 +++++++++++++++++++
 hadoop-tools/pom.xml                          |  1 +
 6 files changed, 86 insertions(+)
 create mode 100644 hadoop-tools/hadoop-tools-dist/pom.xml

diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
index 788ba4a8f9..4762861e63 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
@@ -94,6 +94,9 @@
         <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>${basedir}/dev-support/jdiff</directory>
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 834b3abe6e..faf1f3104b 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -256,6 +256,8 @@ Release 0.23.1 - Unreleased
 
    HADOOP_7917. compilation of protobuf files fails in windows/cygwin. (tucu)
 
+   HADOOP-7907. hadoop-tools JARs are not part of the distro. (tucu)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml
index 888d533327..de47700c99 100644
--- a/hadoop-dist/pom.xml
+++ b/hadoop-dist/pom.xml
@@ -118,6 +118,7 @@
                       run cp -r $ROOT/hadoop-hdfs-project/hadoop-hdfs/target/hadoop-hdfs-${project.version}/* .
                       run cp -r $ROOT/hadoop-hdfs-project/hadoop-hdfs-httpfs/target/hadoop-hdfs-httpfs-${project.version}/* .
                       run cp -r $ROOT/hadoop-mapreduce-project/target/hadoop-mapreduce-${project.version}/* .
+                      run cp -r $ROOT/hadoop-tools/hadoop-tools-dist/target/hadoop-tools-dist-${project.version}/* .
                       echo
                       echo "Hadoop dist layout available at: ${project.build.directory}/hadoop-${project.version}"
                       echo
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 26144c7f25..48518bfa39 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -213,6 +213,17 @@
         <version>${project.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-streaming</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-archives</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
new file mode 100644
index 0000000000..afa16b54b6
--- /dev/null
+++ b/hadoop-tools/hadoop-tools-dist/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.hadoop</groupId>
+    <artifactId>hadoop-project-dist</artifactId>
+    <version>0.24.0-SNAPSHOT</version>
+    <relativePath>../../hadoop-project-dist</relativePath>
+  </parent>
+  <groupId>org.apache.hadoop</groupId>
+  <artifactId>hadoop-tools-dist</artifactId>
+  <version>0.24.0-SNAPSHOT</version>
+  <description>Apache Hadoop Tools Dist</description>
+  <name>Apache Hadoop Tools Dist</name>
+  <packaging>jar</packaging>
+
+  <properties>
+    <hadoop.component>tools</hadoop.component>
+    <is.hadoop.component>false</is.hadoop.component>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-streaming</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-archives</artifactId>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>pom.xml</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
index aa4e20fc56..2a8b5cf810 100644
--- a/hadoop-tools/pom.xml
+++ b/hadoop-tools/pom.xml
@@ -30,6 +30,7 @@
   <modules>
     <module>hadoop-streaming</module>
     <module>hadoop-archives</module>
+    <module>hadoop-tools-dist</module>
   </modules>
 
   <build>