Skip to content
Permalink
Browse files
GIRAPH-1207
closes #90
  • Loading branch information
dlogothetis committed Oct 23, 2018
1 parent 583c831 commit 1ba982d80ba74544730f36f3cd46cdbe894a9e6a
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 20 deletions.
2 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
@@ -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>
@@ -88,7 +88,7 @@ public Boolean get() {
countDown
);
BlockTestingUtils.testSequential(
Iterables.concat(Collections.nCopies(outer * inner, piece)),
Iterables.concat(Collections.<Piece>nCopies(outer * inner, piece)),
repeatBlock);
}

@@ -318,19 +318,16 @@ private static HadoopKryo createKryo(boolean trackReferences,
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());
@@ -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 -->
@@ -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>

0 comments on commit 1ba982d

Please sign in to comment.