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 2014/02/25 02:07:24 UTC
git commit: updated refs/heads/trunk to 096accf
Repository: giraph
Updated Branches:
refs/heads/trunk 3032f4061 -> 096accfd0
GIRAPH-858: tests fail for hadoop_facebook because of dependency issues
(pavanka via aching)
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/096accfd
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/096accfd
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/096accfd
Branch: refs/heads/trunk
Commit: 096accfd0666f1b669ad960b161bb131030bbbfe
Parents: 3032f40
Author: Avery Ching <ac...@fb.com>
Authored: Mon Feb 24 17:03:47 2014 -0800
Committer: Avery Ching <ac...@fb.com>
Committed: Mon Feb 24 17:04:37 2014 -0800
----------------------------------------------------------------------
CHANGELOG | 3 +++
giraph-accumulo/pom.xml | 6 ++++++
giraph-core/pom.xml | 8 ++++++++
giraph-examples/pom.xml | 8 ++++++++
giraph-hcatalog/pom.xml | 6 ++++++
pom.xml | 25 ++++++++++++++++++++++++-
6 files changed, 55 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/giraph/blob/096accfd/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index dc7aca6..738f801 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
Giraph Change Log
Release 1.1.0 - unreleased
+ GIRAPH-858: tests fail for hadoop_facebook because of dependency issues
+ (pavanka via aching)
+
GIRAPH-814: Incorrect MapReduce application classpath processing (AlexJF via claudio)
GIRAPH-850: Improve internal zookeeper launching (AlexJF via claudio)
http://git-wip-us.apache.org/repos/asf/giraph/blob/096accfd/giraph-accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-accumulo/pom.xml b/giraph-accumulo/pom.xml
index 37a1682..b5e6121 100644
--- a/giraph-accumulo/pom.xml
+++ b/giraph-accumulo/pom.xml
@@ -142,6 +142,12 @@ under the License.
<artifactId>hadoop-test</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>${dep.oldnetty.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</profile>
</profiles>
http://git-wip-us.apache.org/repos/asf/giraph/blob/096accfd/giraph-core/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-core/pom.xml b/giraph-core/pom.xml
index 944ad4b..b66ba1d 100644
--- a/giraph-core/pom.xml
+++ b/giraph-core/pom.xml
@@ -289,6 +289,14 @@ under the License.
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>${dep.oldnetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</profile>
<profile>
http://git-wip-us.apache.org/repos/asf/giraph/blob/096accfd/giraph-examples/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-examples/pom.xml b/giraph-examples/pom.xml
index b54a40e..90f6889 100644
--- a/giraph-examples/pom.xml
+++ b/giraph-examples/pom.xml
@@ -226,6 +226,14 @@ under the License.
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>${dep.oldnetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</profile>
<profile>
http://git-wip-us.apache.org/repos/asf/giraph/blob/096accfd/giraph-hcatalog/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-hcatalog/pom.xml b/giraph-hcatalog/pom.xml
index e2704da..af084ac 100644
--- a/giraph-hcatalog/pom.xml
+++ b/giraph-hcatalog/pom.xml
@@ -142,6 +142,12 @@ under the License.
<artifactId>hadoop-test</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>${dep.oldnetty.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</profile>
</profiles>
http://git-wip-us.apache.org/repos/asf/giraph/blob/096accfd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ceaef23..f963585 100644
--- a/pom.xml
+++ b/pom.xml
@@ -299,6 +299,8 @@ under the License.
<dep.libthrift.version>0.9.0</dep.libthrift.version>
<dep.log4j.version>1.2.17</dep.log4j.version>
<dep.mockito.version>1.9.5</dep.mockito.version>
+ <!-- note: old version of netty is required by hadoop_facebook for tests to succeed -->
+ <dep.oldnetty.version>3.2.2.Final</dep.oldnetty.version>
<dep.netty.version>4.0.14.Final</dep.netty.version>
<dep.paranamer.version>2.3</dep.paranamer.version>
<dep.slf4j.version>1.7.5</dep.slf4j.version>
@@ -846,6 +848,9 @@ under the License.
<profiles>
<profile>
<id>release</id>
+ <modules>
+ <module>giraph-dist</module>
+ </modules>
<build>
<plugins>
<plugin>
@@ -873,6 +878,7 @@ under the License.
<module>giraph-hive</module>
<module>giraph-gora</module>
<module>giraph-rexster</module>
+ <module>giraph-dist</module>
</modules>
<properties>
<hadoop.version>0.20.203.0</hadoop.version>
@@ -924,6 +930,7 @@ under the License.
<module>giraph-hive</module>
<module>giraph-gora</module>
<module>giraph-rexster</module>
+ <module>giraph-dist</module>
</modules>
<activation>
<activeByDefault>true</activeByDefault>
@@ -977,6 +984,7 @@ under the License.
<module>giraph-hcatalog</module>
<module>giraph-hive</module>
<module>giraph-rexster</module>
+ <module>giraph-dist</module>
</modules>
<properties>
<hadoop.version>0.20.2</hadoop.version>
@@ -1032,6 +1040,9 @@ under the License.
<profile>
<id>hadoop_0.23</id>
+ <modules>
+ <module>giraph-dist</module>
+ </modules>
<properties>
<hadoop.version>0.23.1</hadoop.version>
<munge.symbols>HADOOP_1_SECRET_MANAGER</munge.symbols>
@@ -1063,6 +1074,9 @@ under the License.
<profile>
<id>hadoop_cdh4.1.2</id>
+ <modules>
+ <module>giraph-dist</module>
+ </modules>
<properties>
<hadoop.version>2.0.0-cdh4.1.2</hadoop.version>
<munge.symbols>HADOOP_1_SECRET_MANAGER</munge.symbols>
@@ -1126,6 +1140,9 @@ under the License.
MapReduce classes to perform work. -->
<profile>
<id>hadoop_yarn</id>
+ <modules>
+ <module>giraph-dist</module>
+ </modules>
<properties>
<hadoop.version>SET_HADOOP_VERSION_USING_MVN_DASH_D_OPTION</hadoop.version>
<munge.symbols>PURE_YARN</munge.symbols>
@@ -1182,6 +1199,9 @@ under the License.
flags on any of the following profiles. -->
<profile>
<id>2.1.1-SNAPSHOT</id>
+ <modules>
+ <module>giraph-dist</module>
+ </modules>
<properties>
<hadoop.version>2.1.1-SNAPSHOT</hadoop.version>
<!-- TODO: add these checks eventually -->
@@ -1227,6 +1247,7 @@ under the License.
<module>giraph-hive</module>
<module>giraph-gora</module>
<module>giraph-rexster</module>
+ <module>giraph-dist</module>
</modules>
<properties>
<hadoop.version>2.2.0</hadoop.version>
@@ -1266,6 +1287,9 @@ under the License.
<profile>
<id>hadoop_snapshot</id>
+ <modules>
+ <module>giraph-dist</module>
+ </modules>
<properties>
<hadoop.version>3.0.0-SNAPSHOT</hadoop.version>
<!-- TODO: add these checks eventually -->
@@ -2092,7 +2116,6 @@ under the License.
<modules>
<module>giraph-core</module>
<module>giraph-examples</module>
- <module>giraph-dist</module>
</modules>
</project>