Author: todd
Date: Wed Dec 14 23:34:04 2011
New Revision: 1214546
URL: http://svn.apache.org/viewvc?rev=1214546&view=rev
Log:
Committing rest of merge from trunk (accidentally only committed the HDFS
portion before)
Modified:
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/pom.xml
Modified:
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml?rev=1214546&r1=1214545&r2=1214546&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
Wed Dec 14 23:34:04 2011
@@ -270,6 +270,13 @@
<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>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Modified: hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/pom.xml?rev=1214546&r1=1214545&r2=1214546&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/pom.xml Wed Dec 14
23:34:04 2011
@@ -30,6 +30,7 @@
<modules>
<module>hadoop-hdfs</module>
<module>hadoop-hdfs-httpfs</module>
+ <module>hadoop-hdfs/src/contrib/bkjournal</module>
</modules>
<build>
