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 00:18:12 UTC

[1/3] incubator-predictionio-template-similar-product git commit: Bump to PIO 0.11.0-incubating and enhance sbt configuration

Repository: incubator-predictionio-template-similar-product
Updated Branches:
  refs/heads/master d75189b1d -> 8b5f69dec


Bump to PIO 0.11.0-incubating and enhance sbt configuration

Closes #14


Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/commit/5535929a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/tree/5535929a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/diff/5535929a

Branch: refs/heads/master
Commit: 5535929aec4102f9ab87b338461d82b627f647ef
Parents: 9c240b5
Author: Naoki Takezoe <ta...@gmail.com>
Authored: Wed May 3 17:12:15 2017 -0700
Committer: Donald Szeto <ds...@salesforce.com>
Committed: Wed May 3 17:12:15 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-similar-product/blob/5535929a/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index e47aee3..a77990c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,3 @@
-import AssemblyKeys._
-
-assemblySettings
-
 name := "template-scala-parallel-similarproduct"
 
 organization := "org.apache.predictionio"
@@ -11,7 +7,7 @@ parallelExecution in Test := false
 test in assembly := {}
 
 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-similar-product/blob/5535929a/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-similar-product/blob/5535929a/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/3] incubator-predictionio-template-similar-product 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-similar-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/commit/893fca51
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/tree/893fca51
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/diff/893fca51

Branch: refs/heads/master
Commit: 893fca51b57913b4c1fa5ba41af744ba21808dd8
Parents: 5535929
Author: Donald Szeto <ds...@salesforce.com>
Authored: Wed May 3 17:17:31 2017 -0700
Committer: Donald Szeto <ds...@salesforce.com>
Committed: Wed May 3 17:17:31 2017 -0700

----------------------------------------------------------------------
 README.md                                     | 6 ++++++
 build.sbt                                     | 2 --
 engine-cooccurrence.json                      | 2 +-
 engine.json                                   | 2 +-
 src/main/scala/ALSAlgorithm.scala             | 2 +-
 src/main/scala/CooccurrenceAlgorithm.scala    | 2 +-
 src/main/scala/DataSource.scala               | 2 +-
 src/main/scala/Engine.scala                   | 2 +-
 src/main/scala/Preparator.scala               | 2 +-
 src/main/scala/Serving.scala                  | 2 +-
 src/test/scala/CooccurenceAlgorithmTest.scala | 2 +-
 src/test/scala/EngineTestSparkContext.scala   | 2 +-
 12 files changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/893fca51/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index f874bd5..338c556 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,12 @@ Please refer to http://predictionio.incubator.apache.org/templates/similarproduc
 
 ## Versions
 
+### v0.11.0-incubating
+
+- Bump version number to track PredictionIO version
+- Rename Scala package name
+- Update SBT version
+
 ### v0.4.0
 
 Update for Apache PredictionIO 0.10.0-incubating

http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/893fca51/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index a77990c..4e22d10 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,5 @@
 name := "template-scala-parallel-similarproduct"
 
-organization := "org.apache.predictionio"
-
 parallelExecution in Test := false
 
 test in assembly := {}

http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/893fca51/engine-cooccurrence.json
----------------------------------------------------------------------
diff --git a/engine-cooccurrence.json b/engine-cooccurrence.json
index ba1a603..61d931f 100644
--- a/engine-cooccurrence.json
+++ b/engine-cooccurrence.json
@@ -1,7 +1,7 @@
 {
   "id": "default",
   "description": "Default settings",
-  "engineFactory": "org.template.similarproduct.SimilarProductEngine",
+  "engineFactory": "org.example.similarproduct.SimilarProductEngine",
   "datasource": {
     "params" : {
       "appName": "INVALID_APP_NAME"

http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/893fca51/engine.json
----------------------------------------------------------------------
diff --git a/engine.json b/engine.json
index d1afffa..2daec06 100644
--- a/engine.json
+++ b/engine.json
@@ -1,7 +1,7 @@
 {
   "id": "default",
   "description": "Default settings",
-  "engineFactory": "org.template.similarproduct.SimilarProductEngine",
+  "engineFactory": "org.example.similarproduct.SimilarProductEngine",
   "datasource": {
     "params" : {
       "appName": "INVALID_APP_NAME"

http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/893fca51/src/main/scala/ALSAlgorithm.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/ALSAlgorithm.scala b/src/main/scala/ALSAlgorithm.scala
index 2b6a3bb..7cdf6e9 100644
--- a/src/main/scala/ALSAlgorithm.scala
+++ b/src/main/scala/ALSAlgorithm.scala
@@ -1,4 +1,4 @@
-package org.template.similarproduct
+package org.example.similarproduct
 
 import org.apache.predictionio.controller.P2LAlgorithm
 import org.apache.predictionio.controller.Params

http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/893fca51/src/main/scala/CooccurrenceAlgorithm.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/CooccurrenceAlgorithm.scala b/src/main/scala/CooccurrenceAlgorithm.scala
index dbac702..b56ecec 100644
--- a/src/main/scala/CooccurrenceAlgorithm.scala
+++ b/src/main/scala/CooccurrenceAlgorithm.scala
@@ -1,4 +1,4 @@
-package org.template.similarproduct
+package org.example.similarproduct
 
 import org.apache.predictionio.controller.P2LAlgorithm
 import org.apache.predictionio.controller.Params

http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/893fca51/src/main/scala/DataSource.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/DataSource.scala b/src/main/scala/DataSource.scala
index f4c7221..870771b 100644
--- a/src/main/scala/DataSource.scala
+++ b/src/main/scala/DataSource.scala
@@ -1,4 +1,4 @@
-package org.template.similarproduct
+package org.example.similarproduct
 
 import org.apache.predictionio.controller.PDataSource
 import org.apache.predictionio.controller.EmptyEvaluationInfo

http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/893fca51/src/main/scala/Engine.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Engine.scala b/src/main/scala/Engine.scala
index c7a6a21..ac587d7 100644
--- a/src/main/scala/Engine.scala
+++ b/src/main/scala/Engine.scala
@@ -1,4 +1,4 @@
-package org.template.similarproduct
+package org.example.similarproduct
 
 import org.apache.predictionio.controller.IEngineFactory
 import org.apache.predictionio.controller.Engine

http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/893fca51/src/main/scala/Preparator.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Preparator.scala b/src/main/scala/Preparator.scala
index 6b84b01..f5fe1c1 100644
--- a/src/main/scala/Preparator.scala
+++ b/src/main/scala/Preparator.scala
@@ -1,4 +1,4 @@
-package org.template.similarproduct
+package org.example.similarproduct
 
 import org.apache.predictionio.controller.PPreparator
 

http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/893fca51/src/main/scala/Serving.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Serving.scala b/src/main/scala/Serving.scala
index 8543796..b9a1605 100644
--- a/src/main/scala/Serving.scala
+++ b/src/main/scala/Serving.scala
@@ -1,4 +1,4 @@
-package org.template.similarproduct
+package org.example.similarproduct
 
 import org.apache.predictionio.controller.LServing
 

http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/893fca51/src/test/scala/CooccurenceAlgorithmTest.scala
----------------------------------------------------------------------
diff --git a/src/test/scala/CooccurenceAlgorithmTest.scala b/src/test/scala/CooccurenceAlgorithmTest.scala
index 29ac40e..dcddb73 100644
--- a/src/test/scala/CooccurenceAlgorithmTest.scala
+++ b/src/test/scala/CooccurenceAlgorithmTest.scala
@@ -1,4 +1,4 @@
-package org.template.similarproduct
+package org.example.similarproduct
 
 import org.apache.predictionio.data.storage.BiMap
 

http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/893fca51/src/test/scala/EngineTestSparkContext.scala
----------------------------------------------------------------------
diff --git a/src/test/scala/EngineTestSparkContext.scala b/src/test/scala/EngineTestSparkContext.scala
index f509c2f..ba92e65 100644
--- a/src/test/scala/EngineTestSparkContext.scala
+++ b/src/test/scala/EngineTestSparkContext.scala
@@ -1,4 +1,4 @@
-package org.template.similarproduct
+package org.example.similarproduct
 
 import org.apache.spark.{SparkConf, SparkContext}
 import org.scalatest.{BeforeAndAfterAll, Suite}


[3/3] incubator-predictionio-template-similar-product git commit: Merge branch 'develop'

Posted by do...@apache.org.
Merge branch 'develop'


Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/commit/8b5f69de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/tree/8b5f69de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/diff/8b5f69de

Branch: refs/heads/master
Commit: 8b5f69dec918fcb066c32649258414a1a50250d8
Parents: d75189b 893fca5
Author: Donald Szeto <ds...@salesforce.com>
Authored: Wed May 3 17:18:08 2017 -0700
Committer: Donald Szeto <ds...@salesforce.com>
Committed: Wed May 3 17:18:08 2017 -0700

----------------------------------------------------------------------
 README.md                                     | 6 ++++++
 build.sbt                                     | 8 +-------
 engine-cooccurrence.json                      | 2 +-
 engine.json                                   | 2 +-
 project/assembly.sbt                          | 2 +-
 project/build.properties                      | 1 +
 src/main/scala/ALSAlgorithm.scala             | 2 +-
 src/main/scala/CooccurrenceAlgorithm.scala    | 2 +-
 src/main/scala/DataSource.scala               | 2 +-
 src/main/scala/Engine.scala                   | 2 +-
 src/main/scala/Preparator.scala               | 2 +-
 src/main/scala/Serving.scala                  | 2 +-
 src/test/scala/CooccurenceAlgorithmTest.scala | 2 +-
 src/test/scala/EngineTestSparkContext.scala   | 2 +-
 14 files changed, 19 insertions(+), 18 deletions(-)
----------------------------------------------------------------------