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/04/16 20:39:16 UTC

svn commit: r1326731 - in /incubator/giraph/trunk: CHANGELOG README pom.xml

Author: aching
Date: Mon Apr 16 18:39:16 2012
New Revision: 1326731

URL: http://svn.apache.org/viewvc?rev=1326731&view=rev
Log:
GIRAPH-181: Add Hadoop 1.0 profile to pom.xml. (ekoontz via aching)

Modified:
    incubator/giraph/trunk/CHANGELOG
    incubator/giraph/trunk/README
    incubator/giraph/trunk/pom.xml

Modified: incubator/giraph/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/incubator/giraph/trunk/CHANGELOG?rev=1326731&r1=1326730&r2=1326731&view=diff
==============================================================================
--- incubator/giraph/trunk/CHANGELOG (original)
+++ incubator/giraph/trunk/CHANGELOG Mon Apr 16 18:39:16 2012
@@ -1,6 +1,9 @@
 Giraph Change Log
 
 Release 0.2.0 - unreleased
+
+  GIRAPH-181: Add Hadoop 1.0 profile to pom.xml. (ekoontz via aching)
+
   GIRAPH-183: Add Claudio's FOSDEM presentation (slides and video) 
   to the site. (claudio)
 

Modified: incubator/giraph/trunk/README
URL: http://svn.apache.org/viewvc/incubator/giraph/trunk/README?rev=1326731&r1=1326730&r2=1326731&view=diff
==============================================================================
--- incubator/giraph/trunk/README (original)
+++ incubator/giraph/trunk/README Mon Apr 16 18:39:16 2012
@@ -42,11 +42,15 @@ Secure Hadoop versions:
 profile with the -P flag, maven will use this version. You may also
 explicitly specify it with "mvn -Phadoop_0.20.203 <goals>".
 
--Apache Hadoop 0.23.1
+- Apache Hadoop 1.0.2
+
+  You may tell maven to use this version with "mvn -Phadoop_1.0 <goals>".
+
+- Apache Hadoop 0.23.1
 
   You may tell maven to use this version with "mvn -Phadoop_0.23 <goals>".
 
--Apache Hadoop 3.0.0-SNAPSHOT
+- Apache Hadoop 3.0.0-SNAPSHOT
 
   You may tell maven to use this version with "mvn -Phadoop_trunk <goals>".
 

Modified: incubator/giraph/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/giraph/trunk/pom.xml?rev=1326731&r1=1326730&r2=1326731&view=diff
==============================================================================
--- incubator/giraph/trunk/pom.xml (original)
+++ incubator/giraph/trunk/pom.xml Mon Apr 16 18:39:16 2012
@@ -491,6 +491,42 @@ under the License.
       </build>
     </profile>
     <profile>
+      <id>hadoop_1.0</id>
+      <properties>
+        <hadoop.version>1.0.2</hadoop.version>
+      </properties>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-core</artifactId>
+          <version>${hadoop.version}</version>
+	  <scope>provided</scope>
+        </dependency>
+      </dependencies>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.sonatype.plugins</groupId>
+            <artifactId>munge-maven-plugin</artifactId>
+            <version>${munge-maven-plugin.version}</version>
+            <executions>
+              <execution>
+                <id>munge</id>
+                <phase>generate-sources</phase>
+                <goals>
+                  <goal>munge</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <symbols>HADOOP_NON_SASL_RPC,HADOOP_NON_INTERVERSIONED_RPC</symbols>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
       <id>hadoop_non_secure</id>
        <activation>
         <property>