You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by tu...@apache.org on 2012/01/05 21:06:54 UTC
svn commit: r1227805 - in
/hadoop/common/branches/branch-0.23/hadoop-hdfs-project:
hadoop-hdfs-httpfs/pom.xml hadoop-hdfs/pom.xml
Author: tucu
Date: Thu Jan 5 20:06:52 2012
New Revision: 1227805
URL: http://svn.apache.org/viewvc?rev=1227805&view=rev
Log:
Merge -r 1227786:1227787 from trunk to branch. FIXES: HADOOP-7934
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml
Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml?rev=1227805&r1=1227804&r2=1227805&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml Thu Jan 5 20:06:52 2012
@@ -270,11 +270,11 @@
<plugins>
<plugin>
- <!-- workaround for filtered/unfiltered resources in same directory -->
- <!-- remove when maven-eclipse-plugin 2.9 is available -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.6</version>
+ <!-- workaround for filtered/unfiltered resources in same directory -->
+ <!-- remove when maven-eclipse-plugin 2.9 is available -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml?rev=1227805&r1=1227804&r2=1227805&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml Thu Jan 5 20:06:52 2012
@@ -318,47 +318,6 @@
</tasks>
</configuration>
</execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <excludePackageNames>org.apache.hadoop.hdfs.protocol.proto</excludePackageNames>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>CHANGES.txt</exclude>
- <exclude>.idea/**</exclude>
- <exclude>src/main/conf/*</exclude>
- <exclude>src/main/docs/**</exclude>
- <exclude>dev-support/findbugsExcludeFile.xml</exclude>
- <exclude>dev-support/checkstyle*</exclude>
- <exclude>dev-support/jdiff/**</exclude>
- <exclude>dev-support/*tests</exclude>
- <exclude>src/main/native/*</exclude>
- <exclude>src/main/native/config/*</exclude>
- <exclude>src/main/native/m4/*</exclude>
- <exclude>src/test/empty-file</exclude>
- <exclude>src/test/all-tests</exclude>
- <exclude>src/test/resources/*.tgz</exclude>
- <exclude>src/test/resources/data*</exclude>
- <exclude>src/test/resources/editsStored*</exclude>
- <exclude>src/test/resources/empty-file</exclude>
- <exclude>src/main/webapps/datanode/robots.txt</exclude>
- <exclude>src/main/docs/releasenotes.html</exclude>
- <exclude>src/contrib/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
<execution>
<id>xprepare-package-hadoop-daemon</id>
<phase>prepare-package</phase>
@@ -385,7 +344,7 @@
</condition>
<property name="commons.daemon.tar.name"
value="commons-daemon-${commons-daemon.version}-bin-${commons.daemon.os.name}-${commons.daemon.os.arch}.tar.gz"/>
-
+
<mkdir dir="downloads"/>
<get src="http://archive.apache.org/dist/commons/daemon/binaries/${commons-daemon.version}/${commons.daemon.os.name}/${commons.daemon.tar.name}"
dest="downloads/${commons.daemon.tar.name}" verbose="true" skipexisting="true"/>
@@ -404,6 +363,41 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <excludePackageNames>org.apache.hadoop.hdfs.protocol.proto</excludePackageNames>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>CHANGES.txt</exclude>
+ <exclude>.idea/**</exclude>
+ <exclude>src/main/conf/*</exclude>
+ <exclude>src/main/docs/**</exclude>
+ <exclude>dev-support/findbugsExcludeFile.xml</exclude>
+ <exclude>dev-support/checkstyle*</exclude>
+ <exclude>dev-support/jdiff/**</exclude>
+ <exclude>dev-support/*tests</exclude>
+ <exclude>src/main/native/*</exclude>
+ <exclude>src/main/native/config/*</exclude>
+ <exclude>src/main/native/m4/*</exclude>
+ <exclude>src/test/empty-file</exclude>
+ <exclude>src/test/all-tests</exclude>
+ <exclude>src/test/resources/*.tgz</exclude>
+ <exclude>src/test/resources/data*</exclude>
+ <exclude>src/test/resources/editsStored*</exclude>
+ <exclude>src/test/resources/empty-file</exclude>
+ <exclude>src/main/webapps/datanode/robots.txt</exclude>
+ <exclude>src/main/docs/releasenotes.html</exclude>
+ <exclude>src/contrib/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>