hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject svn commit: r1351833 - in /hadoop/common/branches/branch-0.23: ./ hadoop-assemblies/src/main/resources/assemblies/ hadoop-project/ hadoop-project/src/site/ hadoop-tools/ hadoop-tools/hadoop-pipes/ hadoop-tools/hadoop-pipes/src/ hadoop-tools/hadoop-pipe...
Date Tue, 19 Jun 2012 20:12:19 GMT
Author: bobby
Date: Tue Jun 19 20:12:16 2012
New Revision: 1351833

URL: http://svn.apache.org/viewvc?rev=1351833&view=rev
Log:
svn merge -c 1351818. FIXESL MAPREDUCE-4267. mavenize pipes (tgraves via bobby)

Added:
    hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
      - copied unchanged from r1351818, hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/
      - copied from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/pom.xml
      - copied, changed from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/pom.xml
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/
      - copied from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/CMakeLists.txt
      - copied unchanged from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/CMakeLists.txt
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/
      - copied from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/
      - copied from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/examples/
      - copied from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/examples/README.txt
      - copied unchanged from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/README.txt
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/
      - copied from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word-part.xml
      - copied unchanged from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word-part.xml
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word.xml
      - copied unchanged from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word.xml
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/
      - copied from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/sort.cc
      - copied unchanged from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/sort.cc
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-nopipe.cc
      - copied unchanged from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-nopipe.cc
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-part.cc
      - copied unchanged from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-part.cc
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-simple.cc
      - copied unchanged from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-simple.cc
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/pipes/
      - copied from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/
      - copied from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/
      - copied from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/Pipes.hh
      - copied unchanged from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/Pipes.hh
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/TemplateFactory.hh
      - copied unchanged from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/TemplateFactory.hh
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/
      - copied from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-gdb-commands.txt
      - copied unchanged from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-gdb-commands.txt
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-script
      - copied unchanged from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-script
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/
      - copied from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc
      - copied unchanged from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/utils/
      - copied from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/utils/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/utils/api/
      - copied from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/utils/api/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/
      - copied from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/SerialUtils.hh
      - copied unchanged from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/SerialUtils.hh
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/StringUtils.hh
      - copied unchanged from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/StringUtils.hh
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/
      - copied from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/SerialUtils.cc
      - copied unchanged from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/SerialUtils.cc
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/StringUtils.cc
      - copied unchanged from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/StringUtils.cc
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/src/main/native/utils/m4/
      - copied from r1351818, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/utils/m4/
Modified:
    hadoop/common/branches/branch-0.23/   (props changed)
    hadoop/common/branches/branch-0.23/hadoop-project/   (props changed)
    hadoop/common/branches/branch-0.23/hadoop-project/src/site/   (props changed)
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-tools-dist/pom.xml
    hadoop/common/branches/branch-0.23/hadoop-tools/pom.xml

Propchange: hadoop/common/branches/branch-0.23/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk:r1351818

Propchange: hadoop/common/branches/branch-0.23/hadoop-project/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-project:r1351818

Propchange: hadoop/common/branches/branch-0.23/hadoop-project/src/site/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-project/src/site:r1351818

Copied: hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/pom.xml (from r1351818,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/pom.xml)
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/pom.xml?p2=hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/pom.xml&p1=hadoop/common/trunk/hadoop-tools/hadoop-pipes/pom.xml&r1=1351818&r2=1351833&rev=1351833&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-tools/hadoop-pipes/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/pom.xml Tue Jun 19 20:12:16
2012
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>0.23.3-SNAPSHOT</version>
     <relativePath>../../hadoop-project</relativePath>
   </parent>
   <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-pipes</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
+  <version>0.23.3-SNAPSHOT</version>
   <description>Apache Hadoop Pipes</description>
   <name>Apache Hadoop Pipes</name>
   <packaging>pom</packaging>

Modified: 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=1351833&r1=1351832&r2=1351833&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-tools-dist/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-tools-dist/pom.xml Tue Jun 19 20:12:16
2012
@@ -67,6 +67,13 @@
       <artifactId>hadoop-gridmix</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-pipes</artifactId>
+      <scope>compile</scope>
+      <type>pom</type>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -89,4 +96,44 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>dist</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-assemblies</artifactId>
+                <version>${project.version}</version>
+              </dependency>
+            </dependencies>
+            <executions>
+              <execution>
+                <id>dist</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  <attach>false</attach>
+                  <finalName>${project.artifactId}-${project.version}</finalName>
+                  <descriptorRefs>
+                    <descriptorRef>hadoop-tools</descriptorRef>
+                  </descriptorRefs>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </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=1351833&r1=1351832&r2=1351833&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-tools/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-tools/pom.xml Tue Jun 19 20:12:16 2012
@@ -36,6 +36,7 @@
     <module>hadoop-datajoin</module>
     <module>hadoop-tools-dist</module>
     <module>hadoop-extras</module>
+    <module>hadoop-pipes</module>
   </modules>
 
   <build>



Mime
View raw message