giraph-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject git commit: updated refs/heads/trunk to a615507
Date Mon, 10 Feb 2014 03:29:47 GMT
Updated Branches:
  refs/heads/trunk 5542c8a4f -> a615507c5


GIRAPH-794: add support for generic hadoop1 and hadoop2 profiles (rvs)


Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/a615507c
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/a615507c
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/a615507c

Branch: refs/heads/trunk
Commit: a615507c55325f79985706d23be9571302952982
Parents: 5542c8a
Author: Roman Shaposhnik <rvs@apache.org>
Authored: Sun Feb 9 13:25:35 2014 -0800
Committer: Shaposhnik, Roman <rshaposhnik@gopivotal.com>
Committed: Sun Feb 9 19:29:37 2014 -0800

----------------------------------------------------------------------
 CHANGELOG               |  2 +
 giraph-accumulo/pom.xml | 16 +++++++-
 giraph-core/pom.xml     | 28 ++++++++++++--
 giraph-dist/pom.xml     | 18 +++++++++
 giraph-examples/pom.xml | 28 ++++++++++++--
 giraph-hbase/pom.xml    | 16 +++++++-
 giraph-hcatalog/pom.xml | 16 +++++++-
 pom.xml                 | 89 +++++++++++++++++++++++++++++++++++++++-----
 8 files changed, 189 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/a615507c/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index cda5e26..84001c9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 Giraph Change Log
 
 Release 1.1.0 - unreleased
+  GIRAPH-794: add support for generic hadoop1 and hadoop2 profiles (rvs)
+
   GIRAPH-833: Upgrade to ZooKeeper 3.4.5 (aching)
 
   GIRAPH-836: Delay hive preparation until after the arguments are parsed (this allows 

http://git-wip-us.apache.org/repos/asf/giraph/blob/a615507c/giraph-accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-accumulo/pom.xml b/giraph-accumulo/pom.xml
index af40fad..37a1682 100644
--- a/giraph-accumulo/pom.xml
+++ b/giraph-accumulo/pom.xml
@@ -85,6 +85,18 @@ under the License.
   <profiles>
     <profile>
       <id>hadoop_0.20.203</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-test</artifactId>
+          <version>${hadoop.version}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
+      <id>hadoop_1</id>
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
@@ -99,11 +111,11 @@ under the License.
     </profile>
 
     <profile>
-      <id>hadoop_1.0</id>
+      <id>hadoop_2</id>
       <dependencies>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-test</artifactId>
+          <artifactId>hadoop-minicluster</artifactId>
           <version>${hadoop.version}</version>
           <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/giraph/blob/a615507c/giraph-core/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-core/pom.xml b/giraph-core/pom.xml
index 38bae9b..90dd5e4 100644
--- a/giraph-core/pom.xml
+++ b/giraph-core/pom.xml
@@ -133,6 +133,7 @@ under the License.
                   <classpath>
                     <pathelement location="${project.jar}"/>
                     <pathelement path="${maven.dependency.org.apache.hadoop.hadoop-common.jar.path}"/>
+                    <pathelement path="${maven.dependency.org.apache.hadoop.hadoop-core.jar.path}"/>
                   </classpath>
                   <arg value="${top.dir}/src/site/xdoc/options.xml" />
                 </java>
@@ -165,9 +166,6 @@ under the License.
   <profiles>
     <profile>
       <id>hadoop_0.20.203</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
       <build>
         <plugins>
           <plugin>
@@ -191,7 +189,10 @@ under the License.
     </profile>
 
     <profile>
-      <id>hadoop_1.0</id>
+      <id>hadoop_1</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -333,6 +334,25 @@ under the License.
     </profile>
 
     <!-- Unmunged profiles are below. -->
+    <profile>
+      <id>hadoop_2</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>**/yarn/**</exclude>
+              </excludes>
+              <testExcludes>
+                <exclude>**/yarn/**</exclude>
+              </testExcludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
 
     <profile>
       <id>hadoop_2.0.0</id>

http://git-wip-us.apache.org/repos/asf/giraph/blob/a615507c/giraph-dist/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-dist/pom.xml b/giraph-dist/pom.xml
index 597a1d3..5799031 100644
--- a/giraph-dist/pom.xml
+++ b/giraph-dist/pom.xml
@@ -89,5 +89,23 @@
       <groupId>org.apache.giraph</groupId>
       <artifactId>giraph-examples</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.giraph</groupId>
+      <artifactId>giraph-gora</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.giraph</groupId>
+      <artifactId>giraph-kibble</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>javax.servlet-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.giraph</groupId>
+      <artifactId>giraph-rexster-io</artifactId>
+    </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/giraph/blob/a615507c/giraph-examples/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-examples/pom.xml b/giraph-examples/pom.xml
index 73f2db2..b54a40e 100644
--- a/giraph-examples/pom.xml
+++ b/giraph-examples/pom.xml
@@ -103,9 +103,6 @@ under the License.
   <profiles>
     <profile>
       <id>hadoop_0.20.203</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
       <build>
         <plugins>
           <plugin>
@@ -129,7 +126,10 @@ under the License.
     </profile>
 
     <profile>
-      <id>hadoop_1.0</id>
+      <id>hadoop_1</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -272,6 +272,26 @@ under the License.
 
     <!-- The profiles below do not (yet) include any munge flags -->
     <profile>
+      <id>hadoop_2</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>**/yarn/**</exclude>
+              </excludes>
+              <testExcludes>
+                <exclude>**/yarn/**</exclude>
+              </testExcludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
       <id>hadoop_2.0.0</id>
       <build>
         <plugins>

http://git-wip-us.apache.org/repos/asf/giraph/blob/a615507c/giraph-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-hbase/pom.xml b/giraph-hbase/pom.xml
index 7e1960c..3782d38 100644
--- a/giraph-hbase/pom.xml
+++ b/giraph-hbase/pom.xml
@@ -89,6 +89,18 @@ under the License.
   <profiles>
     <profile>
       <id>hadoop_0.20.203</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-test</artifactId>
+          <version>${hadoop.version}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
+      <id>hadoop_1</id>
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
@@ -103,11 +115,11 @@ under the License.
     </profile>
 
     <profile>
-      <id>hadoop_1.0</id>
+      <id>hadoop_2</id>
       <dependencies>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-test</artifactId>
+          <artifactId>hadoop-minicluster</artifactId>
           <version>${hadoop.version}</version>
           <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/giraph/blob/a615507c/giraph-hcatalog/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-hcatalog/pom.xml b/giraph-hcatalog/pom.xml
index 0e7cbb4..e2704da 100644
--- a/giraph-hcatalog/pom.xml
+++ b/giraph-hcatalog/pom.xml
@@ -85,6 +85,18 @@ under the License.
   <profiles>
     <profile>
       <id>hadoop_0.20.203</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-test</artifactId>
+          <version>${hadoop.version}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
+      <id>hadoop_1</id>
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
@@ -99,11 +111,11 @@ under the License.
     </profile>
 
     <profile>
-      <id>hadoop_1.0</id>
+      <id>hadoop_2</id>
       <dependencies>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-test</artifactId>
+          <artifactId>hadoop-minicluster</artifactId>
           <version>${hadoop.version}</version>
           <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/giraph/blob/a615507c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8278811..cb220e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,13 @@ under the License.
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>13</version>
+  </parent>
+
   <groupId>org.apache.giraph</groupId>
   <artifactId>giraph-parent</artifactId>
   <packaging>pom</packaging>
@@ -261,6 +268,7 @@ under the License.
 
     <dep.avro.version>1.3.3</dep.avro.version>
     <dep.accumulo.version>1.4.0</dep.accumulo.version>
+    <dep.asm.version>3.2</dep.asm.version>
     <dep.gora.version>0.3</dep.gora.version>
     <dep.airline.version>0.5</dep.airline.version>
     <dep.base64.version>2.3.8</dep.base64.version>
@@ -282,6 +290,9 @@ under the License.
     <dep.hcatalog.version>0.5.0-incubating</dep.hcatalog.version>
     <dep.hive.version>0.11.0</dep.hive.version>
     <dep.hiveio.version>0.21</dep.hiveio.version>
+    <dep.jaxb-impl.version>2.2.4-1</dep.jaxb-impl.version>
+    <dep.jersey.version>1.17</dep.jersey.version>
+    <dep.jetty.version>6.1.26</dep.jetty.version>
     <dep.json.version>20090211</dep.json.version>
     <dep.junit.version>4.11</dep.junit.version>
     <dep.jython.version>2.5.3</dep.jython.version>
@@ -289,6 +300,7 @@ under the License.
     <dep.log4j.version>1.2.17</dep.log4j.version>
     <dep.mockito.version>1.9.5</dep.mockito.version>
     <dep.netty.version>3.5.3.Final</dep.netty.version>
+    <dep.paranamer.version>2.3</dep.paranamer.version>
     <dep.slf4j.version>1.7.5</dep.slf4j.version>
     <dep.tinkerpop.rexter.version>2.4.0</dep.tinkerpop.rexter.version>
     <dep.typetools.version>0.2.1</dep.typetools.version>
@@ -430,6 +442,18 @@ under the License.
                 <groupId>org.apache.hive</groupId>
                 <artifactId>hive-exec</artifactId>
               </dependency>
+              <dependency>
+                <groupId>stax</groupId>
+                <artifactId>stax-api</artifactId>
+              </dependency>
+              <dependency>
+                <groupId>asm</groupId>
+                <artifactId>asm</artifactId>
+              </dependency>
+              <dependency>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-core</artifactId>
+              </dependency>
             </ignoredDependencies>
             <ignoredResources>
               <ignoredResource>.*\.html</ignoredResource>
@@ -823,9 +847,6 @@ under the License.
         <module>giraph-gora</module>
         <module>giraph-rexster</module>
       </modules>
-      <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>
@@ -868,16 +889,20 @@ under the License.
     </profile>
 
     <profile>
-      <id>hadoop_1.0</id>
+      <id>hadoop_1</id>
       <modules>
         <module>giraph-accumulo</module>
         <module>giraph-hbase</module>
         <module>giraph-hcatalog</module>
         <module>giraph-hive</module>
+        <module>giraph-gora</module>
         <module>giraph-rexster</module>
       </modules>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
       <properties>
-        <hadoop.version>1.0.2</hadoop.version>
+        <hadoop.version>1.2.1</hadoop.version>
         <munge.symbols>HADOOP_NON_JOBCONTEXT_IS_INTERFACE,HADOOP_1_SECURITY,HADOOP_1_SECRET_MANAGER</munge.symbols>
       </properties>
       <dependencies>
@@ -893,10 +918,6 @@ under the License.
           <scope>provided</scope>
           <exclusions>
             <exclusion>
-              <groupId>commons-httpclient</groupId>
-              <artifactId>commons-httpclient</artifactId>
-            </exclusion>
-            <exclusion>
               <groupId>org.eclipse.jdt</groupId>
               <artifactId>core</artifactId>
             </exclusion>
@@ -1171,7 +1192,15 @@ under the License.
      </profile>
 
     <profile>
-       <id>2.2.0</id>
+       <id>hadoop_2</id>
+      <modules>
+        <module>giraph-accumulo</module>
+        <module>giraph-hbase</module>
+        <module>giraph-hcatalog</module>
+        <module>giraph-hive</module>
+        <module>giraph-gora</module>
+        <module>giraph-rexster</module>
+      </modules>
        <properties>
          <hadoop.version>2.2.0</hadoop.version>
          <!-- TODO: add these checks eventually -->
@@ -1251,6 +1280,11 @@ under the License.
     <dependencies>
       <!-- compile dependencies. sorted lexicographically. -->
       <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm</artifactId>
+        <version>${dep.asm.version}</version>
+      </dependency>
+      <dependency>
         <groupId>com.facebook.hiveio</groupId>
         <artifactId>hive-io-exp-core</artifactId>
         <version>${dep.hiveio.version}</version>
@@ -1534,6 +1568,16 @@ under the License.
         <version>${project.version}</version>
       </dependency>
       <dependency>
+        <groupId>org.apache.giraph</groupId>
+        <artifactId>giraph-kibble</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.giraph</groupId>
+        <artifactId>giraph-gora</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.apache.gora</groupId>
         <artifactId>gora-core</artifactId>
         <version>${dep.gora.version}</version>
@@ -1703,6 +1747,26 @@ under the License.
         <version>${dep.typetools.version}</version>
       </dependency>
       <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-impl</artifactId>
+        <version>${dep.jaxb-impl.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-core</artifactId>
+        <version>${dep.jersey.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-json</artifactId>
+        <version>${dep.jersey.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty</artifactId>
+        <version>${dep.jetty.version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.json</groupId>
         <artifactId>json</artifactId>
         <version>${dep.json.version}</version>
@@ -1713,6 +1777,11 @@ under the License.
         <version>${dep.jython.version}</version>
       </dependency>
       <dependency>
+        <groupId>com.thoughtworks.paranamer</groupId>
+        <artifactId>paranamer</artifactId>
+        <version>${dep.paranamer.version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
         <version>${dep.slf4j.version}</version>


Mime
View raw message