commit 92ab3f32e00338f0e08639dd991740ee21624b1d
author Naoki Takezoe <takezoe@apache.org> Tue Mar 12 22:48:35 2019 +0900
committer Naoki Takezoe <takezoe@apache.org> Tue Mar 12 22:48:35 2019 +0900
tree 09e3cc79aeea0946220a962cd7ebc9699650aecc
parent e93dfd2f0fc5f6e4edc5a38f05580bd6610ce444
parent 8be8aa5da9309d3f90d526848924b27e8ea7f671

Merge branch 'develop'

README.md

diff --git a/README.md b/README.md
index 9ef253e..260e64e 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,10 @@
 
 ## Versions
 
+### v0.14.0
+
+Update for Apache PredictionIO 0.14.0
+
 ### v0.13.0
 
 Update for Apache PredictionIO 0.13.0

build.sbt

diff --git a/build.sbt b/build.sbt
index 9fc031a..1a3ae8c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,10 +1,10 @@
 name := "template-scala-parallel-vanilla"
 
-scalaVersion := "2.11.8"
+scalaVersion := "2.11.12"
 libraryDependencies ++= Seq(
-  "org.apache.predictionio" %% "apache-predictionio-core" % "0.13.0" % "provided",
-  "org.apache.spark"        %% "spark-mllib"              % "2.1.1" % "provided",
-  "org.scalatest"           %% "scalatest"                % "3.0.4" % "test")
+  "org.apache.predictionio" %% "apache-predictionio-core" % "0.14.0" % "provided",
+  "org.apache.spark"        %% "spark-mllib"              % "2.4.0" % "provided",
+  "org.scalatest"           %% "scalatest"                % "3.0.5" % "test")
 
 // SparkContext is shared between all tests via SharedSingletonContext
 parallelExecution in Test := false

project/assembly.sbt

diff --git a/project/assembly.sbt b/project/assembly.sbt
index d95475f..9c01471 100644
--- a/project/assembly.sbt
+++ b/project/assembly.sbt
@@ -1 +1 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.7")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")

project/build.properties

diff --git a/project/build.properties b/project/build.properties
index c091b86..c0bab04 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.16
+sbt.version=1.2.8