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 @@
${project.artifactId}-${project.version}-sources.jar
${project.artifactId}-${project.version}-test-sources.jar
+
+ hadoop-tools-dist-*.jar
+
${basedir}/dev-support/jdiff
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 @@
${project.version}
+
+ org.apache.hadoop
+ hadoop-streaming
+ ${project.version}
+
+
+ org.apache.hadoop
+ hadoop-archives
+ ${project.version}
+
+
com.google.guava
guava
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 @@
+
+
+
+ 4.0.0
+
+ org.apache.hadoop
+ hadoop-project-dist
+ 0.24.0-SNAPSHOT
+ ../../hadoop-project-dist
+
+ org.apache.hadoop
+ hadoop-tools-dist
+ 0.24.0-SNAPSHOT
+ Apache Hadoop Tools Dist
+ Apache Hadoop Tools Dist
+ jar
+
+
+ tools
+ false
+
+
+
+
+ org.apache.hadoop
+ hadoop-streaming
+ compile
+
+
+ org.apache.hadoop
+ hadoop-archives
+ compile
+
+
+
+
+
+
+ maven-deploy-plugin
+
+ true
+
+
+
+ org.apache.rat
+ apache-rat-plugin
+
+
+ pom.xml
+
+
+
+
+
+
+
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 @@
hadoop-streaming
hadoop-archives
+ hadoop-tools-dist