You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by di...@apache.org on 2018/10/23 20:36:54 UTC
git commit: updated refs/heads/trunk to 1ba982d
Repository: giraph
Updated Branches:
refs/heads/trunk 583c8311d -> 1ba982d80
GIRAPH-1207
closes #90
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/1ba982d8
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/1ba982d8
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/1ba982d8
Branch: refs/heads/trunk
Commit: 1ba982d80ba74544730f36f3cd46cdbe894a9e6a
Parents: 583c831
Author: Dionysios Logothetis <dl...@gmail.com>
Authored: Tue Oct 23 13:36:36 2018 -0700
Committer: Dionysios Logothetis <di...@fb.com>
Committed: Tue Oct 23 13:36:36 2018 -0700
----------------------------------------------------------------------
README | 2 +-
giraph-block-app-8/pom.xml | 2 --
.../framework/block/TestRepeatUntilBlock.java | 2 +-
.../apache/giraph/writable/kryo/HadoopKryo.java | 23 +++++++++-----------
pom.xml | 4 ++--
src/site/xdoc/build.xml | 2 +-
6 files changed, 15 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/giraph/blob/1ba982d8/README
----------------------------------------------------------------------
diff --git a/README b/README
index 55ca25f..401302a 100644
--- a/README
+++ b/README
@@ -87,7 +87,7 @@ at this time.
Building and testing:
You will need the following:
-- Java 1.6
+- Java 1.8
- Maven 3 or higher. Giraph uses the munge plugin
(http://sonatype.github.com/munge-maven-plugin/),
which requires Maven 3, to support multiple versions of Hadoop. Also, the
http://git-wip-us.apache.org/repos/asf/giraph/blob/1ba982d8/giraph-block-app-8/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-block-app-8/pom.xml b/giraph-block-app-8/pom.xml
index 7b40643..a52a485 100644
--- a/giraph-block-app-8/pom.xml
+++ b/giraph-block-app-8/pom.xml
@@ -36,8 +36,6 @@ under the License.
<properties>
<top.dir>${project.basedir}/..</top.dir>
<checkstyle.config.path>${top.dir}/checkstyle-relaxed-8.xml</checkstyle.config.path>
- <project.build.targetJdk>1.8</project.build.targetJdk>
- <project.build.javaHome>${env.JAVA_8_HOME}</project.build.javaHome>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/giraph/blob/1ba982d8/giraph-block-app/src/test/java/org/apache/giraph/block_app/framework/block/TestRepeatUntilBlock.java
----------------------------------------------------------------------
diff --git a/giraph-block-app/src/test/java/org/apache/giraph/block_app/framework/block/TestRepeatUntilBlock.java b/giraph-block-app/src/test/java/org/apache/giraph/block_app/framework/block/TestRepeatUntilBlock.java
index d1befa5..c7f7fab 100644
--- a/giraph-block-app/src/test/java/org/apache/giraph/block_app/framework/block/TestRepeatUntilBlock.java
+++ b/giraph-block-app/src/test/java/org/apache/giraph/block_app/framework/block/TestRepeatUntilBlock.java
@@ -88,7 +88,7 @@ public class TestRepeatUntilBlock {
countDown
);
BlockTestingUtils.testSequential(
- Iterables.concat(Collections.nCopies(outer * inner, piece)),
+ Iterables.concat(Collections.<Piece>nCopies(outer * inner, piece)),
repeatBlock);
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/1ba982d8/giraph-core/src/main/java/org/apache/giraph/writable/kryo/HadoopKryo.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/writable/kryo/HadoopKryo.java b/giraph-core/src/main/java/org/apache/giraph/writable/kryo/HadoopKryo.java
index 5d51a3f..1a8f2c2 100644
--- a/giraph-core/src/main/java/org/apache/giraph/writable/kryo/HadoopKryo.java
+++ b/giraph-core/src/main/java/org/apache/giraph/writable/kryo/HadoopKryo.java
@@ -318,19 +318,16 @@ public class HadoopKryo extends Kryo {
new MapReferenceResolver());
}
- String version = System.getProperty("java.version");
- char minor = version.charAt(2);
- if (minor >= '8') {
- try {
- kryo.register(Class.forName("java.lang.invoke.SerializedLambda"));
- kryo.register(Class.forName(
- "com.esotericsoftware.kryo.serializers.ClosureSerializer$Closure"),
- new ClosureSerializer());
- } catch (ClassNotFoundException e) {
- throw new IllegalStateException(
- "Trying to use Kryo on >= Java 8 (" + version +
- "), but unable to find needed classes", e);
- }
+ try {
+ kryo.register(Class.forName("java.lang.invoke.SerializedLambda"));
+ kryo.register(Class.forName(
+ "com.esotericsoftware.kryo.serializers.ClosureSerializer$Closure"),
+ new ClosureSerializer());
+ } catch (ClassNotFoundException e) {
+ throw new IllegalStateException(
+ "Trying to use Kryo on Java version " +
+ System.getProperty("java.version") +
+ ", but unable to find needed classes", e);
}
kryo.register(Arrays.asList().getClass(), new ArraysAsListSerializer());
http://git-wip-us.apache.org/repos/asf/giraph/blob/1ba982d8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1522fd4..758876e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -301,9 +301,9 @@ under the License.
<project.maven.version>3.0.0</project.maven.version>
<project.enforcer.skip>false</project.enforcer.skip>
<project.enforcer.fail>true</project.enforcer.fail>
- <project.build.targetJdk>1.7</project.build.targetJdk>
+ <project.build.targetJdk>1.8</project.build.targetJdk>
<project.build.javaHome>${env.JAVA_HOME}</project.build.javaHome>
- <project.enforcer.minJdk>1.7</project.enforcer.minJdk>
+ <project.enforcer.minJdk>1.8</project.enforcer.minJdk>
<giraph.maven.dependency.plugin.skip>false</giraph.maven.dependency.plugin.skip>
<giraph.maven.duplicate.finder.skip>false</giraph.maven.duplicate.finder.skip>
<!-- This lets modules skip unit tests. More details: GIRAPH-957 -->
http://git-wip-us.apache.org/repos/asf/giraph/blob/1ba982d8/src/site/xdoc/build.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/build.xml b/src/site/xdoc/build.xml
index d99bff7..54b344d 100644
--- a/src/site/xdoc/build.xml
+++ b/src/site/xdoc/build.xml
@@ -33,7 +33,7 @@ under the License.
<p>
You can check out Giraph with <tt>git clone http://git-wip-us.apache.org/repos/asf/giraph.git</tt>. In order to build and test Giraph, you will need the following:</p>
<ul>
- <li>Java 1.7</li>
+ <li>Java 1.8</li>
<li>Maven 3 or higher. Giraph uses the <a href="http://sonatype.github.com/munge-maven-plugin/">munge plugin</a>, which requires Maven 3, to support multiple versions of Hadoop. Also, the web site plugin requires Maven 3.</li>
<li>One of the supported versions of Apache Hadoop:
<ul>