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 tu...@apache.org on 2012/01/06 01:17:54 UTC
svn commit: r1227905 - in /hadoop/common/branches/branch-0.23:
hadoop-assemblies/src/main/resources/assemblies/ hadoop-dist/
hadoop-project/ hadoop-tools/ hadoop-tools/hadoop-tools-dist/
Author: tucu
Date: Fri Jan 6 00:17:54 2012
New Revision: 1227905
URL: http://svn.apache.org/viewvc?rev=1227905&view=rev
Log:
Merge -r 1227900:1227901 from trunk to branch. FIXES: HADOOP-7907
Added:
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-tools-dist/
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-tools-dist/pom.xml
Modified:
hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml
hadoop/common/branches/branch-0.23/hadoop-project/pom.xml
hadoop/common/branches/branch-0.23/hadoop-tools/pom.xml
Modified: hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml?rev=1227905&r1=1227904&r2=1227905&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml Fri Jan 6 00:17:54 2012
@@ -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>
Modified: hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml?rev=1227905&r1=1227904&r2=1227905&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml Fri Jan 6 00:17:54 2012
@@ -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
Modified: hadoop/common/branches/branch-0.23/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-project/pom.xml?rev=1227905&r1=1227904&r2=1227905&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-project/pom.xml Fri Jan 6 00:17:54 2012
@@ -214,6 +214,17 @@
</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>
<version>r09</version>
Added: hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-tools-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-tools-dist/pom.xml?rev=1227905&view=auto
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-tools-dist/pom.xml (added)
+++ hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-tools-dist/pom.xml Fri Jan 6 00:17:54 2012
@@ -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.23.1-SNAPSHOT</version>
+ <relativePath>../../hadoop-project-dist</relativePath>
+ </parent>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-tools-dist</artifactId>
+ <version>0.23.1-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>
Modified: hadoop/common/branches/branch-0.23/hadoop-tools/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/pom.xml?rev=1227905&r1=1227904&r2=1227905&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-tools/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-tools/pom.xml Fri Jan 6 00:17:54 2012
@@ -30,6 +30,7 @@
<modules>
<module>hadoop-streaming</module>
<module>hadoop-archives</module>
+ <module>hadoop-tools-dist</module>
</modules>
<build>