You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by ch...@apache.org on 2018/03/01 23:22:30 UTC
[02/20] predictionio git commit: [PIO-125] Spark 2.2 support
[PIO-125] Spark 2.2 support
Closes #436
Project: http://git-wip-us.apache.org/repos/asf/predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/predictionio/commit/7339a16f
Tree: http://git-wip-us.apache.org/repos/asf/predictionio/tree/7339a16f
Diff: http://git-wip-us.apache.org/repos/asf/predictionio/diff/7339a16f
Branch: refs/heads/livedoc
Commit: 7339a16fd0fedeb2ab9a9fce79e13a561e5198f9
Parents: a87b7a6
Author: Shinsuke Sugaya <sh...@apache.org>
Authored: Thu Oct 5 21:43:03 2017 -0700
Committer: Donald Szeto <do...@apache.org>
Committed: Thu Oct 5 21:44:53 2017 -0700
----------------------------------------------------------------------
.travis.yml | 24 ++++++++++++++++++++++++
build.sbt | 4 ++++
data/build.sbt | 1 +
tests/docker-files/env-conf/hbase-site.xml | 5 +++++
4 files changed, 34 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/predictionio/blob/7339a16f/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 61cc4b8..65f4166 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -108,6 +108,30 @@ env:
PIO_SPARK_VERSION=2.1.1
PIO_ELASTICSEARCH_VERSION=5.5.2
+ - BUILD_TYPE=Unit
+ METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
+ PIO_SCALA_VERSION=2.11.8
+ PIO_SPARK_VERSION=2.2.0
+ - BUILD_TYPE=Integration
+ METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
+ PIO_SCALA_VERSION=2.11.8
+ PIO_SPARK_VERSION=2.2.0
+ - BUILD_TYPE=Integration
+ METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS
+ PIO_SCALA_VERSION=2.11.8
+ PIO_SPARK_VERSION=2.2.0
+ PIO_ELASTICSEARCH_VERSION=1.7.3
+ - BUILD_TYPE=Integration
+ METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
+ PIO_SCALA_VERSION=2.11.8
+ PIO_SPARK_VERSION=2.2.0
+ PIO_ELASTICSEARCH_VERSION=5.5.2
+ - BUILD_TYPE=Integration
+ METADATA_REP=ELASTICSEARCH EVENTDATA_REP=ELASTICSEARCH MODELDATA_REP=S3
+ PIO_SCALA_VERSION=2.11.8
+ PIO_SPARK_VERSION=2.2.0
+ PIO_ELASTICSEARCH_VERSION=5.5.2
+
- BUILD_TYPE=LicenseCheck
before_install:
http://git-wip-us.apache.org/repos/asf/predictionio/blob/7339a16f/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index a67b738..f65893c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -42,6 +42,10 @@ lazy val scalaSparkDepsVersion = Map(
"2.1" -> Map(
"akka" -> "2.4.17",
"hadoop" -> "2.7.3",
+ "json4s" -> "3.2.11"),
+ "2.2" -> Map(
+ "akka" -> "2.4.17",
+ "hadoop" -> "2.7.3",
"json4s" -> "3.2.11")))
name := "apache-predictionio-parent"
http://git-wip-us.apache.org/repos/asf/predictionio/blob/7339a16f/data/build.sbt
----------------------------------------------------------------------
diff --git a/data/build.sbt b/data/build.sbt
index abfa74f..87b0d96 100644
--- a/data/build.sbt
+++ b/data/build.sbt
@@ -21,6 +21,7 @@ name := "apache-predictionio-data"
libraryDependencies ++= Seq(
"com.github.nscala-time" %% "nscala-time" % "2.6.0",
+ "com.google.guava" % "guava" % "14.0.1",
"io.spray" %% "spray-can" % "1.3.3",
"io.spray" %% "spray-routing" % "1.3.3",
"io.spray" %% "spray-testkit" % "1.3.3" % "test",
http://git-wip-us.apache.org/repos/asf/predictionio/blob/7339a16f/tests/docker-files/env-conf/hbase-site.xml
----------------------------------------------------------------------
diff --git a/tests/docker-files/env-conf/hbase-site.xml b/tests/docker-files/env-conf/hbase-site.xml
index 3d5363e..40670f0 100644
--- a/tests/docker-files/env-conf/hbase-site.xml
+++ b/tests/docker-files/env-conf/hbase-site.xml
@@ -21,4 +21,9 @@ limitations under the License.
<name>hbase.zookeeper.quorum</name>
<value>hbase</value>
</property>
+ <!-- https://issues.apache.org/jira/browse/SPARK-21549 -->
+ <property>
+ <name>mapreduce.output.fileoutputformat.outputdir</name>
+ <value>/tmp</value>
+ </property>
</configuration>