You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@livy.apache.org by js...@apache.org on 2017/08/03 03:23:39 UTC

incubator-livy git commit: [LIVY-390][BUILD] Only using JDK8 to build with Spark 2.2

Repository: incubator-livy
Updated Branches:
  refs/heads/master fc4a9e60a -> e434d9e20


[LIVY-390][BUILD] Only using JDK8 to build with Spark 2.2

Because Spark 2.2 removes JDK7 support but Livy still supports JDK7, so updating travis file to use JDK8 to build against Spark 2.2, whereas still using JDK7 to build with Spark 2.2-.

Author: jerryshao <ss...@hortonworks.com>

Closes #30 from jerryshao/LIVY-390.


Project: http://git-wip-us.apache.org/repos/asf/incubator-livy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-livy/commit/e434d9e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-livy/tree/e434d9e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-livy/diff/e434d9e2

Branch: refs/heads/master
Commit: e434d9e2060f9bee470f6960493ad36e3bdfbe5d
Parents: fc4a9e6
Author: jerryshao <ss...@hortonworks.com>
Authored: Thu Aug 3 11:23:28 2017 +0800
Committer: jerryshao <ss...@hortonworks.com>
Committed: Thu Aug 3 11:23:28 2017 +0800

----------------------------------------------------------------------
 .travis.yml | 26 +++++++++++++++++---------
 pom.xml     |  1 +
 2 files changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/e434d9e2/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 94fb476..f42a6d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,17 +3,25 @@ dist: trusty
 language: scala
 
 env:
-  - MVN_FLAG='-Pspark-1.6 -DskipTests'
-  - MVN_FLAG='-Pspark-2.0 -DskipTests'
-  - MVN_FLAG='-Pspark-2.1 -DskipTests'
-  - MVN_FLAG='-Pspark-2.2 -DskipTests'
-  - MVN_FLAG='-Pspark-1.6 -DskipITs'
-  - MVN_FLAG='-Pspark-2.0 -DskipITs'
-  - MVN_FLAG='-Pspark-2.1 -DskipITs'
-  - MVN_FLAG='-Pspark-2.2 -DskipITs'
+  matrix:
+    - MVN_FLAG='-Pspark-1.6 -DskipTests'
+    - MVN_FLAG='-Pspark-2.0 -DskipTests'
+    - MVN_FLAG='-Pspark-2.1 -DskipTests'
+    - MVN_FLAG='-Pspark-1.6 -DskipITs'
+    - MVN_FLAG='-Pspark-2.0 -DskipITs'
+    - MVN_FLAG='-Pspark-2.1 -DskipITs'
+
+matrix:
+  include:
+      # Spark 2.2 will only be verified using JDK8
+    - env: MVN_FLAG='-Pspark-2.2 -DskipTests'
+      jdk: oraclejdk8
+    - env: MVN_FLAG='-Pspark-2.2 -DskipITs'
+      jdk: oraclejdk8
+
 
 jdk:
-  - oraclejdk8
+  - openjdk7
 
 addons:
   apt:

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/e434d9e2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fc7345c..3fd16cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1027,6 +1027,7 @@
       </activation>
       <properties>
         <spark.version>2.2.0</spark.version>
+        <java.version>1.8</java.version>
       </properties>
     </profile>