You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by do...@apache.org on 2017/05/04 15:53:42 UTC
[1/2] incubator-predictionio-template-ecom-recommender git commit:
Bump to PIO 0.11.0-incubating and enhance sbt configuration
Repository: incubator-predictionio-template-ecom-recommender
Updated Branches:
refs/heads/develop 68666e7fe -> 1d0d71dc3
Bump to PIO 0.11.0-incubating and enhance sbt configuration
Closes #12
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/commit/93abf81f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/tree/93abf81f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/diff/93abf81f
Branch: refs/heads/develop
Commit: 93abf81ff35d28d1a4586f2aacb74a475f18b23b
Parents: 68666e7
Author: Naoki Takezoe <ta...@gmail.com>
Authored: Thu May 4 08:51:13 2017 -0700
Committer: Donald Szeto <ds...@salesforce.com>
Committed: Thu May 4 08:51:13 2017 -0700
----------------------------------------------------------------------
build.sbt | 6 +-----
project/assembly.sbt | 2 +-
project/build.properties | 1 +
3 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/blob/93abf81f/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index 212bcda..93ac311 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,3 @@
-import AssemblyKeys._
-
-assemblySettings
-
name := "template-scala-parallel-ecommercerecommendation"
organization := "org.apache.predictionio"
@@ -9,7 +5,7 @@ organization := "org.apache.predictionio"
parallelExecution in Test := false
libraryDependencies ++= Seq(
- "org.apache.predictionio" %% "apache-predictionio-core" % "0.10.0-incubating" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.11.0-incubating" % "provided",
"org.apache.spark" %% "spark-core" % "1.3.0" % "provided",
"org.apache.spark" %% "spark-mllib" % "1.3.0" % "provided",
"org.scalatest" %% "scalatest" % "2.2.1" % "test")
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/blob/93abf81f/project/assembly.sbt
----------------------------------------------------------------------
diff --git a/project/assembly.sbt b/project/assembly.sbt
index 54c3252..e17409e 100644
--- a/project/assembly.sbt
+++ b/project/assembly.sbt
@@ -1 +1 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.11.2")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.4")
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/blob/93abf81f/project/build.properties
----------------------------------------------------------------------
diff --git a/project/build.properties b/project/build.properties
new file mode 100644
index 0000000..64317fd
--- /dev/null
+++ b/project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.13.15
[2/2] incubator-predictionio-template-ecom-recommender git commit:
0.11.0-incubating release
Posted by do...@apache.org.
0.11.0-incubating release
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/commit/1d0d71dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/tree/1d0d71dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/diff/1d0d71dc
Branch: refs/heads/develop
Commit: 1d0d71dc372446dcd49400ed280d5a7b5f2f2860
Parents: 93abf81
Author: Donald Szeto <ds...@salesforce.com>
Authored: Thu May 4 08:53:12 2017 -0700
Committer: Donald Szeto <ds...@salesforce.com>
Committed: Thu May 4 08:53:12 2017 -0700
----------------------------------------------------------------------
README.md | 6 ++++++
build.sbt | 2 --
engine.json | 2 +-
src/main/scala/DataSource.scala | 2 +-
src/main/scala/ECommAlgorithm.scala | 2 +-
src/main/scala/Engine.scala | 2 +-
src/main/scala/Preparator.scala | 2 +-
src/main/scala/Serving.scala | 2 +-
src/test/scala/ECommAlgorithmTest.scala | 2 +-
src/test/scala/EngineTestSparkContext.scala | 2 +-
src/test/scala/PreparatorTest.scala | 2 +-
11 files changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/blob/1d0d71dc/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 857fe42..98bfe1f 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,12 @@ Please refer to http://predictionio.incubator.apache.org/templates/ecommercereco
## Versions
+### v0.11.0-incubating
+
+- Bump version number to track PredictionIO version
+- Rename Scala package name
+- Update SBT version
+
### v0.5.0
- Update for Apache PredictionIO 0.10.0-incubating
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/blob/1d0d71dc/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index 93ac311..f8f8e51 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,5 @@
name := "template-scala-parallel-ecommercerecommendation"
-organization := "org.apache.predictionio"
-
parallelExecution in Test := false
libraryDependencies ++= Seq(
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/blob/1d0d71dc/engine.json
----------------------------------------------------------------------
diff --git a/engine.json b/engine.json
index 0ea26a0..1c98895 100644
--- a/engine.json
+++ b/engine.json
@@ -1,7 +1,7 @@
{
"id": "default",
"description": "Default settings",
- "engineFactory": "org.template.ecommercerecommendation.ECommerceRecommendationEngine",
+ "engineFactory": "org.example.ecommercerecommendation.ECommerceRecommendationEngine",
"datasource": {
"params" : {
"appName": "INVALID_APP_NAME"
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/blob/1d0d71dc/src/main/scala/DataSource.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/DataSource.scala b/src/main/scala/DataSource.scala
index 05818db..4e71c2b 100644
--- a/src/main/scala/DataSource.scala
+++ b/src/main/scala/DataSource.scala
@@ -1,4 +1,4 @@
-package org.template.ecommercerecommendation
+package org.example.ecommercerecommendation
import org.apache.predictionio.controller.PDataSource
import org.apache.predictionio.controller.EmptyEvaluationInfo
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/blob/1d0d71dc/src/main/scala/ECommAlgorithm.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/ECommAlgorithm.scala b/src/main/scala/ECommAlgorithm.scala
index b962628..3542bd3 100644
--- a/src/main/scala/ECommAlgorithm.scala
+++ b/src/main/scala/ECommAlgorithm.scala
@@ -1,4 +1,4 @@
-package org.template.ecommercerecommendation
+package org.example.ecommercerecommendation
import org.apache.predictionio.controller.P2LAlgorithm
import org.apache.predictionio.controller.Params
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/blob/1d0d71dc/src/main/scala/Engine.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Engine.scala b/src/main/scala/Engine.scala
index f357215..7777b31 100644
--- a/src/main/scala/Engine.scala
+++ b/src/main/scala/Engine.scala
@@ -1,4 +1,4 @@
-package org.template.ecommercerecommendation
+package org.example.ecommercerecommendation
import org.apache.predictionio.controller.IEngineFactory
import org.apache.predictionio.controller.Engine
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/blob/1d0d71dc/src/main/scala/Preparator.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Preparator.scala b/src/main/scala/Preparator.scala
index dc7c534..1f781b1 100644
--- a/src/main/scala/Preparator.scala
+++ b/src/main/scala/Preparator.scala
@@ -1,4 +1,4 @@
-package org.template.ecommercerecommendation
+package org.example.ecommercerecommendation
import org.apache.predictionio.controller.PPreparator
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/blob/1d0d71dc/src/main/scala/Serving.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Serving.scala b/src/main/scala/Serving.scala
index 4cc20da..855b530 100644
--- a/src/main/scala/Serving.scala
+++ b/src/main/scala/Serving.scala
@@ -1,4 +1,4 @@
-package org.template.ecommercerecommendation
+package org.example.ecommercerecommendation
import org.apache.predictionio.controller.LServing
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/blob/1d0d71dc/src/test/scala/ECommAlgorithmTest.scala
----------------------------------------------------------------------
diff --git a/src/test/scala/ECommAlgorithmTest.scala b/src/test/scala/ECommAlgorithmTest.scala
index 04f6286..769bf98 100644
--- a/src/test/scala/ECommAlgorithmTest.scala
+++ b/src/test/scala/ECommAlgorithmTest.scala
@@ -1,4 +1,4 @@
-package org.template.ecommercerecommendation
+package org.example.ecommercerecommendation
import org.scalatest.FlatSpec
import org.scalatest.Matchers
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/blob/1d0d71dc/src/test/scala/EngineTestSparkContext.scala
----------------------------------------------------------------------
diff --git a/src/test/scala/EngineTestSparkContext.scala b/src/test/scala/EngineTestSparkContext.scala
index 2931403..26bc876 100644
--- a/src/test/scala/EngineTestSparkContext.scala
+++ b/src/test/scala/EngineTestSparkContext.scala
@@ -1,4 +1,4 @@
-package org.template.ecommercerecommendation
+package org.example.ecommercerecommendation
import org.apache.spark.{SparkConf, SparkContext}
import org.scalatest.{BeforeAndAfterAll, Suite}
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/blob/1d0d71dc/src/test/scala/PreparatorTest.scala
----------------------------------------------------------------------
diff --git a/src/test/scala/PreparatorTest.scala b/src/test/scala/PreparatorTest.scala
index ec421b3..45583b0 100644
--- a/src/test/scala/PreparatorTest.scala
+++ b/src/test/scala/PreparatorTest.scala
@@ -1,4 +1,4 @@
-package org.template.ecommercerecommendation
+package org.example.ecommercerecommendation
import org.scalatest.FlatSpec
import org.scalatest.Matchers