Fix tests for Scala 2.11
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/14b49982 Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/14b49982 Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/14b49982 Branch: refs/heads/livedoc Commit: 14b49982650965c626788206aedea511f033033d Parents: 68708b4 Author: Donald Szeto <[email protected]> Authored: Mon Mar 20 21:41:52 2017 -0700 Committer: Donald Szeto <[email protected]> Committed: Mon Mar 20 21:41:52 2017 -0700 ---------------------------------------------------------------------- common/build.sbt | 3 ++- tests/Dockerfile | 2 ++ tests/build_docker.sh | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/14b49982/common/build.sbt ---------------------------------------------------------------------- diff --git a/common/build.sbt b/common/build.sbt index 32afb97..19e4f04 100644 --- a/common/build.sbt +++ b/common/build.sbt @@ -22,6 +22,7 @@ name := "apache-predictionio-common" libraryDependencies ++= Seq( "io.spray" %% "spray-can" % "1.3.3", "io.spray" %% "spray-routing" % "1.3.3", - "com.typesafe.akka" %% "akka-actor" % akkaVersion.value) + "com.typesafe.akka" %% "akka-actor" % akkaVersion.value, + "com.typesafe.akka" %% "akka-slf4j" % akkaVersion.value) pomExtra := childrenPomExtra.value http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/14b49982/tests/Dockerfile ---------------------------------------------------------------------- diff --git a/tests/Dockerfile b/tests/Dockerfile index 619bdf8..f7dbd68 100644 --- a/tests/Dockerfile +++ b/tests/Dockerfile @@ -22,10 +22,12 @@ ARG SPARK_DIR ARG PGSQL_JAR ARG PIO_SCALA_VERSION ARG PIO_SPARK_VERSION +ARG PIO_HADOOP_VERSION ARG PIO_ELASTICSEARCH_VERSION ENV PIO_SCALA_VERSION=$PIO_SCALA_VERSION ENV PIO_SPARK_VERSION=$PIO_SPARK_VERSION +ENV PIO_HADOOP_VERSION=$PIO_HADOOP_VERSION ENV PIO_ELASTICSEARCH_VERSION=$PIO_ELASTICSEARCH_VERSION ENV PGSQL_JAR=$PGSQL_JAR http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/14b49982/tests/build_docker.sh ---------------------------------------------------------------------- diff --git a/tests/build_docker.sh b/tests/build_docker.sh index af30cb8..27fb744 100755 --- a/tests/build_docker.sh +++ b/tests/build_docker.sh @@ -54,4 +54,5 @@ docker build -t predictionio/pio-testing $DIR \ --build-arg PGSQL_JAR=$PGSQL_JAR \ --build-arg PIO_SCALA_VERSION=$PIO_SCALA_VERSION \ --build-arg PIO_SPARK_VERSION=$PIO_SPARK_VERSION \ + --build-arg PIO_HADOOP_VERSION=$PIO_HADOOP_VERSION \ --build-arg PIO_ELASTICSEARCH_VERSION=$PIO_ELASTICSEARCH_VERSION
