You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ac...@apache.org on 2012/10/26 01:08:50 UTC
svn commit: r1402352 - in /giraph/trunk: CHANGELOG
giraph-formats-contrib/pom.xml giraph/pom.xml
giraph/src/main/java/org/apache/giraph/utils/LoggerUtils.java pom.xml
Author: aching
Date: Thu Oct 25 23:08:49 2012
New Revision: 1402352
URL: http://svn.apache.org/viewvc?rev=1402352&view=rev
Log:
GIRAPH-376: Facebook Hadoop profile broken. (nitay via aching)
Modified:
giraph/trunk/CHANGELOG
giraph/trunk/giraph-formats-contrib/pom.xml
giraph/trunk/giraph/pom.xml
giraph/trunk/giraph/src/main/java/org/apache/giraph/utils/LoggerUtils.java
giraph/trunk/pom.xml
Modified: giraph/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1402352&r1=1402351&r2=1402352&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Thu Oct 25 23:08:49 2012
@@ -1,6 +1,8 @@
Giraph Change Log
Release 0.2.0 - unreleased
+ GIRAPH-376: Facebook Hadoop profile broken. (nitay via aching)
+
GIRAPH-387: GiraphRunner's better handling of configuration property
arguments. (netj via aching)
Modified: giraph/trunk/giraph-formats-contrib/pom.xml
URL: http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/pom.xml?rev=1402352&r1=1402351&r2=1402352&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/pom.xml (original)
+++ giraph/trunk/giraph-formats-contrib/pom.xml Thu Oct 25 23:08:49 2012
@@ -123,13 +123,13 @@ under the License.
</repositories>
<dependencies>
- <!-- compile dependencies -->
+ <!-- compile dependencies. sorted lexicographically. -->
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
+ <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
@@ -137,14 +137,14 @@ under the License.
<artifactId>giraph</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hcatalog</groupId>
- <artifactId>hcatalog-core</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.hcatalog</groupId>
+ <artifactId>hcatalog-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-common</artifactId>
</dependency>
@@ -159,33 +159,28 @@ under the License.
<type>test-jar</type>
</dependency>
- <!-- provided dependencies -->
+ <!-- provided dependencies. sorted lexicographically. -->
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <!-- test dependencies -->
+ <!-- test dependencies. sorted lexicographically. -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <type>test-jar</type>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
Modified: giraph/trunk/giraph/pom.xml
URL: http://svn.apache.org/viewvc/giraph/trunk/giraph/pom.xml?rev=1402352&r1=1402351&r2=1402352&view=diff
==============================================================================
--- giraph/trunk/giraph/pom.xml (original)
+++ giraph/trunk/giraph/pom.xml Thu Oct 25 23:08:49 2012
@@ -72,10 +72,6 @@ under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
@@ -134,20 +130,6 @@ under the License.
<activation>
<activeByDefault>true</activeByDefault>
</activation>
- <properties>
- <hadoop.version>0.20.203.0</hadoop.version>
- <munge.symbols>HADOOP_NON_JOBCONTEXT_IS_INTERFACE,HADOOP_1_SECURITY,HADOOP_1_SECRET_MANAGER</munge.symbols>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>
@@ -160,26 +142,6 @@ under the License.
<profile>
<id>hadoop_1.0</id>
- <activation>
- <property>
- <name>hadoop</name>
- <value>1.0</value>
- </property>
- </activation>
- <properties>
- <hadoop.version>1.0.2</hadoop.version>
- <munge.symbols>HADOOP_NON_JOBCONTEXT_IS_INTERFACE,HADOOP_1_SECURITY,HADOOP_1_SECRET_MANAGER</munge.symbols>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>
@@ -192,26 +154,6 @@ under the License.
<profile>
<id>hadoop_non_secure</id>
- <activation>
- <property>
- <name>hadoop</name>
- <value>non_secure</value>
- </property>
- </activation>
- <properties>
- <hadoop.version>0.20.2</hadoop.version>
- <munge.symbols>HADOOP_NON_SECURE,HADOOP_NON_JOBCONTEXT_IS_INTERFACE</munge.symbols>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>
@@ -236,34 +178,6 @@ under the License.
<profile>
<id>hadoop_facebook</id>
- <activation>
- <property>
- <name>hadoop</name>
- <value>facebook</value>
- </property>
- </activation>
- <properties>
- <hadoop.version>0.20.1</hadoop.version>
- <munge.symbols>HADOOP_NON_SECURE,HADOOP_NON_JOBCONTEXT_IS_INTERFACE</munge.symbols>
- </properties>
- <dependencies>
- <dependency>
- <groupId>com.facebook.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>${hadoop.version}</version>
- <type>jar</type>
- <scope>system</scope>
- <systemPath>${hadoop.jar.path}</systemPath>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>
@@ -292,38 +206,13 @@ under the License.
<profile>
<id>hadoop_0.23</id>
- <activation>
- <property>
- <name>hadoop</name>
- <value>0.23</value>
- </property>
- </activation>
- <properties>
- <hadoop.version>0.23.1</hadoop.version>
- <munge.symbols>HADOOP_1_SECRET_MANAGER</munge.symbols>
- </properties>
- <dependencies>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-common</artifactId>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>munge-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
@@ -331,174 +220,71 @@ under the License.
</build>
</profile>
- <!-- Help keep future Hadoop versions munge-free:
- All profiles below are munge-free: avoid introducing any munge
- flags on any of the following profiles. -->
<profile>
<id>hadoop_2.0.0</id>
- <activation>
- <property>
- <name>hadoop</name>
- <value>2.0.0</value>
- </property>
- </activation>
- <properties>
- <hadoop.version>2.0.0-alpha</hadoop.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-common</artifactId>
- </dependency>
- </dependencies>
</profile>
<profile>
<id>hadoop_2.0.1</id>
- <activation>
- <property>
- <name>hadoop</name>
- <value>2.0.1</value>
- </property>
- </activation>
- <properties>
- <hadoop.version>2.0.1-alpha</hadoop.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-common</artifactId>
- </dependency>
- </dependencies>
</profile>
- <profile>
+ <profile>
<id>hadoop_2.0.2</id>
- <activation>
- <property>
- <name>hadoop</name>
- <value>2.0.2</value>
- </property>
- </activation>
- <properties>
- <hadoop.version>2.0.2-alpha</hadoop.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-common</artifactId>
- </dependency>
- </dependencies>
</profile>
<profile>
<id>hadoop_trunk</id>
- <activation>
- <property>
- <name>hadoop</name>
- <value>trunk</value>
- </property>
- </activation>
- <properties>
- <hadoop.version>3.0.0-SNAPSHOT</hadoop.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-auth</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </dependency>
- </dependencies>
</profile>
</profiles>
<dependencies>
- <!-- compile dependencies -->
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-collections</artifactId>
- </dependency>
+ <!-- compile dependencies. sorted lexicographically. -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
+ <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
</dependency>
<dependency>
<groupId>net.iharder</groupId>
<artifactId>base64</artifactId>
</dependency>
<dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-collections</artifactId>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
</dependency>
- <!-- test dependencies -->
+ <!-- test dependencies. sorted lexicographically. -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: giraph/trunk/giraph/src/main/java/org/apache/giraph/utils/LoggerUtils.java
URL: http://svn.apache.org/viewvc/giraph/trunk/giraph/src/main/java/org/apache/giraph/utils/LoggerUtils.java?rev=1402352&r1=1402351&r2=1402352&view=diff
==============================================================================
--- giraph/trunk/giraph/src/main/java/org/apache/giraph/utils/LoggerUtils.java (original)
+++ giraph/trunk/giraph/src/main/java/org/apache/giraph/utils/LoggerUtils.java Thu Oct 25 23:08:49 2012
@@ -37,13 +37,13 @@ public class LoggerUtils {
* @param context Context to set the status with
* @param logger Logger to write to
* @param level Level of logging
- * @param message Message to
+ * @param message Message to set status with
*/
public static void setStatusAndLog(
TaskAttemptContext context, Logger logger, Level level,
String message) {
try {
- context.setStatus(message);
+ setStatus(context, message);
} catch (IOException e) {
throw new IllegalStateException("setStatusAndLog: Got IOException", e);
}
@@ -51,4 +51,24 @@ public class LoggerUtils {
logger.log(level, message);
}
}
+
+ /**
+ * Set Hadoop status message.
+ *
+ * NOTE: In theory this function could get folded in to the callsites, but
+ * the issue is that some Hadoop jars, e.g. 0.23 and 2.0.0, don't actually
+ * throw IOException on setStatus while others do. This makes wrapping it in a
+ * try/catch cause a compile error on those Hadoops. With this function every
+ * caller sees a method that throws IOException. In case it doesn't actually,
+ * there is no more compiler error because not throwing a decalred exception
+ * is at best a warning.
+ *
+ * @param context Context to set the status with
+ * @param message Message to set status with
+ * @throws IOException If something goes wrong with setting status message
+ */
+ private static void setStatus(TaskAttemptContext context, String message)
+ throws IOException {
+ context.setStatus(message);
+ }
}
Modified: giraph/trunk/pom.xml
URL: http://svn.apache.org/viewvc/giraph/trunk/pom.xml?rev=1402352&r1=1402351&r2=1402352&view=diff
==============================================================================
--- giraph/trunk/pom.xml (original)
+++ giraph/trunk/pom.xml Thu Oct 25 23:08:49 2012
@@ -31,11 +31,6 @@ under the License.
<description>Giraph : Large-scale graph processing on Hadoop</description>
<inceptionYear>2011</inceptionYear>
- <modules>
- <module>giraph</module>
- <module>giraph-formats-contrib</module>
- </modules>
-
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/giraph</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/giraph/trunk</developerConnection>
@@ -230,7 +225,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
<executions>
<execution>
<id>build-fat-jar</id>
@@ -310,7 +305,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.6</version>
+ <version>2.9</version>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -443,35 +438,11 @@ under the License.
<goals>
<goal>munge</goal>
</goals>
+ <configuration>
+ <symbols>${munge.symbols}</symbols>
+ </configuration>
</execution>
</executions>
- <configuration>
- <symbols>${munge.symbols}</symbols>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <versionRange>[2.2,)</versionRange>
- <goals>
- <goal>single</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
</plugin>
</plugins>
</pluginManagement>
@@ -485,7 +456,21 @@ under the License.
</activation>
<properties>
<hadoop.version>0.20.203.0</hadoop.version>
+ <munge.symbols>HADOOP_NON_JOBCONTEXT_IS_INTERFACE,HADOOP_1_SECURITY,HADOOP_1_SECRET_MANAGER</munge.symbols>
</properties>
+ <dependencies>
+ <!-- sorted lexicographically -->
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>${hadoop.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</profile>
<profile>
@@ -498,7 +483,21 @@ under the License.
</activation>
<properties>
<hadoop.version>1.0.2</hadoop.version>
+ <munge.symbols>HADOOP_NON_JOBCONTEXT_IS_INTERFACE,HADOOP_1_SECURITY,HADOOP_1_SECRET_MANAGER</munge.symbols>
</properties>
+ <dependencies>
+ <!-- sorted lexicographically -->
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>${hadoop.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</profile>
<profile>
@@ -511,7 +510,21 @@ under the License.
</activation>
<properties>
<hadoop.version>0.20.2</hadoop.version>
+ <munge.symbols>HADOOP_NON_SECURE,HADOOP_NON_JOBCONTEXT_IS_INTERFACE</munge.symbols>
</properties>
+ <dependencies>
+ <!-- sorted lexicographically -->
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>${hadoop.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</profile>
<profile>
@@ -524,7 +537,31 @@ under the License.
</activation>
<properties>
<hadoop.version>0.20.1</hadoop.version>
+ <munge.symbols>HADOOP_NON_SECURE,HADOOP_NON_JOBCONTEXT_IS_INTERFACE</munge.symbols>
</properties>
+ <dependencies>
+ <!-- sorted lexicographically -->
+ <dependency>
+ <groupId>com.facebook.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>${hadoop.version}</version>
+ <type>jar</type>
+ <scope>system</scope>
+ <systemPath>${hadoop.jar.path}</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </dependency>
+ </dependencies>
</profile>
<profile>
@@ -536,12 +573,32 @@ under the License.
</property>
</activation>
<properties>
- <hadoop.version>0.23.3</hadoop.version>
+ <hadoop.version>0.23.1</hadoop.version>
+ <munge.symbols>HADOOP_1_SECRET_MANAGER</munge.symbols>
</properties>
+ <dependencies>
+ <!-- sorted lexicographically -->
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ </dependency>
+ </dependencies>
</profile>
- <!-- Help keep future Hadoop versions munge-free:
- All profiles below are munge-free: avoid introducing any munge
+ <!-- Help keep future Hadoop versions munge-free:
+ All profiles below are munge-free: avoid introducing any munge
flags on any of the following profiles. -->
<profile>
<id>hadoop_2.0.0</id>
@@ -554,11 +611,26 @@ under the License.
<properties>
<hadoop.version>2.0.0-alpha</hadoop.version>
</properties>
+ <dependencies>
+ <!-- sorted lexicographically -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ </dependency>
+ </dependencies>
</profile>
<profile>
<id>hadoop_2.0.1</id>
- <activation>
+ <activation>
<property>
<name>hadoop</name>
<value>2.0.1</value>
@@ -567,11 +639,26 @@ under the License.
<properties>
<hadoop.version>2.0.1-alpha</hadoop.version>
</properties>
+ <dependencies>
+ <!-- sorted lexicographically -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ </dependency>
+ </dependencies>
</profile>
<profile>
<id>hadoop_2.0.2</id>
- <activation>
+ <activation>
<property>
<name>hadoop</name>
<value>2.0.2</value>
@@ -580,6 +667,21 @@ under the License.
<properties>
<hadoop.version>2.0.2-alpha</hadoop.version>
</properties>
+ <dependencies>
+ <!-- sorted lexicographically -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ </dependency>
+ </dependencies>
</profile>
<profile>
@@ -593,23 +695,55 @@ under the License.
<properties>
<hadoop.version>3.0.0-SNAPSHOT</hadoop.version>
</properties>
+ <dependencies>
+ <!-- sorted lexicographically -->
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
<dependencyManagement>
<dependencies>
- <!-- compile dependencies -->
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- </dependency>
+ <!-- compile dependencies. sorted lexicographically. -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>12.0</version>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<version>3.5.3.Final</version>
@@ -620,11 +754,6 @@ under the License.
<version>2.3.8</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.2</version>
- </dependency>
- <dependency>
<groupId>org.apache.giraph</groupId>
<artifactId>giraph</artifactId>
<version>${project.version}</version>
@@ -686,7 +815,7 @@ under the License.
<version>20090211</version>
</dependency>
- <!-- provided dependencies -->
+ <!-- provided dependencies. sorted lexicographically. -->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -719,12 +848,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>${hadoop.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-common</artifactId>
<version>${hadoop.version}</version>
<scope>provided</scope>
@@ -742,7 +865,7 @@ under the License.
<scope>provided</scope>
</dependency>
- <!-- runtime dependencies -->
+ <!-- runtime dependencies. sorted lexicographically. -->
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
@@ -762,7 +885,7 @@ under the License.
<scope>runtime</scope>
</dependency>
- <!-- test dependencies -->
+ <!-- test dependencies. sorted lexicographically. -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -770,12 +893,6 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <version>${hadoop.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
<type>test-jar</type>
@@ -783,6 +900,12 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <version>${hadoop.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.8.5</version>
@@ -791,4 +914,9 @@ under the License.
</dependencies>
</dependencyManagement>
+ <modules>
+ <module>giraph</module>
+ <module>giraph-formats-contrib</module>
+ </modules>
+
</project>