hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1399972 - in /hadoop/common/trunk: dev-support/ dev-support/cmake-maven-ng-plugin/ dev-support/pom.xml dev-support/test-patch.sh hadoop-project/pom.xml hadoop-tools/hadoop-pipes/pom.xml pom.xml
Date Fri, 19 Oct 2012 05:38:27 GMT
Author: tucu
Date: Fri Oct 19 05:38:26 2012
New Revision: 1399972

URL: http://svn.apache.org/viewvc?rev=1399972&view=rev
Log:
reverting commit 1399898 (HADOOP-8887)

Removed:
    hadoop/common/trunk/dev-support/cmake-maven-ng-plugin/
    hadoop/common/trunk/dev-support/pom.xml
Modified:
    hadoop/common/trunk/dev-support/   (props changed)
    hadoop/common/trunk/dev-support/test-patch.sh
    hadoop/common/trunk/hadoop-project/pom.xml
    hadoop/common/trunk/hadoop-tools/hadoop-pipes/pom.xml
    hadoop/common/trunk/pom.xml

Propchange: hadoop/common/trunk/dev-support/
            ('svn:ignore' removed)

Modified: hadoop/common/trunk/dev-support/test-patch.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/dev-support/test-patch.sh?rev=1399972&r1=1399971&r2=1399972&view=diff
==============================================================================
--- hadoop/common/trunk/dev-support/test-patch.sh (original)
+++ hadoop/common/trunk/dev-support/test-patch.sh Fri Oct 19 05:38:26 2012
@@ -418,9 +418,8 @@ checkJavadocWarnings () {
   echo ""
   echo "There appear to be $javadocWarnings javadoc warnings generated by the patched build."
 
-  # There are 14 warnings that are caused by things that are caused by using sun
-  # internal APIs, and using Maven plugin annotations in comments.
-  OK_JAVADOC_WARNINGS=14;
+  #There are 6 warnings that are caused by things that are caused by using sun internal APIs.
+  OK_JAVADOC_WARNINGS=6;
   ### if current warnings greater than OK_JAVADOC_WARNINGS
   if [[ $javadocWarnings -ne $OK_JAVADOC_WARNINGS ]] ; then
     JIRA_COMMENT="$JIRA_COMMENT

Modified: hadoop/common/trunk/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/pom.xml?rev=1399972&r1=1399971&r2=1399972&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-project/pom.xml (original)
+++ hadoop/common/trunk/hadoop-project/pom.xml Fri Oct 19 05:38:26 2012
@@ -700,11 +700,6 @@
           <version>2.3.1</version>
         </plugin>
         <plugin>
-          <groupId>org.apache.hadoop.cmake.maven.ng</groupId>
-          <artifactId>cmake-ng</artifactId>
-          <version>3.0.0-SNAPSHOT</version>
-        </plugin>
-        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
           <version>2.3.1</version>

Modified: hadoop/common/trunk/hadoop-tools/hadoop-pipes/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-pipes/pom.xml?rev=1399972&r1=1399971&r2=1399972&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-tools/hadoop-pipes/pom.xml (original)
+++ hadoop/common/trunk/hadoop-tools/hadoop-pipes/pom.xml Fri Oct 19 05:38:26 2012
@@ -40,23 +40,38 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>org.apache.hadoop.cmake.maven.ng</groupId>
-            <artifactId>cmake-ng</artifactId>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
             <executions>
               <execution>
-                <id>cmake-compile</id>
-                <goals><goal>compile</goal></goals>
+                <id>make</id>
+                <phase>compile</phase>
+                <goals><goal>run</goal></goals>
                 <configuration>
-                  <target>all</target>
-                  <source>${basedir}/src</source>
-                  <vars>
-                    <JVM_ARCH_DATA_MODEL>${sun.arch.data.model}</JVM_ARCH_DATA_MODEL>
-                  </vars>
-                  <env>
-                    <CFLAGS>${container-executor.additional_cflags}</CFLAGS>
-                  </env>
+                  <target>
+                    <mkdir dir="${project.build.directory}/native"/>
+                    <exec executable="cmake" dir="${project.build.directory}/native" 
+                        failonerror="true">
+                      <arg line="${basedir}/src/ -DJVM_ARCH_DATA_MODEL=${sun.arch.data.model}"/>
+                    </exec>
+                    <exec executable="make" dir="${project.build.directory}/native" failonerror="true">
+                      <arg line="VERBOSE=1"/>
+                    </exec>
+                  </target>
                 </configuration>
               </execution>
+              <!-- TODO wire here native testcases
+              <execution>
+                <id>test</id>
+                <phase>test</phase>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+                <configuration>
+                  <destDir>${project.build.directory}/native/target</destDir>
+                </configuration>
+              </execution>
+              -->
             </executions>
           </plugin>
         </plugins>

Modified: hadoop/common/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/pom.xml?rev=1399972&r1=1399971&r2=1399972&view=diff
==============================================================================
--- hadoop/common/trunk/pom.xml (original)
+++ hadoop/common/trunk/pom.xml Fri Oct 19 05:38:26 2012
@@ -84,7 +84,6 @@ xsi:schemaLocation="http://maven.apache.
   </properties>
 
   <modules>
-    <module>dev-support</module>
     <module>hadoop-project</module>
     <module>hadoop-project-dist</module>
     <module>hadoop-assemblies</module>



Mime
View raw message