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/10/19 07:30:31 UTC
svn commit: r1399971 - in /hadoop/common/branches/branch-2: 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
Author: tucu
Date: Fri Oct 19 05:30:30 2012
New Revision: 1399971
URL: http://svn.apache.org/viewvc?rev=1399971&view=rev
Log:
reverting commit 1399959 (HADOOP-8887 again)
Removed:
hadoop/common/branches/branch-2/dev-support/cmake-maven-ng-plugin/
hadoop/common/branches/branch-2/dev-support/pom.xml
Modified:
hadoop/common/branches/branch-2/dev-support/ (props changed)
hadoop/common/branches/branch-2/dev-support/test-patch.sh
hadoop/common/branches/branch-2/hadoop-project/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-pipes/pom.xml
hadoop/common/branches/branch-2/pom.xml
Propchange: hadoop/common/branches/branch-2/dev-support/
('svn:ignore' removed)
Modified: hadoop/common/branches/branch-2/dev-support/test-patch.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/dev-support/test-patch.sh?rev=1399971&r1=1399970&r2=1399971&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/dev-support/test-patch.sh (original)
+++ hadoop/common/branches/branch-2/dev-support/test-patch.sh Fri Oct 19 05:30:30 2012
@@ -395,9 +395,6 @@ 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;
### if current warnings greater than OK_JAVADOC_WARNINGS
if [[ $javadocWarnings -gt $OK_JAVADOC_WARNINGS ]] ; then
JIRA_COMMENT="$JIRA_COMMENT
Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1399971&r1=1399970&r2=1399971&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Fri Oct 19 05:30:30 2012
@@ -702,11 +702,6 @@
<version>2.3.1</version>
</plugin>
<plugin>
- <groupId>org.apache.hadoop.cmake.maven.ng</groupId>
- <artifactId>cmake-ng</artifactId>
- <version>${project.version}</version>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-pipes/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-pipes/pom.xml?rev=1399971&r1=1399970&r2=1399971&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-pipes/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-pipes/pom.xml Fri Oct 19 05:30:30 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/branches/branch-2/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/pom.xml?rev=1399971&r1=1399970&r2=1399971&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/pom.xml (original)
+++ hadoop/common/branches/branch-2/pom.xml Fri Oct 19 05:30:30 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>