Merge branch 'develop'
diff --git a/README.md b/README.md
index 1ca76f4..55552ad 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,14 @@
## Documentation
-Please refer to http://docs.prediction.io/templates/vanilla/quickstart/
+Please refer to http://predictionio.incubator.apache.org/templates/vanilla/quickstart/
## Versions
+### v0.4.0
+
+- Update for Apache PredictionIO 0.10.0-incubating
+
### v0.3.0
- update for PredictionIO 0.9.2, including:
diff --git a/build.sbt b/build.sbt
index 2c7a35f..eed327e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,9 +4,9 @@
name := "template-scala-parallel-vanilla"
-organization := "io.prediction"
+organization := "org.apache.predictionio"
libraryDependencies ++= Seq(
- "io.prediction" %% "core" % pioVersion.value % "provided",
- "org.apache.spark" %% "spark-core" % "1.3.0" % "provided",
- "org.apache.spark" %% "spark-mllib" % "1.3.0" % "provided")
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.10.0-incubating" % "provided",
+ "org.apache.spark" %% "spark-core" % "1.3.0" % "provided",
+ "org.apache.spark" %% "spark-mllib" % "1.3.0" % "provided")
diff --git a/project/pio-build.sbt b/project/pio-build.sbt
deleted file mode 100644
index 8346a96..0000000
--- a/project/pio-build.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("io.prediction" % "pio-build" % "0.9.0")
diff --git a/src/main/scala/Algorithm.scala b/src/main/scala/Algorithm.scala
index ee7169d..7c6c9a5 100644
--- a/src/main/scala/Algorithm.scala
+++ b/src/main/scala/Algorithm.scala
@@ -1,7 +1,7 @@
package org.template.vanilla
-import io.prediction.controller.P2LAlgorithm
-import io.prediction.controller.Params
+import org.apache.predictionio.controller.P2LAlgorithm
+import org.apache.predictionio.controller.Params
import org.apache.spark.SparkContext
import org.apache.spark.SparkContext._
diff --git a/src/main/scala/DataSource.scala b/src/main/scala/DataSource.scala
index 210387e..4f4026f 100644
--- a/src/main/scala/DataSource.scala
+++ b/src/main/scala/DataSource.scala
@@ -1,11 +1,11 @@
package org.template.vanilla
-import io.prediction.controller.PDataSource
-import io.prediction.controller.EmptyEvaluationInfo
-import io.prediction.controller.EmptyActualResult
-import io.prediction.controller.Params
-import io.prediction.data.storage.Event
-import io.prediction.data.store.PEventStore
+import org.apache.predictionio.controller.PDataSource
+import org.apache.predictionio.controller.EmptyEvaluationInfo
+import org.apache.predictionio.controller.EmptyActualResult
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.data.storage.Event
+import org.apache.predictionio.data.store.PEventStore
import org.apache.spark.SparkContext
import org.apache.spark.SparkContext._
diff --git a/src/main/scala/Engine.scala b/src/main/scala/Engine.scala
index f2b4734..bfecacc 100644
--- a/src/main/scala/Engine.scala
+++ b/src/main/scala/Engine.scala
@@ -1,7 +1,7 @@
package org.template.vanilla
-import io.prediction.controller.IEngineFactory
-import io.prediction.controller.Engine
+import org.apache.predictionio.controller.IEngineFactory
+import org.apache.predictionio.controller.Engine
case class Query(q: String) extends Serializable
diff --git a/src/main/scala/Preparator.scala b/src/main/scala/Preparator.scala
index 552a94d..1504cbd 100644
--- a/src/main/scala/Preparator.scala
+++ b/src/main/scala/Preparator.scala
@@ -1,7 +1,7 @@
package org.template.vanilla
-import io.prediction.controller.PPreparator
-import io.prediction.data.storage.Event
+import org.apache.predictionio.controller.PPreparator
+import org.apache.predictionio.data.storage.Event
import org.apache.spark.SparkContext
import org.apache.spark.SparkContext._
diff --git a/src/main/scala/Serving.scala b/src/main/scala/Serving.scala
index 0477f08..c8d62c9 100644
--- a/src/main/scala/Serving.scala
+++ b/src/main/scala/Serving.scala
@@ -1,6 +1,6 @@
package org.template.vanilla
-import io.prediction.controller.LServing
+import org.apache.predictionio.controller.LServing
class Serving
extends LServing[Query, PredictedResult] {
diff --git a/template.json b/template.json
index fb4a50b..d076ec5 100644
--- a/template.json
+++ b/template.json
@@ -1 +1 @@
-{"pio": {"version": { "min": "0.9.2" }}}
+{"pio": {"version": { "min": "0.10.0-incubating" }}}
