Update to Toree 0.4.0-incubating release (#842)

* Update to Toree 0.4.0-incubating release

.travis.yml

@@ -18,8 +18,8 @@ env:
     - ASYNC_TEST_TIMEOUT=30
 
 before_install:
-    - mkdir -p $HOME/.sbt/launchers/1.2.1
-    - curl -L -o $HOME/.sbt/launchers/1.2.1/sbt-launch.jar https://repo1.maven.org/maven2/org/scala-sbt/sbt-launch/1.2.1/sbt-launch.jar
+    - mkdir -p $HOME/.sbt/launchers/1.3.12
+    - curl -L -o $HOME/.sbt/launchers/1.3.12/sbt-launch.jar https://repo1.maven.org/maven2/org/scala-sbt/sbt-launch/1.3.12/sbt-launch.jar
 
 install:
     - pip install --upgrade setuptools pip websocket-client flake8

Makefile

@@ -174,7 +174,7 @@ ITEST_YARN_PORT?=8888
 ITEST_YARN_HOST?=localhost:$(ITEST_YARN_PORT)
 ITEST_YARN_TESTS?=enterprise_gateway.itests
 
-ITEST_KERNEL_LAUNCH_TIMEOUT=90
+ITEST_KERNEL_LAUNCH_TIMEOUT=120
 
 LOG_LEVEL=INFO
 

etc/Makefile

@@ -83,7 +83,7 @@ kernel-launchers/scala/lib: $(TOREE_LAUNCHER_FILES)
 	-rm -rf kernel-launchers/scala/lib
 	mkdir -p kernel-launchers/scala/lib
 	@(cd kernel-launchers/scala/toree-launcher; sbt -Dversion=$(VERSION) -Dspark_version=$(SPARK_VERSION) package; cp target/scala-2.11/*.jar ../lib)
-	curl -L https://repository.apache.org/content/repositories/releases/org/apache/toree/toree-assembly/0.3.0-incubating/toree-assembly-0.3.0-incubating.jar --output ./kernel-launchers/scala/lib/toree-assembly-0.3.0-incubating.jar
+	curl -L https://repository.apache.org/content/repositories/releases/org/apache/toree/toree-assembly/0.4.0-incubating/toree-assembly-0.4.0-incubating.jar --output ./kernel-launchers/scala/lib/toree-assembly-0.4.0-incubating.jar
 
 KERNEL_IMAGE_FILE:=../dist/jupyter_enterprise_gateway_kernel_image_files-$(VERSION).tar.gz
 kernel_image_files: ../build/kernel_image_files

etc/docker/demo-base/Dockerfile

@@ -135,11 +135,11 @@ RUN ls -la /usr/hdp/current/hadoop/etc/hadoop/*-env.sh && \
 
 # Install Toree
 RUN cd /tmp && \
-    curl -O https://dist.apache.org/repos/dist/release/incubator/toree/0.3.0-incubating/toree-pip/toree-0.3.0.tar.gz && \
+    curl -O https://dist.apache.org/repos/dist/release/incubator/toree/0.4.0-incubating/toree-pip/toree-0.4.0.tar.gz && \
     pip install --upgrade setuptools --user && \
-    pip install /tmp/toree-0.3.0.tar.gz && \
+    pip install /tmp/toree-0.4.0.tar.gz && \
     jupyter toree install --spark_home=$SPARK_HOME --kernel_name="Spark $SPARK_VER" --interpreters=Scala && \
-    rm -f /tmp/toree-0.3.0.tar.gz && \
+    rm -f /tmp/toree-0.4.0.tar.gz && \
     fix-permissions $ANACONDA_HOME && \
     fix-permissions /home/$NB_USER
 
@@ -187,4 +187,3 @@ EXPOSE 50010 50020 50070 50075 50090 8020 9000 \
 49707 2122
 
 USER $NB_USER
-

etc/docker/demo-base/README.md

@@ -4,14 +4,14 @@
 * Apache Spark 2.4.6
 * Java 1.8 runtime
 * Mini-conda latest (python 3.7) with R packages
-* Toree 0.3.0-incubating
+* Toree 0.4.0-incubating
 * `jovyan` service user, with system users `elyra`, `bob`, and `alice`.  The jovyan uid is `1000` to match other jupyter
  images.
 * Password-less ssh for service user
 * Users have HDFS folder setup at startup
 
 # Basic Use
 As of the 0.9.0 release of [Jupyter Enterprise Gateway](https://github.com/jupyter/enterprise_gateway/releases)
-this image can be started as a separate YARN cluster to better demonstrate remote kernel capabilities.  See section 
-[Dual Mode](https://hub.docker.com/r/elyra/enterprise-gateway/#dual_mode) on the enterprise-gateway page for command 
+this image can be started as a separate YARN cluster to better demonstrate remote kernel capabilities.  See section
+[Dual Mode](https://hub.docker.com/r/elyra/enterprise-gateway/#dual_mode) on the enterprise-gateway page for command
 usage.

etc/kernel-launchers/scala/toree-launcher/build.sbt

@@ -14,4 +14,4 @@ resolvers += "Typesafe Repo" at "https://repo.typesafe.com/typesafe/releases/"
 resolvers += "Sonatype Maven Central Mirror" at "https://maven-central.storage-download.googleapis.com/maven2/"
 
 libraryDependencies += "com.typesafe.play" %% "play-json" % "2.3.10" // Apache v2
-libraryDependencies += "org.apache.toree" % "toree-assembly" % "0.3.0-incubating" /*from "https://archive.apache.org/dist/incubator/toree/0.3.0-incubating/toree/toree-assembly-0.3.0-incubating.jar"*/
+libraryDependencies += "org.apache.toree" % "toree-assembly" % "0.4.0-incubating" /*from "https://archive.apache.org/dist/incubator/toree/0.4.0-incubating/toree/toree-assembly-0.4.0-incubating.jar"*/

etc/kernel-launchers/scala/toree-launcher/project/build.properties

@@ -2,4 +2,4 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 #
-sbt.version = 1.2.1
+sbt.version = 1.3.12