Permalink
Browse files

GIRAPH-798: Upgrade Giraph to Java7 and fix all dependencies

  • Loading branch information...
1 parent ba8ea97 commit ac93c3b6c5bce5f22b293b29df91663ca7d7ce63 @aching aching committed Nov 14, 2013
View
@@ -137,12 +137,12 @@ under the License.
<dependencies>
<!-- compile dependencies. sorted lexicographically. -->
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.giraph</groupId>
@@ -167,11 +167,5 @@ under the License.
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
View
@@ -442,6 +442,10 @@ under the License.
<groupId>com.facebook.thirdparty.yourkit-api</groupId>
<artifactId>yjp-controller-api-redist</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -463,8 +467,8 @@ under the License.
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>io.airlift</groupId>
- <artifactId>airline</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@ -502,14 +506,6 @@ under the License.
<groupId>org.python</groupId>
<artifactId>jython</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
<!-- test dependencies. sorted lexicographically. -->
<dependency>
@@ -519,7 +515,12 @@ under the License.
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
@@ -1532,10 +1532,9 @@ public final void exchangeVertexPartitions(
getPartitionExchangeChildrenChangedEvent().waitForever();
getPartitionExchangeChildrenChangedEvent().reset();
}
- } catch (KeeperException e) {
- throw new RuntimeException(e);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
+ } catch (KeeperException | InterruptedException e) {
+ throw new RuntimeException(
+ "exchangeVertexPartitions: Got runtime exception", e);
}
if (LOG.isInfoEnabled()) {
View
@@ -378,10 +378,6 @@ under the License.
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
- <dependency>
- <groupId>com.yammer.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- </dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
@@ -391,41 +387,17 @@ under the License.
<artifactId>commons-collections</artifactId>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </dependency>
- <dependency>
- <groupId>net.iharder</groupId>
- <artifactId>base64</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
<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>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.giraph</groupId>
<artifactId>giraph-core</artifactId>
@@ -445,7 +417,12 @@ under the License.
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
View
@@ -85,36 +85,25 @@ under the License.
<dependencies>
<!-- compile dependencies. sorted lexicographically. -->
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.giraph</groupId>
<artifactId>giraph-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.giraph</groupId>
- <artifactId>giraph-core</artifactId>
- <type>test-jar</type>
- </dependency>
<dependency>
<groupId>org.apache.gora</groupId>
<artifactId>gora-core</artifactId>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.1</version>
- </dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </dependency>
<!-- test dependencies. sorted lexicographically. -->
<dependency>
<groupId>junit</groupId>
View
@@ -35,6 +35,12 @@ under the License.
<properties>
<top.dir>${project.basedir}/..</top.dir>
+ <!-- TODO: guava r06 is too old for checking -->
+ <project.enforcer.skip>true</project.enforcer.skip>
+ <!-- TODO: Fix HBase duplicate classes in the future -->
+ <giraph.maven.duplicate.finder.skip>true</giraph.maven.duplicate.finder.skip>
+ <!-- TODO: Fix HBase dependencies in the future -->
+ <giraph.maven.dependency.plugin.skip>true</giraph.maven.dependency.plugin.skip>
</properties>
<build>
@@ -137,12 +143,14 @@ under the License.
<dependencies>
<!-- compile dependencies. sorted lexicographically. -->
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <!-- TODO: guava r06 is too old for checking -->
+ <version>r06</version>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.giraph</groupId>
@@ -152,22 +160,18 @@ under the License.
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.giraph</groupId>
- <artifactId>giraph-core</artifactId>
- <type>test-jar</type>
- </dependency>
<!-- test dependencies. sorted lexicographically. -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.giraph</groupId>
+ <artifactId>giraph-core</artifactId>
+ <type>test-jar</type>
+ </dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
View
@@ -137,12 +137,16 @@ under the License.
<dependencies>
<!-- compile dependencies. sorted lexicographically. -->
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
</dependency>
<dependency>
<groupId>org.apache.giraph</groupId>
@@ -159,11 +163,17 @@ under the License.
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-metastore</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-serde</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.giraph</groupId>
- <artifactId>giraph-core</artifactId>
- <type>test-jar</type>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <scope>runtime</scope>
</dependency>
<!-- test dependencies. sorted lexicographically. -->
@@ -172,11 +182,5 @@ under the License.
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
View
@@ -85,20 +85,12 @@ under the License.
<dependencies>
<!-- compile dependencies. sorted lexicographically. -->
<dependency>
- <groupId>com.facebook.hiveio</groupId>
- <artifactId>hive-io-exp-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
</dependency>
<dependency>
- <groupId>com.github.spullara.cli-parser</groupId>
- <artifactId>cli-parser</artifactId>
+ <groupId>com.facebook.hiveio</groupId>
+ <artifactId>hive-io-exp-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.giraph</groupId>
@@ -108,14 +100,18 @@ under the License.
<groupId>org.apache.hive</groupId>
<artifactId>hive-exec</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-metastore</artifactId>
- </dependency>
<dependency>
<groupId>org.python</groupId>
<artifactId>jython</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
<!-- test dependencies. sorted lexicographically. -->
<dependency>
@@ -124,10 +120,21 @@ under the License.
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.facebook.hiveio</groupId>
+ <artifactId>hive-io-exp-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>com.facebook.hiveio</groupId>
<artifactId>hive-io-exp-testing</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Oops, something went wrong.

0 comments on commit ac93c3b

Please sign in to comment.