From 478b5b93bda50327c0cec7abab74457ee31d545e Mon Sep 17 00:00:00 2001 From: Frank Rosner Date: Wed, 16 Aug 2017 16:26:45 +0200 Subject: [PATCH 1/4] adjust build script to support spark 2.2.0 --- build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build b/build index 1e21c62..8bab289 100755 --- a/build +++ b/build @@ -11,6 +11,9 @@ case "$spark_version" in "2.1"*) zeppelin_spark_version="2.1" ;; + "2.2"*) + zeppelin_spark_version="2.2" + ;; *) echo "Spark version '$spark_version' not supported." exit 1 From 34cc4c13fd84abb7db7932c15c1af893866517f6 Mon Sep 17 00:00:00 2001 From: Frank Rosner Date: Wed, 16 Aug 2017 16:30:08 +0200 Subject: [PATCH 2/4] build also for spark 2.2.0 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6439e06..69d8aa0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ env: - ZEPPELIN_VERSION=v0.7.1 SPARK_VERSION=1.6.3 HADOOP_VERSION=2.6 - ZEPPELIN_VERSION=v0.7.1 SPARK_VERSION=2.0.2 HADOOP_VERSION=2.7 - ZEPPELIN_VERSION=v0.7.1 SPARK_VERSION=2.1.1 HADOOP_VERSION=2.7 + - ZEPPELIN_VERSION=v0.7.1 SPARK_VERSION=2.2.0 HADOOP_VERSION=2.7 before_script: - sudo apt-get update From 5e38cb0c29a400809bb9e9acef86ab37ff6c845b Mon Sep 17 00:00:00 2001 From: Frank Rosner Date: Wed, 16 Aug 2017 17:56:06 +0200 Subject: [PATCH 3/4] upgrade to Anaconda 3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 85c160b..f231568 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN \ apt-get clean all RUN echo 'export PATH=/opt/conda/bin:$PATH' > /etc/profile.d/conda.sh && \ - wget --quiet https://repo.continuum.io/archive/Anaconda2-4.2.0-Linux-x86_64.sh -O ~/anaconda.sh && \ + wget --quiet https://repo.continuum.io/archive/Anaconda3-4.2.0-Linux-x86_64.sh -O ~/anaconda.sh && \ /bin/bash ~/anaconda.sh -b -p /opt/conda && \ rm ~/anaconda.sh From 0f7bc1e99a76eee9d81c3eb8135764abf597b419 Mon Sep 17 00:00:00 2001 From: Frank Rosner Date: Wed, 16 Aug 2017 18:32:58 +0200 Subject: [PATCH 4/4] remove support for 0.6.2 as it is anyway outdated for spark 2.2.0 --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 69d8aa0..05f7fbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,6 @@ jdk: # https://github.com/apache/zeppelin/blob/master/spark-dependencies/pom.xml for supported combinations env: matrix: - - ZEPPELIN_VERSION=v0.6.2 SPARK_VERSION=1.6.3 HADOOP_VERSION=2.6 - - ZEPPELIN_VERSION=v0.6.2 SPARK_VERSION=2.0.2 HADOOP_VERSION=2.7 - - ZEPPELIN_VERSION=v0.6.2 SPARK_VERSION=2.1.1 HADOOP_VERSION=2.7 - ZEPPELIN_VERSION=v0.7.1 SPARK_VERSION=1.6.3 HADOOP_VERSION=2.6 - ZEPPELIN_VERSION=v0.7.1 SPARK_VERSION=2.0.2 HADOOP_VERSION=2.7 - ZEPPELIN_VERSION=v0.7.1 SPARK_VERSION=2.1.1 HADOOP_VERSION=2.7