Author: daryn
Date: Mon Jun 25 18:26:29 2012
New Revision: 1353695
URL: http://svn.apache.org/viewvc?rev=1353695&view=rev
Log:
HDFS-3549. Fix dist tar build fails in hadoop-hdfs-raid project. (Jason Lowe
via daryn)
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-raid/pom.xml
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-raid/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-raid/pom.xml?rev=1353695&r1=1353694&r2=1353695&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-raid/pom.xml (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-raid/pom.xml Mon Jun 25
18:26:29 2012
@@ -97,7 +97,7 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
-
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
+ <excludeFilterFile combine.self="override"></excludeFilterFile>
</configuration>
</plugin>
</plugins>
@@ -148,7 +148,7 @@
<executions>
<execution>
<id>dist</id>
- <phase>package</phase>
+ <phase>prepare-package</phase>
<goals>
<goal>single</goal>
</goals>
@@ -163,38 +163,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>tar</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target if="tar">
- <!-- Using Unix script to preserve symlinks -->
- <echo file="${project.build.directory}/dist-maketar.sh">
-
- which cygpath 2> /dev/null
- if [ $? = 1 ]; then
- BUILD_DIR="${project.build.directory}"
- else
- BUILD_DIR=`cygpath --unix '${project.build.directory}'`
- fi
- cd $BUILD_DIR
- tar czf ${project.artifactId}-${project.version}.tar.gz
${project.artifactId}-${project.version}
- </echo>
- <exec executable="sh" dir="${project.build.directory}"
failonerror="true">
- <arg line="./dist-maketar.sh"/>
- </exec>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1353695&r1=1353694&r2=1353695&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Mon Jun 25
18:26:29 2012
@@ -156,6 +156,8 @@ Trunk (unreleased changes)
HDFS-3550. Fix raid javadoc warnings. (Jason Lowe via daryn)
+ HDFS-3549. Fix dist tar build fails in hadoop-hdfs-raid project. (Jason
Lowe via daryn)
+
Branch-2 ( Unreleased changes )
INCOMPATIBLE CHANGES
