Author: aching
Date: Fri Nov 9 08:11:04 2012
New Revision: 1407375
URL: http://svn.apache.org/viewvc?rev=1407375&view=rev
Log:
GIRAPH-413: Make building Facebook profile easier. (nitay via aching)
Added:
giraph/trunk/lib/
giraph/trunk/lib/hadoop-0.20-core.jar (with props)
Modified:
giraph/trunk/CHANGELOG
giraph/trunk/README
giraph/trunk/dev-support/for-each-profile.sh
giraph/trunk/giraph-formats-contrib/pom.xml
giraph/trunk/giraph/pom.xml
giraph/trunk/pom.xml
Modified: giraph/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1407375&r1=1407374&r2=1407375&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Fri Nov 9 08:11:04 2012
@@ -1,6 +1,8 @@
Giraph Change Log
Release 0.2.0 - unreleased
+ GIRAPH-413: Make building Facebook profile easier. (nitay via aching)
+
GIRAPH-407: Metrics Update (nitay via apresta)
GIRAPH-404: More SendMessageCache improvements (majakabiljo)
Modified: giraph/trunk/README
URL:
http://svn.apache.org/viewvc/giraph/trunk/README?rev=1407375&r1=1407374&r2=1407375&view=diff
==============================================================================
--- giraph/trunk/README (original)
+++ giraph/trunk/README Fri Nov 9 08:11:04 2012
@@ -62,9 +62,7 @@ Unsecure Hadoop versions:
- Facebook Hadoop releases: https://github.com/facebook/hadoop-20, Master
branch
- You may tell maven to use this version with:
-
-mvn -Phadoop_facebook
-Dhadoop.jar.path=/path/to/repo/build/hadoop-0.20.1-dev-core.jar <goals>
+ You may tell maven to use this version with "mvn -Phadoop_facebook <goals>"
-- Other versions reported working include:
--- Cloudera CDH3u0, CDH3u1
@@ -91,16 +89,12 @@ Use the maven commands with secure Hadoo
- test (i.e. mvn test)
For the non-secure versions of Hadoop, run the maven commands with the
-additional argument '-Dhadoop=non_secure' or '-Phadoop_non_secure' to enable
- the maven profile 'hadoop_non_secure'. Example compilation commands are
-'mvn -Dhadoop=non_secure compile' and 'mvn -Phadoop_non_secure compile'.
+additional argument '-Phadoop_non_secure'.
+Example compilation commands is 'mvn -Phadoop_non_secure compile'.
For the Facebook Hadoop release, run the maven commands with the
-additional arguments '-Dhadoop=facebook' or '-Phadoop_facebook' to enable
-the maven profile 'hadoop_facebook' as well as a location for the hadoop
-core jar file. Example compilation commands are 'mvn -Dhadoop=facebook
--Dhadoop.jar.path=/tmp/hadoop-0.20.1-core.jar compile' or 'mvn
-Phadoop_facebook
--Dhadoop.jar.path=/tmp/hadoop-0.20.1-core.jar compile'.
+additional arguments '-Phadoop_facebook'.
+Example compilation commands is 'mvn -Phadoop_facebook compile'.
-------------------------------
Modified: giraph/trunk/dev-support/for-each-profile.sh
URL:
http://svn.apache.org/viewvc/giraph/trunk/dev-support/for-each-profile.sh?rev=1407375&r1=1407374&r2=1407375&view=diff
==============================================================================
--- giraph/trunk/dev-support/for-each-profile.sh (original)
+++ giraph/trunk/dev-support/for-each-profile.sh Fri Nov 9 08:11:04 2012
@@ -28,6 +28,8 @@ function parse_profiles {
parse_profiles
+echo "Running on profiles: $all_profiles"
+
for profile in $all_profiles; do
echo "======================"
echo "=== $profile ==="
Modified: giraph/trunk/giraph-formats-contrib/pom.xml
URL:
http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/pom.xml?rev=1407375&r1=1407374&r2=1407375&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/pom.xml (original)
+++ giraph/trunk/giraph-formats-contrib/pom.xml Fri Nov 9 08:11:04 2012
@@ -31,6 +31,10 @@ under the License.
<name>Apache Giraph Formats</name>
+ <properties>
+ <top.dir>${project.basedir}/..</top.dir>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -38,8 +42,8 @@ under the License.
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.9</version>
<configuration>
- <configLocation>${project.basedir}/../checkstyle.xml</configLocation>
-
<headerLocation>${project.basedir}/../license-header.txt</headerLocation>
+ <configLocation>${top.dir}/checkstyle.xml</configLocation>
+ <headerLocation>${top.dir}/license-header.txt</headerLocation>
<enableRulesSummary>false</enableRulesSummary>
<failOnError>true</failOnError>
<includeTestSourceDirectory>false</includeTestSourceDirectory>
@@ -61,7 +65,7 @@ under the License.
<systemProperties>
<property>
<name>prop.jarLocation</name>
-
<value>${project.basedir}/../giraph/target/giraph-${project.version}-${forHadoop}-jar-with-dependencies.jar</value>
+
<value>${top.dir}/giraph/target/giraph-${project.version}-${forHadoop}-jar-with-dependencies.jar</value>
</property>
</systemProperties>
</configuration>
@@ -73,7 +77,7 @@ under the License.
<configuration>
<xmlOutput>true</xmlOutput>
<findbugsXmlOutput>false</findbugsXmlOutput>
-
<excludeFilterFile>${project.basedir}/../findbugs-exclude.xml</excludeFilterFile>
+
<excludeFilterFile>${top.dir}/findbugs-exclude.xml</excludeFilterFile>
</configuration>
<executions>
<execution>
@@ -122,6 +126,47 @@ under the License.
</repository>
</repositories>
+ <profiles>
+ <profile>
+ <id>hadoop_0.20.203</id>
+ </profile>
+
+ <profile>
+ <id>hadoop_1.0</id>
+ </profile>
+
+ <profile>
+ <id>hadoop_non_secure</id>
+ </profile>
+
+ <profile>
+ <id>hadoop_facebook</id>
+ <properties>
+ <hadoop.fb.jar>${top.dir}/lib/hadoop-0.20-core.jar</hadoop.fb.jar>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>hadoop_0.23</id>
+ </profile>
+
+ <profile>
+ <id>hadoop_2.0.0</id>
+ </profile>
+
+ <profile>
+ <id>hadoop_2.0.1</id>
+ </profile>
+
+ <profile>
+ <id>hadoop_2.0.2</id>
+ </profile>
+
+ <profile>
+ <id>hadoop_trunk</id>
+ </profile>
+ </profiles>
+
<dependencies>
<!-- compile dependencies. sorted lexicographically. -->
<dependency>
Modified: giraph/trunk/giraph/pom.xml
URL:
http://svn.apache.org/viewvc/giraph/trunk/giraph/pom.xml?rev=1407375&r1=1407374&r2=1407375&view=diff
==============================================================================
--- giraph/trunk/giraph/pom.xml (original)
+++ giraph/trunk/giraph/pom.xml Fri Nov 9 08:11:04 2012
@@ -33,6 +33,7 @@ under the License.
<properties>
<export-target.dir>export/target</export-target.dir>
+ <top.dir>${project.basedir}/..</top.dir>
</properties>
<build>
@@ -110,7 +111,7 @@ under the License.
<configuration>
<xmlOutput>true</xmlOutput>
<findbugsXmlOutput>false</findbugsXmlOutput>
-
<excludeFilterFile>${project.basedir}/../findbugs-exclude.xml</excludeFilterFile>
+
<excludeFilterFile>${top.dir}/findbugs-exclude.xml</excludeFilterFile>
</configuration>
<executions>
<execution>
@@ -178,6 +179,9 @@ under the License.
<profile>
<id>hadoop_facebook</id>
+ <properties>
+ <hadoop.fb.jar>${top.dir}/lib/hadoop-0.20-core.jar</hadoop.fb.jar>
+ </properties>
<build>
<plugins>
<plugin>
Added: giraph/trunk/lib/hadoop-0.20-core.jar
URL:
http://svn.apache.org/viewvc/giraph/trunk/lib/hadoop-0.20-core.jar?rev=1407375&view=auto
==============================================================================
Binary file - no diff available.
Propchange: giraph/trunk/lib/hadoop-0.20-core.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: giraph/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/giraph/trunk/pom.xml?rev=1407375&r1=1407374&r2=1407375&view=diff
==============================================================================
--- giraph/trunk/pom.xml (original)
+++ giraph/trunk/pom.xml Fri Nov 9 08:11:04 2012
@@ -476,12 +476,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>
@@ -503,12 +497,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>
@@ -530,13 +518,8 @@ under the License.
<profile>
<id>hadoop_facebook</id>
- <activation>
- <property>
- <name>hadoop</name>
- <value>facebook</value>
- </property>
- </activation>
<properties>
+
<hadoop.fb.jar>${project.basedir}/lib/hadoop-0.20-core.jar</hadoop.fb.jar>
<hadoop.version>0.20.1</hadoop.version>
<munge.symbols>HADOOP_NON_SECURE,HADOOP_NON_JOBCONTEXT_IS_INTERFACE</munge.symbols>
</properties>
@@ -548,7 +531,7 @@ under the License.
<version>${hadoop.version}</version>
<type>jar</type>
<scope>system</scope>
- <systemPath>${hadoop.jar.path}</systemPath>
+ <systemPath>${hadoop.fb.jar}</systemPath>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -567,12 +550,6 @@ 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>
@@ -603,12 +580,6 @@ under the License.
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>
@@ -631,12 +602,6 @@ under the License.
<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>
@@ -659,12 +624,6 @@ under the License.
<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>
@@ -687,12 +646,6 @@ under the License.
<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>
