You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datafu.apache.org by ey...@apache.org on 2018/07/04 09:43:58 UTC
datafu git commit: DATAFU-132 Make DataFu compile with Java 8
Repository: datafu
Updated Branches:
refs/heads/master d090b4b01 -> d624e0737
DATAFU-132 Make DataFu compile with Java 8
Signed-off-by: Eyal Allweil <ey...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/datafu/repo
Commit: http://git-wip-us.apache.org/repos/asf/datafu/commit/d624e073
Tree: http://git-wip-us.apache.org/repos/asf/datafu/tree/d624e073
Diff: http://git-wip-us.apache.org/repos/asf/datafu/diff/d624e073
Branch: refs/heads/master
Commit: d624e0737cd6378d6d0fee583f64efa60cc976db
Parents: d090b4b
Author: Matthew Hayes <mh...@apache.org>
Authored: Tue Jul 3 17:48:57 2018 -0700
Committer: Eyal Allweil <ey...@apache.org>
Committed: Wed Jul 4 12:37:49 2018 +0300
----------------------------------------------------------------------
.../multilinestring/MultilineProcessor.java | 3 +++
build.gradle | 12 ++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/datafu/blob/d624e073/build-plugin/src/main/java/org/adrianwalker/multilinestring/MultilineProcessor.java
----------------------------------------------------------------------
diff --git a/build-plugin/src/main/java/org/adrianwalker/multilinestring/MultilineProcessor.java b/build-plugin/src/main/java/org/adrianwalker/multilinestring/MultilineProcessor.java
index cd58263..5fe247c 100644
--- a/build-plugin/src/main/java/org/adrianwalker/multilinestring/MultilineProcessor.java
+++ b/build-plugin/src/main/java/org/adrianwalker/multilinestring/MultilineProcessor.java
@@ -15,6 +15,9 @@ import javax.lang.model.SourceVersion;
import javax.lang.model.element.TypeElement;
@SupportedAnnotationTypes({"org.adrianwalker.multilinestring.Multiline"})
+
+// This generates a warning with Java 8 - however, if we switch to Java 8 and use SourceVersion.RELEASE_8, it
+// prevents compilation with Java 7. So we'll keep it and ignore the warning
@SupportedSourceVersion(SourceVersion.RELEASE_7)
public final class MultilineProcessor extends AbstractProcessor {
private Processor delegator = null;
http://git-wip-us.apache.org/repos/asf/datafu/blob/d624e073/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 4e227b4..4b7f396 100644
--- a/build.gradle
+++ b/build.gradle
@@ -98,9 +98,17 @@ rat {
apply plugin: 'com.fizzpod.sweeney'
+def isRelease = ext.release.toBoolean()
+
sweeney {
- // Must use JDK 1.7
- enforce type: "equal", expect: "1.7", value: {System.getProperty('java.version').substring(0,3)}
+ // Make sure official releases are built with Java version 1.7, as this is the minimum version required by Hadoop 2.7.
+ if (isRelease) {
+ enforce type: "equal", expect: "1.7", value: {System.getProperty('java.version').substring(0,3)}
+ }
+ // Otherwise required at least Java version 1.7
+ else {
+ enforce type: "range", expect: "[1.7,)", value: {System.getProperty('java.version')}
+ }
// Ensure the assemble tasks depend on the rat task
def flag = true