Skip to content

Commit

Permalink
[PIO-125] Spark 2.2 support
Browse files Browse the repository at this point in the history
Closes apache#436
  • Loading branch information
marevol committed Oct 25, 2017
1 parent 018ea8e commit a60c01b
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 0 deletions.
24 changes: 24 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ lazy val scalaSparkDepsVersion = Map(
"hadoop" -> "2.7.3",
"json4s" -> "3.2.11"),
"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")))
Expand Down
1 change: 1 addition & 0 deletions data/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions tests/docker-files/env-conf/hbase-site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

0 comments on commit a60c01b

Please sign in to comment.