You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by sh...@apache.org on 2018/09/19 11:06:13 UTC
[01/13] predictionio git commit: [PIO-152] Fix DOAP PMC field value
Repository: predictionio
Updated Branches:
refs/heads/livedoc 844486a44 -> 5da595b96
[PIO-152] Fix DOAP PMC field value
Project: http://git-wip-us.apache.org/repos/asf/predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/predictionio/commit/ca0e0508
Tree: http://git-wip-us.apache.org/repos/asf/predictionio/tree/ca0e0508
Diff: http://git-wip-us.apache.org/repos/asf/predictionio/diff/ca0e0508
Branch: refs/heads/livedoc
Commit: ca0e05080e2a4e1a54292819835e0c26d2993dce
Parents: afbbe75
Author: Donald Szeto <do...@apache.org>
Authored: Mon Mar 12 09:50:07 2018 -0700
Committer: Donald Szeto <do...@apache.org>
Committed: Mon Mar 12 09:50:07 2018 -0700
----------------------------------------------------------------------
doap.rdf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/predictionio/blob/ca0e0508/doap.rdf
----------------------------------------------------------------------
diff --git a/doap.rdf b/doap.rdf
index 0f59524..26f430f 100644
--- a/doap.rdf
+++ b/doap.rdf
@@ -26,7 +26,7 @@
<license rdf:resource="http://spdx.org/licenses/Apache-2.0" />
<name>Apache PredictionIO</name>
<homepage rdf:resource="http://predictionio.apache.org/" />
- <asfext:pmc rdf:resource="http://apache.org" />
+ <asfext:pmc rdf:resource="http://predictionio.apache.org" />
<shortdesc>PredictionIO is an open source Machine Learning Server built on top of state-of-the-art open source stack, that enables developers to manage and deploy production-ready predictive services for various kinds of machine learning tasks.</shortdesc>
<description>PredictionIO is an open source Machine Learning Server built on top of state-of-the-art open source stack, that enables developers to manage and deploy production-ready predictive services for various kinds of machine learning tasks.</description>
<bug-database rdf:resource="https://issues.apache.org/jira/browse/PIO" />
[12/13] predictionio git commit: Update RELEASE.md
Posted by sh...@apache.org.
Update RELEASE.md
Project: http://git-wip-us.apache.org/repos/asf/predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/predictionio/commit/1856635b
Tree: http://git-wip-us.apache.org/repos/asf/predictionio/tree/1856635b
Diff: http://git-wip-us.apache.org/repos/asf/predictionio/diff/1856635b
Branch: refs/heads/livedoc
Commit: 1856635be6f9f77622c567fecba9568538f1fc16
Parents: e7ef2c8
Author: shimamoto <sh...@apache.org>
Authored: Wed Sep 19 14:13:08 2018 +0900
Committer: shimamoto <sh...@apache.org>
Committed: Wed Sep 19 14:13:08 2018 +0900
----------------------------------------------------------------------
RELEASE.md | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/predictionio/blob/1856635b/RELEASE.md
----------------------------------------------------------------------
diff --git a/RELEASE.md b/RELEASE.md
index 1257915..1b40ce1 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -21,6 +21,32 @@ limitations under the License.
## Version History
+### 0.13.0
+
+Sep 20, 2018
+
+#### New Features
+
+- [PIO-161](https://issues.apache.org/jira/browse/PIO-161): Spark 2.3 support.
+
+#### Behavior Changes
+
+- [PIO-158](https://issues.apache.org/jira/browse/PIO-158): More officially deprecate support for Scala 2.10 and Spark 1.x.
+
+#### Other Changes
+
+- [PIO-152](https://issues.apache.org/jira/browse/PIO-152): DOAP syntax error.
+- [PIO-155](https://issues.apache.org/jira/browse/PIO-155): Fix 'Topic Labelling with Wikipedia' Template Link.
+- [PIO-156](https://issues.apache.org/jira/browse/PIO-156): Stale release on download page.
+- [PIO-160](https://issues.apache.org/jira/browse/PIO-160): Array out of bound exception in JDBCUtils when --env is not supplied to CreateWorkflow.
+
+#### Credits
+
+The following contributors have spent a great deal of effort to bring to you
+this release:
+
+Donald Szeto, Takako Shimamoto
+
### 0.12.1
Mar 11, 2018
[09/13] predictionio git commit: [PIO-160] Fix JDBCUtils.stringToMap()
Posted by sh...@apache.org.
[PIO-160] Fix JDBCUtils.stringToMap()
Closes #463
Project: http://git-wip-us.apache.org/repos/asf/predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/predictionio/commit/18fa9b7a
Tree: http://git-wip-us.apache.org/repos/asf/predictionio/tree/18fa9b7a
Diff: http://git-wip-us.apache.org/repos/asf/predictionio/diff/18fa9b7a
Branch: refs/heads/livedoc
Commit: 18fa9b7af1c968a60b5a78e532a4499726cccfca
Parents: eac83c5
Author: Donald Szeto <ds...@salesforce.com>
Authored: Mon Sep 10 20:35:18 2018 +0900
Committer: Naoki Takezoe <ta...@apache.org>
Committed: Mon Sep 10 20:36:37 2018 +0900
----------------------------------------------------------------------
.../data/storage/jdbc/JDBCUtils.scala | 12 +++--
.../data/storage/jdbc/JDBCUtilsSpec.scala | 50 ++++++++++++++++++++
2 files changed, 58 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/predictionio/blob/18fa9b7a/storage/jdbc/src/main/scala/org/apache/predictionio/data/storage/jdbc/JDBCUtils.scala
----------------------------------------------------------------------
diff --git a/storage/jdbc/src/main/scala/org/apache/predictionio/data/storage/jdbc/JDBCUtils.scala b/storage/jdbc/src/main/scala/org/apache/predictionio/data/storage/jdbc/JDBCUtils.scala
index 3eb55ba..98fa257 100644
--- a/storage/jdbc/src/main/scala/org/apache/predictionio/data/storage/jdbc/JDBCUtils.scala
+++ b/storage/jdbc/src/main/scala/org/apache/predictionio/data/storage/jdbc/JDBCUtils.scala
@@ -76,10 +76,14 @@ object JDBCUtils {
* @return Map of String to String, e.g. Map("FOO" -> "BAR", "X" -> "Y", ...)
*/
def stringToMap(str: String): Map[String, String] = {
- str.split(",").map { x =>
- val y = x.split("=")
- y(0) -> y(1)
- }.toMap[String, String]
+ if (str.isEmpty) {
+ Map.empty[String, String]
+ } else {
+ str.split(",").map { x =>
+ val y = x.split("=")
+ y(0) -> y(1)
+ }.toMap[String, String]
+ }
}
/** Generate 32-character random ID using UUID with - stripped */
http://git-wip-us.apache.org/repos/asf/predictionio/blob/18fa9b7a/storage/jdbc/src/test/scala/org/apache/predictionio/data/storage/jdbc/JDBCUtilsSpec.scala
----------------------------------------------------------------------
diff --git a/storage/jdbc/src/test/scala/org/apache/predictionio/data/storage/jdbc/JDBCUtilsSpec.scala b/storage/jdbc/src/test/scala/org/apache/predictionio/data/storage/jdbc/JDBCUtilsSpec.scala
new file mode 100644
index 0000000..2282643
--- /dev/null
+++ b/storage/jdbc/src/test/scala/org/apache/predictionio/data/storage/jdbc/JDBCUtilsSpec.scala
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.predictionio.data.storage.jdbc
+
+import org.specs2.Specification
+
+class JDBCUtilsSpec extends Specification {
+ def is = s2"""
+
+ PredictionIO JDBC Utilities Specification
+
+ driverType should extract the correct portion from a JDBC URL ${driverType}
+ mapToString should return an empty string with empty map input ${mapToStringEmptyInput}
+ stringToMap should correctly create mapping ${stringToMap}
+ stringToMap should return an empty map with empty string input ${stringToMapEmptyInput}
+
+ """
+
+ def driverType = {
+ JDBCUtils.driverType("jdbc:postgresql://remotehost:5432/somedbname") must beEqualTo("postgresql")
+ }
+
+ def mapToStringEmptyInput = {
+ JDBCUtils.mapToString(Map.empty[String, String]) must be empty
+ }
+
+ def stringToMap = {
+ val m = JDBCUtils.stringToMap("FOO=BAR,DEAD=BEEF")
+ m must havePairs("FOO" -> "BAR", "DEAD" -> "BEEF")
+ }
+
+ def stringToMapEmptyInput = {
+ JDBCUtils.stringToMap("") must be empty
+ }
+}
[10/13] predictionio git commit: Merge branch 'livedoc' into develop
Posted by sh...@apache.org.
Merge branch 'livedoc' into develop
Project: http://git-wip-us.apache.org/repos/asf/predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/predictionio/commit/3f637e54
Tree: http://git-wip-us.apache.org/repos/asf/predictionio/tree/3f637e54
Diff: http://git-wip-us.apache.org/repos/asf/predictionio/diff/3f637e54
Branch: refs/heads/livedoc
Commit: 3f637e54f290733e8cb1f741d156a97436d33c8d
Parents: 18fa9b7 52a0891
Author: shimamoto <sh...@apache.org>
Authored: Tue Sep 11 19:59:09 2018 +0900
Committer: shimamoto <sh...@apache.org>
Committed: Tue Sep 11 19:59:09 2018 +0900
----------------------------------------------------------------------
docs/manual/data/nav/main.yml | 2 +-
.../source/community/contribute-sdk.html.md | 6 +--
docs/manual/source/demo/community.html.md | 4 +-
docs/manual/source/evaluation/index.html.md | 2 +-
docs/manual/source/index.html.md.erb | 11 ++--
.../install/install-sourcecode.html.md.erb | 54 +++++++++++++++++---
docs/manual/source/partials/_footer.html.slim | 4 +-
7 files changed, 60 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/predictionio/blob/3f637e54/docs/manual/source/install/install-sourcecode.html.md.erb
----------------------------------------------------------------------
[07/13] predictionio git commit: Merge branch 'livedoc' into develop
Posted by sh...@apache.org.
Merge branch 'livedoc' into develop
Project: http://git-wip-us.apache.org/repos/asf/predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/predictionio/commit/a18475ac
Tree: http://git-wip-us.apache.org/repos/asf/predictionio/tree/a18475ac
Diff: http://git-wip-us.apache.org/repos/asf/predictionio/diff/a18475ac
Branch: refs/heads/livedoc
Commit: a18475ace48f8151a3613c569edf6824463cbf7b
Parents: ff6a076 1c8ea8a
Author: Donald Szeto <do...@apache.org>
Authored: Mon Aug 27 16:24:14 2018 -0700
Committer: Donald Szeto <do...@apache.org>
Committed: Mon Aug 27 16:24:14 2018 -0700
----------------------------------------------------------------------
docs/manual/source/gallery/templates.yaml | 14 ++
.../images/intellij/intelliJ-scala-plugin.png | Bin 89212 -> 187820 bytes
.../images/intellij/intellij-config-2.png | Bin 259619 -> 0 bytes
.../images/intellij/intellij-dependencies.png | Bin 238042 -> 0 bytes
.../intellij/intellij-module-settings.png | Bin 0 -> 471191 bytes
.../images/intellij/intellij-scala-plugin-2.png | Bin 128386 -> 244855 bytes
.../images/intellij/pio-runtime-jar-deps.png | Bin 258163 -> 0 bytes
.../source/images/intellij/pio-runtime-jars.png | Bin 650385 -> 0 bytes
.../images/intellij/pio-train-env-vars.png | Bin 0 -> 212997 bytes
.../manual/source/images/intellij/pio-train.png | Bin 0 -> 274725 bytes
.../source/resources/intellij.html.md.erb | 218 +++++++++++--------
11 files changed, 136 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
[02/13] predictionio git commit: Merge remote-tracking branch
'origin/release/0.12.1' into develop
Posted by sh...@apache.org.
Merge remote-tracking branch 'origin/release/0.12.1' into develop
Project: http://git-wip-us.apache.org/repos/asf/predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/predictionio/commit/f19d0154
Tree: http://git-wip-us.apache.org/repos/asf/predictionio/tree/f19d0154
Diff: http://git-wip-us.apache.org/repos/asf/predictionio/diff/f19d0154
Branch: refs/heads/livedoc
Commit: f19d0154d36aa8b596f1f041e092cc56e23c030a
Parents: ca0e050 20a1c37
Author: Chan Lee <ch...@gmail.com>
Authored: Tue Mar 13 17:07:55 2018 -0700
Committer: Chan Lee <ch...@gmail.com>
Committed: Tue Mar 13 17:07:55 2018 -0700
----------------------------------------------------------------------
RELEASE.md | 39 +++++++++++++++++++-
build.sbt | 2 +-
.../add-algorithm/build.sbt | 2 +-
.../reading-custom-properties/build.sbt | 2 +-
.../adjust-score/build.sbt | 2 +-
.../train-with-rate-event/build.sbt | 2 +-
.../blacklist-items/build.sbt | 2 +-
.../customize-data-prep/build.sbt | 2 +-
.../customize-serving/build.sbt | 2 +-
.../reading-custom-events/build.sbt | 2 +-
.../train-with-view-event/build.sbt | 2 +-
.../multi-events-multi-algos/build.sbt | 2 +-
.../recommended-user/build.sbt | 2 +-
.../return-item-properties/build.sbt | 2 +-
.../rid-user-set-event/build.sbt | 2 +-
.../train-with-rate-event/build.sbt | 2 +-
.../engines/recommendation-engine/build.sbt | 2 +-
17 files changed, 54 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
[13/13] predictionio git commit: Merge branch 'release/0.13.0' into
livedoc
Posted by sh...@apache.org.
Merge branch 'release/0.13.0' into livedoc
Project: http://git-wip-us.apache.org/repos/asf/predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/predictionio/commit/5da595b9
Tree: http://git-wip-us.apache.org/repos/asf/predictionio/tree/5da595b9
Diff: http://git-wip-us.apache.org/repos/asf/predictionio/diff/5da595b9
Branch: refs/heads/livedoc
Commit: 5da595b963c09431eeb753252c9e2befae4231f7
Parents: 844486a 1856635
Author: shimamoto <sh...@apache.org>
Authored: Wed Sep 19 20:04:37 2018 +0900
Committer: shimamoto <sh...@apache.org>
Committed: Wed Sep 19 20:04:37 2018 +0900
----------------------------------------------------------------------
.travis.yml | 35 +++++++++++-
KEYS | 58 ++++++++++++++++++++
RELEASE.md | 26 +++++++++
bin/pio-class | 2 +-
build.sbt | 12 +++-
conf/pio-vendors.sh | 3 +-
.../apache/predictionio/controller/Engine.scala | 4 +-
.../apache/predictionio/core/AbstractDoer.scala | 2 +-
.../core/SelfCleaningDataSource.scala | 4 +-
.../predictionio/workflow/FakeWorkflow.scala | 2 +-
.../mailchimp/MailChimpConnectorSpec.scala | 12 ++--
data/test.sh | 2 +-
docs/manual/data/versions.yml | 2 +-
.../manual/source/datacollection/plugin.html.md | 2 +-
docs/manual/source/deploy/plugin.html.md | 2 +-
docs/manual/source/install/index.html.md.erb | 3 +
.../install/install-sourcecode.html.md.erb | 6 +-
docs/manual/source/system/index.html.md | 8 ---
docs/scaladoc/README.md | 2 +-
.../scala-parallel-classification/README.md | 2 +-
.../add-algorithm/build.sbt | 2 +-
.../reading-custom-properties/build.sbt | 2 +-
.../README.md | 2 +-
.../adjust-score/build.sbt | 2 +-
.../train-with-rate-event/build.sbt | 2 +-
.../scala-parallel-recommendation/README.md | 2 +-
.../blacklist-items/build.sbt | 2 +-
.../customize-data-prep/build.sbt | 2 +-
.../customize-serving/build.sbt | 2 +-
.../reading-custom-events/build.sbt | 2 +-
.../train-with-view-event/build.sbt | 2 +-
.../scala-parallel-similarproduct/README.md | 2 +-
.../multi-events-multi-algos/build.sbt | 2 +-
.../recommended-user/build.sbt | 2 +-
.../return-item-properties/build.sbt | 2 +-
.../rid-user-set-event/build.sbt | 2 +-
.../train-with-rate-event/build.sbt | 2 +-
.../data/storage/hbase/HBEventsUtil.scala | 2 +-
.../data/storage/jdbc/JDBCUtils.scala | 12 ++--
.../data/storage/jdbc/JDBCUtilsSpec.scala | 50 +++++++++++++++++
tests/build_docker.sh | 7 ++-
tests/pio_tests/README.md | 4 +-
.../engines/recommendation-engine/build.sbt | 2 +-
tests/pio_tests/utils.py | 2 +-
.../predictionio/tools/commands/App.scala | 2 +-
.../tools/commands/Management.scala | 2 +-
46 files changed, 240 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/predictionio/blob/5da595b9/docs/manual/source/system/index.html.md
----------------------------------------------------------------------
diff --cc docs/manual/source/system/index.html.md
index b4fe884,dcff342..8e9667d
--- a/docs/manual/source/system/index.html.md
+++ b/docs/manual/source/system/index.html.md
@@@ -19,19 -19,7 +19,11 @@@ See the License for the specific langua
limitations under the License.
-->
- During the [installation](/install), you have installed the latest stable
- versions of the following software:
-
- * Apache Hadoop up to 2.7.2 (required only if YARN and HDFS are needed)
- * Apache HBase up to 1.2.4
- * Apache Spark up to 1.6.3, or up to 2.3.1
- * Elasticsearch up to 1.7.5, or up to 5.6.11
-
-This section explains general rules-of-thumb for how they are used in PredictionIO. The actual implementation of the Template will define how much of this applies. PredictionIO is flexible about much of this configuration but its Templates generally fit the Lambda model for integrating real-time serving with background periodic model updates.
+This section explains general rules-of-thumb for how they are used in
+PredictionIO. The actual implementation of the Template will define how much of
+this applies. PredictionIO is flexible about much of this configuration but its
+Templates generally fit the Lambda model for integrating real-time serving with
+background periodic model updates.
[05/13] predictionio git commit: Adding travis_retry on steps with
network timeouts
Posted by sh...@apache.org.
Adding travis_retry on steps with network timeouts
Project: http://git-wip-us.apache.org/repos/asf/predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/predictionio/commit/7ad9be47
Tree: http://git-wip-us.apache.org/repos/asf/predictionio/tree/7ad9be47
Diff: http://git-wip-us.apache.org/repos/asf/predictionio/diff/7ad9be47
Branch: refs/heads/livedoc
Commit: 7ad9be47484475b95e10b8e08c9b46f1dc84b949
Parents: f0903c6
Author: Donald Szeto <do...@apache.org>
Authored: Thu Aug 16 18:32:00 2018 -0700
Committer: Donald Szeto <do...@apache.org>
Committed: Thu Aug 16 18:32:00 2018 -0700
----------------------------------------------------------------------
.travis.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/predictionio/blob/7ad9be47/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 65f4166..d2a8d2f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -137,17 +137,17 @@ env:
before_install:
- unset SBT_OPTS JVM_OPTS
- sudo rm /usr/local/bin/docker-compose
- - curl -L https://github.com/docker/compose/releases/download/1.11.1/docker-compose-`uname -s`-`uname -m` > docker-compose
+ - travis_retry curl -L https://github.com/docker/compose/releases/download/1.11.1/docker-compose-`uname -s`-`uname -m` > docker-compose
- chmod +x docker-compose
- sudo mv docker-compose /usr/local/bin
before_script:
- sudo sysctl -w vm.max_map_count=262144
- docker-compose -v
- - ./tests/before_script.travis.sh
+ - travis_retry ./tests/before_script.travis.sh
script:
- - ./tests/script.travis.sh
+ - travis_retry ./tests/script.travis.sh
after_script:
- ./tests/after_script.travis.sh
[08/13] predictionio git commit: [PIO-161] Spark 2.3 support
Posted by sh...@apache.org.
[PIO-161] Spark 2.3 support
Closes #461
Project: http://git-wip-us.apache.org/repos/asf/predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/predictionio/commit/eac83c5b
Tree: http://git-wip-us.apache.org/repos/asf/predictionio/tree/eac83c5b
Diff: http://git-wip-us.apache.org/repos/asf/predictionio/diff/eac83c5b
Branch: refs/heads/livedoc
Commit: eac83c5b3c52317ac5124021c8cd95671badb7ff
Parents: a18475a
Author: Donald Szeto <do...@apache.org>
Authored: Sun Sep 2 20:13:20 2018 -0700
Committer: Donald Szeto <do...@apache.org>
Committed: Sun Sep 2 20:13:20 2018 -0700
----------------------------------------------------------------------
.travis.yml | 29 +++++++++++++++++++++++++++++
build.sbt | 4 ++++
conf/pio-vendors.sh | 3 ++-
tests/build_docker.sh | 7 +++++--
4 files changed, 40 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/predictionio/blob/eac83c5b/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index d2a8d2f..49cbb65 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -132,6 +132,35 @@ env:
PIO_SPARK_VERSION=2.2.0
PIO_ELASTICSEARCH_VERSION=5.5.2
+ - BUILD_TYPE=Unit
+ METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
+ PIO_SCALA_VERSION=2.11.12
+ PIO_SPARK_VERSION=2.3.1
+ PIO_HADOOP_VERSION=2.7.7
+ - BUILD_TYPE=Integration
+ METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
+ PIO_SCALA_VERSION=2.11.12
+ PIO_SPARK_VERSION=2.3.1
+ PIO_HADOOP_VERSION=2.7.7
+ - BUILD_TYPE=Integration
+ METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS
+ PIO_SCALA_VERSION=2.11.12
+ PIO_SPARK_VERSION=2.3.1
+ PIO_ELASTICSEARCH_VERSION=1.7.3
+ PIO_HADOOP_VERSION=2.7.7
+ - BUILD_TYPE=Integration
+ METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
+ PIO_SCALA_VERSION=2.11.12
+ PIO_SPARK_VERSION=2.3.1
+ PIO_ELASTICSEARCH_VERSION=5.5.2
+ PIO_HADOOP_VERSION=2.7.7
+ - BUILD_TYPE=Integration
+ METADATA_REP=ELASTICSEARCH EVENTDATA_REP=ELASTICSEARCH MODELDATA_REP=S3
+ PIO_SCALA_VERSION=2.11.12
+ PIO_SPARK_VERSION=2.3.1
+ PIO_ELASTICSEARCH_VERSION=5.5.2
+ PIO_HADOOP_VERSION=2.7.7
+
- BUILD_TYPE=LicenseCheck
before_install:
http://git-wip-us.apache.org/repos/asf/predictionio/blob/eac83c5b/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index 0243610..c753f76 100644
--- a/build.sbt
+++ b/build.sbt
@@ -46,6 +46,10 @@ lazy val scalaSparkDepsVersion = Map(
"2.2" -> Map(
"akka" -> "2.4.17",
"hadoop" -> "2.7.3",
+ "json4s" -> "3.2.11"),
+ "2.3" -> Map(
+ "akka" -> "2.4.17",
+ "hadoop" -> "2.7.3",
"json4s" -> "3.2.11")))
name := "apache-predictionio-parent"
http://git-wip-us.apache.org/repos/asf/predictionio/blob/eac83c5b/conf/pio-vendors.sh
----------------------------------------------------------------------
diff --git a/conf/pio-vendors.sh b/conf/pio-vendors.sh
index 6420207..162372f 100644
--- a/conf/pio-vendors.sh
+++ b/conf/pio-vendors.sh
@@ -51,7 +51,8 @@ PGSQL_DOWNLOAD=https://jdbc.postgresql.org/download/${PGSQL_JAR}
HADOOP_MAJOR=`echo $PIO_HADOOP_VERSION | awk -F. '{print $1 "." $2}'`
SPARK_DIR=spark-${PIO_SPARK_VERSION}-bin-hadoop${HADOOP_MAJOR}
SPARK_ARCHIVE=${SPARK_DIR}.tgz
-SPARK_DOWNLOAD=http://d3kbcqa49mib13.cloudfront.net/${SPARK_ARCHIVE}
+SPARK_DOWNLOAD_MIRROR=https://www.apache.org/dyn/closer.lua\?action=download\&filename=spark/spark-${PIO_SPARK_VERSION}/${SPARK_ARCHIVE}
+SPARK_DOWNLOAD_ARCHIVE=https://archive.apache.org/dist/spark/spark-${PIO_SPARK_VERSION}/${SPARK_ARCHIVE}
# ELASTICSEARCH_DOWNLOAD
# 5.x https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${PIO_ELASTICSEARCH_VERSION}.tar.gz
# 1.x https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${PIO_ELASTICSEARCH_VERSION}.tar.gz
http://git-wip-us.apache.org/repos/asf/predictionio/blob/eac83c5b/tests/build_docker.sh
----------------------------------------------------------------------
diff --git a/tests/build_docker.sh b/tests/build_docker.sh
index b17a304..2c6f8f8 100755
--- a/tests/build_docker.sh
+++ b/tests/build_docker.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -ex
+#!/usr/bin/env bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -28,7 +28,10 @@ if [ ! -f $DIR/docker-files/${PGSQL_JAR} ]; then
mv ${PGSQL_JAR} $DIR/docker-files/
fi
if [ ! -f $DIR/docker-files/${SPARK_ARCHIVE} ]; then
- wget $SPARK_DOWNLOAD
+ curl -fLo $SPARK_ARCHIVE $SPARK_DOWNLOAD_MIRROR
+ if [[ $? -ne 0 ]]; then
+ curl -fLo $SPARK_ARCHIVE $SPARK_DOWNLOAD_ARCHIVE
+ fi
mv $SPARK_ARCHIVE $DIR/docker-files/
fi
[04/13] predictionio git commit: Merge branch 'livedoc' into develop
Posted by sh...@apache.org.
Merge branch 'livedoc' into develop
Project: http://git-wip-us.apache.org/repos/asf/predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/predictionio/commit/f0903c64
Tree: http://git-wip-us.apache.org/repos/asf/predictionio/tree/f0903c64
Diff: http://git-wip-us.apache.org/repos/asf/predictionio/diff/f0903c64
Branch: refs/heads/livedoc
Commit: f0903c6436476b8edc4e5b4ca2655078befdc21b
Parents: da4c9d6 54415e1
Author: Naoki Takezoe <ta...@apache.org>
Authored: Sat Aug 11 09:18:13 2018 +0900
Committer: Naoki Takezoe <ta...@apache.org>
Committed: Sat Aug 11 09:18:13 2018 +0900
----------------------------------------------------------------------
docs/manual/source/deploy/index.html.md | 2 +-
.../source/evaluation/metricbuild.html.md | 12 +++++-----
.../source/evaluation/metricchoose.html.md | 12 +++++-----
.../source/evaluation/paramtuning.html.md | 14 +++++-------
docs/manual/source/gallery/templates.yaml | 6 ++---
docs/manual/source/install/index.html.md.erb | 1 -
.../install/install-sourcecode.html.md.erb | 23 ++++++++++++--------
docs/manual/source/resources/faq.html.md | 2 +-
docs/manual/source/sdk/python.html.md.erb | 13 ++++++-----
docs/manual/source/sdk/ruby.html.md.erb | 12 +++++-----
.../complementarypurchase/dase.html.md.erb | 6 ++---
.../quickstart.html.md.erb | 2 +-
.../ecommercerecommendation/dase.html.md.erb | 2 +-
.../quickstart.html.md.erb | 2 +-
.../templates/leadscoring/dase.html.md.erb | 2 +-
.../recommendation/batch-evaluator.html.md | 2 +-
.../recommendation/evaluation.html.md.erb | 2 +-
.../recommendation/quickstart.html.md.erb | 2 +-
.../templates/similarproduct/dase.html.md.erb | 2 +-
.../multi-events-multi-algos.html.md.erb | 4 ++--
docs/manual/source/tryit/index.html.slim | 6 ++---
21 files changed, 66 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
[11/13] predictionio git commit: Prepare 0.13.0-rc1
Posted by sh...@apache.org.
Prepare 0.13.0-rc1
Project: http://git-wip-us.apache.org/repos/asf/predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/predictionio/commit/e7ef2c80
Tree: http://git-wip-us.apache.org/repos/asf/predictionio/tree/e7ef2c80
Diff: http://git-wip-us.apache.org/repos/asf/predictionio/diff/e7ef2c80
Branch: refs/heads/livedoc
Commit: e7ef2c8045bea9380e7ed998e886d971c97d5bb0
Parents: 3f637e5
Author: shimamoto <sh...@apache.org>
Authored: Tue Sep 11 22:00:26 2018 +0900
Committer: shimamoto <sh...@apache.org>
Committed: Wed Sep 12 14:56:41 2018 +0900
----------------------------------------------------------------------
KEYS | 58 ++++++++++++++++++++
build.sbt | 2 +-
docs/manual/data/versions.yml | 2 +-
.../manual/source/datacollection/plugin.html.md | 2 +-
docs/manual/source/deploy/plugin.html.md | 2 +-
.../scala-parallel-classification/README.md | 2 +-
.../add-algorithm/build.sbt | 2 +-
.../reading-custom-properties/build.sbt | 2 +-
.../README.md | 2 +-
.../adjust-score/build.sbt | 2 +-
.../train-with-rate-event/build.sbt | 2 +-
.../scala-parallel-recommendation/README.md | 2 +-
.../blacklist-items/build.sbt | 2 +-
.../customize-data-prep/build.sbt | 2 +-
.../customize-serving/build.sbt | 2 +-
.../reading-custom-events/build.sbt | 2 +-
.../train-with-view-event/build.sbt | 2 +-
.../scala-parallel-similarproduct/README.md | 2 +-
.../multi-events-multi-algos/build.sbt | 2 +-
.../recommended-user/build.sbt | 2 +-
.../return-item-properties/build.sbt | 2 +-
.../rid-user-set-event/build.sbt | 2 +-
.../train-with-rate-event/build.sbt | 2 +-
.../engines/recommendation-engine/build.sbt | 2 +-
24 files changed, 81 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/KEYS
----------------------------------------------------------------------
diff --git a/KEYS b/KEYS
index 0dcd781..029eb68 100644
--- a/KEYS
+++ b/KEYS
@@ -186,3 +186,61 @@ LxEW+096aYvYBaxyb9GdKZzUplRHOZWg89DjGM5EVIy8yST1XDyCCMQeK/XglWCA
gslTn9eM5A==
=Jacn
-----END PGP PUBLIC KEY BLOCK-----
+pub rsa4096/9F4FBC3D 2018-09-11 [SC]
+uid [ultimate] Takako Shimamoto (CODE SIGNING KEY) <sh...@apache.org>
+sig 3 9F4FBC3D 2018-09-11 Takako Shimamoto (CODE SIGNING KEY) <sh...@apache.org>
+sub rsa4096/EC151981 2018-09-11 [E]
+sig 9F4FBC3D 2018-09-11 Takako Shimamoto (CODE SIGNING KEY) <sh...@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+wEvmHAxp9J8DJY97zR+oCp/Or62cNw==
+=8icF
+-----END PGP PUBLIC KEY BLOCK-----
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index c753f76..308b409 100644
--- a/build.sbt
+++ b/build.sbt
@@ -54,7 +54,7 @@ lazy val scalaSparkDepsVersion = Map(
name := "apache-predictionio-parent"
-version in ThisBuild := "0.13.0-SNAPSHOT"
+version in ThisBuild := "0.13.0"
organization in ThisBuild := "org.apache.predictionio"
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/docs/manual/data/versions.yml
----------------------------------------------------------------------
diff --git a/docs/manual/data/versions.yml b/docs/manual/data/versions.yml
index d21c99b..31a0659 100644
--- a/docs/manual/data/versions.yml
+++ b/docs/manual/data/versions.yml
@@ -1,4 +1,4 @@
-pio: 0.12.1
+pio: 0.13.0
spark: 2.1.1
spark_download_filename: spark-2.1.1-bin-hadoop2.6
elasticsearch_download_filename: elasticsearch-5.5.2
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/docs/manual/source/datacollection/plugin.html.md
----------------------------------------------------------------------
diff --git a/docs/manual/source/datacollection/plugin.html.md b/docs/manual/source/datacollection/plugin.html.md
index db8e671..f99cb4f 100644
--- a/docs/manual/source/datacollection/plugin.html.md
+++ b/docs/manual/source/datacollection/plugin.html.md
@@ -32,7 +32,7 @@ At first, create a sbt project with following `build.sbt`:
name := "pio-plugin-example"
version := "1.0"
scalaVersion := "2.11.11"
-libraryDependencies += "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.1"
+libraryDependencies += "org.apache.predictionio" %% "apache-predictionio-core" % "0.13.0"
```
Event server plug-ins must extend `EventServerPlugin`. Here is an example of event server plug-in:
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/docs/manual/source/deploy/plugin.html.md
----------------------------------------------------------------------
diff --git a/docs/manual/source/deploy/plugin.html.md b/docs/manual/source/deploy/plugin.html.md
index d20f130..c9a120c 100644
--- a/docs/manual/source/deploy/plugin.html.md
+++ b/docs/manual/source/deploy/plugin.html.md
@@ -32,7 +32,7 @@ At first, create a sbt project with following `build.sbt`:
name := "pio-plugin-example"
version := "1.0"
scalaVersion := "2.11.11"
-libraryDependencies += "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.1"
+libraryDependencies += "org.apache.predictionio" %% "apache-predictionio-core" % "0.13.0"
```
Engine server plug-ins must extend `EngineServerPlugin`. Here is an example of engine server plug-in:
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/examples/scala-parallel-classification/README.md
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-classification/README.md b/examples/scala-parallel-classification/README.md
index 20f6956..82fcda0 100644
--- a/examples/scala-parallel-classification/README.md
+++ b/examples/scala-parallel-classification/README.md
@@ -15,6 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-This is based on Classification Engine Template v0.12.0-incubating.
+This is based on Classification Engine Template v0.13.0.
Please refer to http://predictionio.apache.org/templates/classification/how-to/
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/examples/scala-parallel-classification/add-algorithm/build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-classification/add-algorithm/build.sbt b/examples/scala-parallel-classification/add-algorithm/build.sbt
index 703b5be..e929f9e 100644
--- a/examples/scala-parallel-classification/add-algorithm/build.sbt
+++ b/examples/scala-parallel-classification/add-algorithm/build.sbt
@@ -20,5 +20,5 @@ name := "template-scala-parallel-classification"
organization := "org.apache.predictionio"
scalaVersion := "2.11.8"
libraryDependencies ++= Seq(
- "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.1" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.13.0" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/examples/scala-parallel-classification/reading-custom-properties/build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-classification/reading-custom-properties/build.sbt b/examples/scala-parallel-classification/reading-custom-properties/build.sbt
index 703b5be..e929f9e 100644
--- a/examples/scala-parallel-classification/reading-custom-properties/build.sbt
+++ b/examples/scala-parallel-classification/reading-custom-properties/build.sbt
@@ -20,5 +20,5 @@ name := "template-scala-parallel-classification"
organization := "org.apache.predictionio"
scalaVersion := "2.11.8"
libraryDependencies ++= Seq(
- "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.1" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.13.0" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/examples/scala-parallel-ecommercerecommendation/README.md
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-ecommercerecommendation/README.md b/examples/scala-parallel-ecommercerecommendation/README.md
index e8f5ed4..0063fde 100644
--- a/examples/scala-parallel-ecommercerecommendation/README.md
+++ b/examples/scala-parallel-ecommercerecommendation/README.md
@@ -15,6 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-This is based on E-Commerce Recommendation Template v0.12.0-incubating.
+This is based on E-Commerce Recommendation Template v0.13.0.
Please refer to http://predictionio.apache.org/templates/ecommercerecommendation/how-to/
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/examples/scala-parallel-ecommercerecommendation/adjust-score/build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-ecommercerecommendation/adjust-score/build.sbt b/examples/scala-parallel-ecommercerecommendation/adjust-score/build.sbt
index e45e277..7899d60 100644
--- a/examples/scala-parallel-ecommercerecommendation/adjust-score/build.sbt
+++ b/examples/scala-parallel-ecommercerecommendation/adjust-score/build.sbt
@@ -20,5 +20,5 @@ name := "template-scala-parallel-ecommercerecommendation"
organization := "org.apache.predictionio"
scalaVersion := "2.11.8"
libraryDependencies ++= Seq(
- "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.1" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.13.0" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/build.sbt b/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/build.sbt
index e45e277..7899d60 100644
--- a/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/build.sbt
+++ b/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/build.sbt
@@ -20,5 +20,5 @@ name := "template-scala-parallel-ecommercerecommendation"
organization := "org.apache.predictionio"
scalaVersion := "2.11.8"
libraryDependencies ++= Seq(
- "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.1" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.13.0" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/examples/scala-parallel-recommendation/README.md
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-recommendation/README.md b/examples/scala-parallel-recommendation/README.md
index c8ddd4a..379a750 100644
--- a/examples/scala-parallel-recommendation/README.md
+++ b/examples/scala-parallel-recommendation/README.md
@@ -15,6 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-This is based on Recommendation Template v0.12.0-incubating.
+This is based on Recommendation Template v0.13.0.
Please refer to http://predictionio.apache.org/templates/recommendation/how-to/
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/examples/scala-parallel-recommendation/blacklist-items/build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-recommendation/blacklist-items/build.sbt b/examples/scala-parallel-recommendation/blacklist-items/build.sbt
index 0251958..bc124a1 100644
--- a/examples/scala-parallel-recommendation/blacklist-items/build.sbt
+++ b/examples/scala-parallel-recommendation/blacklist-items/build.sbt
@@ -20,5 +20,5 @@ name := "template-scala-parallel-recommendation"
organization := "org.apache.predictionio"
scalaVersion := "2.11.8"
libraryDependencies ++= Seq(
- "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.1" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.13.0" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/examples/scala-parallel-recommendation/customize-data-prep/build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-recommendation/customize-data-prep/build.sbt b/examples/scala-parallel-recommendation/customize-data-prep/build.sbt
index 0251958..bc124a1 100644
--- a/examples/scala-parallel-recommendation/customize-data-prep/build.sbt
+++ b/examples/scala-parallel-recommendation/customize-data-prep/build.sbt
@@ -20,5 +20,5 @@ name := "template-scala-parallel-recommendation"
organization := "org.apache.predictionio"
scalaVersion := "2.11.8"
libraryDependencies ++= Seq(
- "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.1" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.13.0" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/examples/scala-parallel-recommendation/customize-serving/build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-recommendation/customize-serving/build.sbt b/examples/scala-parallel-recommendation/customize-serving/build.sbt
index 0251958..bc124a1 100644
--- a/examples/scala-parallel-recommendation/customize-serving/build.sbt
+++ b/examples/scala-parallel-recommendation/customize-serving/build.sbt
@@ -20,5 +20,5 @@ name := "template-scala-parallel-recommendation"
organization := "org.apache.predictionio"
scalaVersion := "2.11.8"
libraryDependencies ++= Seq(
- "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.1" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.13.0" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/examples/scala-parallel-recommendation/reading-custom-events/build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-recommendation/reading-custom-events/build.sbt b/examples/scala-parallel-recommendation/reading-custom-events/build.sbt
index 0251958..bc124a1 100644
--- a/examples/scala-parallel-recommendation/reading-custom-events/build.sbt
+++ b/examples/scala-parallel-recommendation/reading-custom-events/build.sbt
@@ -20,5 +20,5 @@ name := "template-scala-parallel-recommendation"
organization := "org.apache.predictionio"
scalaVersion := "2.11.8"
libraryDependencies ++= Seq(
- "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.1" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.13.0" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/examples/scala-parallel-recommendation/train-with-view-event/build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-recommendation/train-with-view-event/build.sbt b/examples/scala-parallel-recommendation/train-with-view-event/build.sbt
index 0251958..bc124a1 100644
--- a/examples/scala-parallel-recommendation/train-with-view-event/build.sbt
+++ b/examples/scala-parallel-recommendation/train-with-view-event/build.sbt
@@ -20,5 +20,5 @@ name := "template-scala-parallel-recommendation"
organization := "org.apache.predictionio"
scalaVersion := "2.11.8"
libraryDependencies ++= Seq(
- "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.1" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.13.0" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/examples/scala-parallel-similarproduct/README.md
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-similarproduct/README.md b/examples/scala-parallel-similarproduct/README.md
index 9f5f34a..9daae15 100644
--- a/examples/scala-parallel-similarproduct/README.md
+++ b/examples/scala-parallel-similarproduct/README.md
@@ -15,6 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-This is based on Similar Product Template v0.12.0-incubating.
+This is based on Similar Product Template v0.13.0.
Please refer to http://predictionio.apache.org/templates/similarproduct/how-to/
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/examples/scala-parallel-similarproduct/multi-events-multi-algos/build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-similarproduct/multi-events-multi-algos/build.sbt b/examples/scala-parallel-similarproduct/multi-events-multi-algos/build.sbt
index c03fd46..e72b6f2 100644
--- a/examples/scala-parallel-similarproduct/multi-events-multi-algos/build.sbt
+++ b/examples/scala-parallel-similarproduct/multi-events-multi-algos/build.sbt
@@ -20,5 +20,5 @@ name := "template-scala-parallel-similarproduct"
organization := "org.apache.predictionio"
scalaVersion := "2.11.8"
libraryDependencies ++= Seq(
- "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.1" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.13.0" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/examples/scala-parallel-similarproduct/recommended-user/build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-similarproduct/recommended-user/build.sbt b/examples/scala-parallel-similarproduct/recommended-user/build.sbt
index d40f4f0..f5b86f5 100644
--- a/examples/scala-parallel-similarproduct/recommended-user/build.sbt
+++ b/examples/scala-parallel-similarproduct/recommended-user/build.sbt
@@ -20,5 +20,5 @@ name := "template-scala-parallel-recommendeduser"
organization := "org.apache.predictionio"
scalaVersion := "2.11.8"
libraryDependencies ++= Seq(
- "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.1" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.13.0" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/examples/scala-parallel-similarproduct/return-item-properties/build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-similarproduct/return-item-properties/build.sbt b/examples/scala-parallel-similarproduct/return-item-properties/build.sbt
index c03fd46..e72b6f2 100644
--- a/examples/scala-parallel-similarproduct/return-item-properties/build.sbt
+++ b/examples/scala-parallel-similarproduct/return-item-properties/build.sbt
@@ -20,5 +20,5 @@ name := "template-scala-parallel-similarproduct"
organization := "org.apache.predictionio"
scalaVersion := "2.11.8"
libraryDependencies ++= Seq(
- "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.1" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.13.0" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/examples/scala-parallel-similarproduct/rid-user-set-event/build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-similarproduct/rid-user-set-event/build.sbt b/examples/scala-parallel-similarproduct/rid-user-set-event/build.sbt
index c03fd46..e72b6f2 100644
--- a/examples/scala-parallel-similarproduct/rid-user-set-event/build.sbt
+++ b/examples/scala-parallel-similarproduct/rid-user-set-event/build.sbt
@@ -20,5 +20,5 @@ name := "template-scala-parallel-similarproduct"
organization := "org.apache.predictionio"
scalaVersion := "2.11.8"
libraryDependencies ++= Seq(
- "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.1" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.13.0" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/examples/scala-parallel-similarproduct/train-with-rate-event/build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-similarproduct/train-with-rate-event/build.sbt b/examples/scala-parallel-similarproduct/train-with-rate-event/build.sbt
index c03fd46..e72b6f2 100644
--- a/examples/scala-parallel-similarproduct/train-with-rate-event/build.sbt
+++ b/examples/scala-parallel-similarproduct/train-with-rate-event/build.sbt
@@ -20,5 +20,5 @@ name := "template-scala-parallel-similarproduct"
organization := "org.apache.predictionio"
scalaVersion := "2.11.8"
libraryDependencies ++= Seq(
- "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.1" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.13.0" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
http://git-wip-us.apache.org/repos/asf/predictionio/blob/e7ef2c80/tests/pio_tests/engines/recommendation-engine/build.sbt
----------------------------------------------------------------------
diff --git a/tests/pio_tests/engines/recommendation-engine/build.sbt b/tests/pio_tests/engines/recommendation-engine/build.sbt
index 798995c..4688165 100644
--- a/tests/pio_tests/engines/recommendation-engine/build.sbt
+++ b/tests/pio_tests/engines/recommendation-engine/build.sbt
@@ -26,6 +26,6 @@ name := "template-scala-parallel-recommendation"
organization := "org.apache.predictionio"
libraryDependencies ++= Seq(
- "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.1" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.13.0" % "provided",
"org.apache.spark" %% "spark-core" % sys.env.getOrElse("PIO_SPARK_VERSION", "2.1.1") % "provided",
"org.apache.spark" %% "spark-mllib" % sys.env.getOrElse("PIO_SPARK_VERSION", "2.1.1") % "provided")
[03/13] predictionio git commit: Fix several minor typos detected by
github.com/client9/misspell
Posted by sh...@apache.org.
Fix several minor typos detected by github.com/client9/misspell
Closes #456
Project: http://git-wip-us.apache.org/repos/asf/predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/predictionio/commit/da4c9d66
Tree: http://git-wip-us.apache.org/repos/asf/predictionio/tree/da4c9d66
Diff: http://git-wip-us.apache.org/repos/asf/predictionio/diff/da4c9d66
Branch: refs/heads/livedoc
Commit: da4c9d66e81a64084c36f15f50eaa8c07665e5ca
Parents: f19d015
Author: Kazuhiro Sera <se...@gmail.com>
Authored: Sat Aug 11 09:12:11 2018 +0900
Committer: Naoki Takezoe <ta...@apache.org>
Committed: Sat Aug 11 09:13:38 2018 +0900
----------------------------------------------------------------------
.../org/apache/predictionio/controller/Engine.scala | 4 ++--
.../org/apache/predictionio/core/AbstractDoer.scala | 2 +-
.../predictionio/core/SelfCleaningDataSource.scala | 4 ++--
.../org/apache/predictionio/workflow/FakeWorkflow.scala | 2 +-
.../webhooks/mailchimp/MailChimpConnectorSpec.scala | 12 ++++++------
data/test.sh | 2 +-
.../predictionio/data/storage/hbase/HBEventsUtil.scala | 2 +-
tests/pio_tests/README.md | 4 ++--
tests/pio_tests/utils.py | 2 +-
.../org/apache/predictionio/tools/commands/App.scala | 2 +-
10 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/predictionio/blob/da4c9d66/core/src/main/scala/org/apache/predictionio/controller/Engine.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/predictionio/controller/Engine.scala b/core/src/main/scala/org/apache/predictionio/controller/Engine.scala
index 1f9d0ab..3b5f363 100644
--- a/core/src/main/scala/org/apache/predictionio/controller/Engine.scala
+++ b/core/src/main/scala/org/apache/predictionio/controller/Engine.scala
@@ -268,7 +268,7 @@ class Engine[TD, EI, PD, Q, P, A](
/** Extract model for persistent layer.
*
- * PredictionIO presist models for future use. It allows custom
+ * PredictionIO persists models for future use. It allows custom
* implementation for persisting models. You need to implement the
* [[org.apache.predictionio.controller.PersistentModel]] interface. This method
* traverses all models in the workflow. If the model is a
@@ -642,7 +642,7 @@ object Engine {
dataSource.readTrainingBase(sc)
} catch {
case e: StorageClientException =>
- logger.error(s"Error occured reading from data source. (Reason: " +
+ logger.error(s"Error occurred reading from data source. (Reason: " +
e.getMessage + ") Please see the log for debugging details.", e)
sys.exit(1)
}
http://git-wip-us.apache.org/repos/asf/predictionio/blob/da4c9d66/core/src/main/scala/org/apache/predictionio/core/AbstractDoer.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/predictionio/core/AbstractDoer.scala b/core/src/main/scala/org/apache/predictionio/core/AbstractDoer.scala
index 5da48ce..04d781f 100644
--- a/core/src/main/scala/org/apache/predictionio/core/AbstractDoer.scala
+++ b/core/src/main/scala/org/apache/predictionio/core/AbstractDoer.scala
@@ -48,7 +48,7 @@ object Doer extends Logging {
// Subclasses only allows two kind of constructors.
// 1. Constructor with P <: Params.
- // 2. Emtpy constructor.
+ // 2. Empty constructor.
// First try (1), if failed, try (2).
try {
val constr = cls.getConstructor(params.getClass)
http://git-wip-us.apache.org/repos/asf/predictionio/blob/da4c9d66/core/src/main/scala/org/apache/predictionio/core/SelfCleaningDataSource.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/predictionio/core/SelfCleaningDataSource.scala b/core/src/main/scala/org/apache/predictionio/core/SelfCleaningDataSource.scala
index cadf6b8..be3fe05 100644
--- a/core/src/main/scala/org/apache/predictionio/core/SelfCleaningDataSource.scala
+++ b/core/src/main/scala/org/apache/predictionio/core/SelfCleaningDataSource.scala
@@ -69,7 +69,7 @@ trait SelfCleaningDataSource {
/** :: DeveloperApi ::
*
- * Returns RDD of events happend after duration in event window params.
+ * Returns RDD of events happened after duration in event window params.
*
* @return RDD[Event] most recent PEvents.
*/
@@ -87,7 +87,7 @@ trait SelfCleaningDataSource {
/** :: DeveloperApi ::
*
- * Returns Iterator of events happend after duration in event window params.
+ * Returns Iterator of events happened after duration in event window params.
*
* @return Iterator[Event] most recent LEvents.
*/
http://git-wip-us.apache.org/repos/asf/predictionio/blob/da4c9d66/core/src/main/scala/org/apache/predictionio/workflow/FakeWorkflow.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/predictionio/workflow/FakeWorkflow.scala b/core/src/main/scala/org/apache/predictionio/workflow/FakeWorkflow.scala
index c9b1d23..8e4db51 100644
--- a/core/src/main/scala/org/apache/predictionio/workflow/FakeWorkflow.scala
+++ b/core/src/main/scala/org/apache/predictionio/workflow/FakeWorkflow.scala
@@ -72,7 +72,7 @@ private[predictionio] case class FakeEvalResult() extends BaseEvaluatorResult {
override val noSave: Boolean = true
}
-/** FakeRun allows user to implement custom function under the exact enviroment
+/** FakeRun allows user to implement custom function under the exact environment
* as other PredictionIO workflow.
*
* Useful for developing new features. Only need to extend this trait and
http://git-wip-us.apache.org/repos/asf/predictionio/blob/da4c9d66/data/src/test/scala/org/apache/predictionio/data/webhooks/mailchimp/MailChimpConnectorSpec.scala
----------------------------------------------------------------------
diff --git a/data/src/test/scala/org/apache/predictionio/data/webhooks/mailchimp/MailChimpConnectorSpec.scala b/data/src/test/scala/org/apache/predictionio/data/webhooks/mailchimp/MailChimpConnectorSpec.scala
index add9c6f..9bb1847 100644
--- a/data/src/test/scala/org/apache/predictionio/data/webhooks/mailchimp/MailChimpConnectorSpec.scala
+++ b/data/src/test/scala/org/apache/predictionio/data/webhooks/mailchimp/MailChimpConnectorSpec.scala
@@ -24,7 +24,7 @@ import org.specs2.mutable._
class MailChimpConnectorSpec extends Specification with ConnectorTestUtil {
- // TOOD: test other events
+ // TODO: test other events
// TODO: test different optional fields
"MailChimpConnector" should {
@@ -87,7 +87,7 @@ class MailChimpConnectorSpec extends Specification with ConnectorTestUtil {
"data[merges][EMAIL]" -> "api+unsub@mailchimp.com",
"data[merges][FNAME]" -> "MailChimp",
"data[merges][LNAME]" -> "API",
- "data[merges][INTERESTS]" -> "Group1,Group2", //optional
+ "data[merges][INTERESTS]" -> "Group1,Group2", //optional
"data[ip_opt]" -> "10.20.10.30",
"data[campaign_id]" -> "cb398d21d2"
)
@@ -120,7 +120,7 @@ class MailChimpConnectorSpec extends Specification with ConnectorTestUtil {
check(MailChimpConnector, unsubscribe, expected)
}
- //check profile update to event Json
+ //check profile update to event Json
"convert profile update to event JSON" in {
val profileUpdate = Map(
@@ -162,7 +162,7 @@ class MailChimpConnectorSpec extends Specification with ConnectorTestUtil {
check(MailChimpConnector, profileUpdate, expected)
}
- //check email update to event Json
+ //check email update to event Json
"convert email update to event JSON" in {
val emailUpdate = Map(
@@ -192,7 +192,7 @@ class MailChimpConnectorSpec extends Specification with ConnectorTestUtil {
check(MailChimpConnector, emailUpdate, expected)
}
- //check cleaned email to event Json
+ //check cleaned email to event Json
"convert cleaned email to event JSON" in {
val cleanedEmail = Map(
@@ -221,7 +221,7 @@ class MailChimpConnectorSpec extends Specification with ConnectorTestUtil {
check(MailChimpConnector, cleanedEmail, expected)
}
- //check campaign sending status to event Json
+ //check campaign sending status to event Json
"convert campaign sending status to event JSON" in {
val campaign = Map(
http://git-wip-us.apache.org/repos/asf/predictionio/blob/da4c9d66/data/test.sh
----------------------------------------------------------------------
diff --git a/data/test.sh b/data/test.sh
index be0eb07..8481f47 100755
--- a/data/test.sh
+++ b/data/test.sh
@@ -481,7 +481,7 @@ testdata='[{
checkPOST "/batch/events.json?accessKey=$accessKey" "$testdata" 200
# request with a malformed event (2nd event)
-# the response code is succesful but the error for individual event is reflected in the response's body.
+# the response code is successful but the error for individual event is reflected in the response's body.
testdata='[{
"event" : "my_event_1",
"entityType" : "user",
http://git-wip-us.apache.org/repos/asf/predictionio/blob/da4c9d66/storage/hbase/src/main/scala/org/apache/predictionio/data/storage/hbase/HBEventsUtil.scala
----------------------------------------------------------------------
diff --git a/storage/hbase/src/main/scala/org/apache/predictionio/data/storage/hbase/HBEventsUtil.scala b/storage/hbase/src/main/scala/org/apache/predictionio/data/storage/hbase/HBEventsUtil.scala
index 64487fb..4b0ad9a 100644
--- a/storage/hbase/src/main/scala/org/apache/predictionio/data/storage/hbase/HBEventsUtil.scala
+++ b/storage/hbase/src/main/scala/org/apache/predictionio/data/storage/hbase/HBEventsUtil.scala
@@ -148,7 +148,7 @@ object HBEventsUtil {
val rowKey = event.eventId.map { id =>
RowKey(id) // create rowKey from eventId
}.getOrElse {
- // TOOD: use real UUID. not pseudo random
+ // TODO: use real UUID. not pseudo random
val uuidLow: Long = UUID.randomUUID().getLeastSignificantBits
RowKey(
entityType = event.entityType,
http://git-wip-us.apache.org/repos/asf/predictionio/blob/da4c9d66/tests/pio_tests/README.md
----------------------------------------------------------------------
diff --git a/tests/pio_tests/README.md b/tests/pio_tests/README.md
index 070ac8b..cb426da 100644
--- a/tests/pio_tests/README.md
+++ b/tests/pio_tests/README.md
@@ -33,14 +33,14 @@ has to download the following python-3 packages:
You can pass it arguments to:
* suppress the output of executed shell commands within the tests
* enable logging
-* specify which tests should be exectued (by names)
+* specify which tests should be executed (by names)
For more information run:
```shell
python3 tests.py -h
```
-As soon as the tests are finishied an XML file with JUnit-like test reports
+As soon as the tests are finished an XML file with JUnit-like test reports
is created in the directory of execution.
### Adding new tests
http://git-wip-us.apache.org/repos/asf/predictionio/blob/da4c9d66/tests/pio_tests/utils.py
----------------------------------------------------------------------
diff --git a/tests/pio_tests/utils.py b/tests/pio_tests/utils.py
index 4659e54..6eecf89 100644
--- a/tests/pio_tests/utils.py
+++ b/tests/pio_tests/utils.py
@@ -55,7 +55,7 @@ def repository_dirname(template):
def obtain_template(engine_dir, template):
"""Given a directory with engines and a template downloads an engine
- if neccessary
+ if necessary
Args:
engine_dir (str): directory where engines are stored
template (str): either the name of an engine from the engines directory
http://git-wip-us.apache.org/repos/asf/predictionio/blob/da4c9d66/tools/src/main/scala/org/apache/predictionio/tools/commands/App.scala
----------------------------------------------------------------------
diff --git a/tools/src/main/scala/org/apache/predictionio/tools/commands/App.scala b/tools/src/main/scala/org/apache/predictionio/tools/commands/App.scala
index 5884ebd..06c1641 100644
--- a/tools/src/main/scala/org/apache/predictionio/tools/commands/App.scala
+++ b/tools/src/main/scala/org/apache/predictionio/tools/commands/App.scala
@@ -298,7 +298,7 @@ object App extends EitherLogging {
Right(channel.copy(id = chanId))
} else {
errStr = s"""Unable to create new channel.
- |Failed to initalize Event Store.""".stripMargin
+ |Failed to initialize Event Store.""".stripMargin
error(errStr)
// reverted back the meta data
try {
[06/13] predictionio git commit: [PIO-158] Deprecate Scala 2.10 and
Spark 1.x
Posted by sh...@apache.org.
[PIO-158] Deprecate Scala 2.10 and Spark 1.x
Closes #459
Project: http://git-wip-us.apache.org/repos/asf/predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/predictionio/commit/ff6a076a
Tree: http://git-wip-us.apache.org/repos/asf/predictionio/tree/ff6a076a
Diff: http://git-wip-us.apache.org/repos/asf/predictionio/diff/ff6a076a
Branch: refs/heads/livedoc
Commit: ff6a076a5079232e383be3ccb7b7d96366190a53
Parents: 7ad9be4
Author: shimamoto <sh...@apache.org>
Authored: Mon Aug 27 16:08:44 2018 -0700
Committer: Donald Szeto <do...@apache.org>
Committed: Mon Aug 27 16:09:29 2018 -0700
----------------------------------------------------------------------
bin/pio-class | 2 +-
build.sbt | 8 ++++++--
docs/manual/source/install/index.html.md.erb | 3 +++
docs/manual/source/install/install-sourcecode.html.md.erb | 6 +++---
docs/manual/source/system/index.html.md | 7 -------
docs/scaladoc/README.md | 2 +-
.../org/apache/predictionio/tools/commands/Management.scala | 2 +-
7 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/predictionio/blob/ff6a076a/bin/pio-class
----------------------------------------------------------------------
diff --git a/bin/pio-class b/bin/pio-class
index 94cc520..9e01a40 100755
--- a/bin/pio-class
+++ b/bin/pio-class
@@ -44,7 +44,7 @@ fi
# Make sure the Apache Spark version meets the prerequisite if it is a binary
# distribution
-MIN_SPARK_VERSION="1.3.0"
+MIN_SPARK_VERSION="1.6.3"
if [ -z "$SPARK_HOME" ]; then
echo -e "\033[0;31mSPARK_HOME must be set in conf/pio-env.sh, or in the environment!\033[0m"
exit 1
http://git-wip-us.apache.org/repos/asf/predictionio/blob/ff6a076a/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index ec54104..0243610 100644
--- a/build.sbt
+++ b/build.sbt
@@ -50,7 +50,7 @@ lazy val scalaSparkDepsVersion = Map(
name := "apache-predictionio-parent"
-version in ThisBuild := "0.12.1"
+version in ThisBuild := "0.13.0-SNAPSHOT"
organization in ThisBuild := "org.apache.predictionio"
@@ -65,7 +65,7 @@ scalacOptions in ThisBuild ++= Seq("-deprecation", "-unchecked", "-feature")
scalacOptions in (ThisBuild, Test) ++= Seq("-Yrangepos")
fork in (ThisBuild, run) := true
-javacOptions in (ThisBuild, compile) ++= Seq("-source", "1.7", "-target", "1.7",
+javacOptions in (ThisBuild, compile) ++= Seq("-source", "1.8", "-target", "1.8",
"-Xlint:deprecation", "-Xlint:unchecked")
// Ignore differentiation of Spark patch levels
@@ -323,6 +323,10 @@ parallelExecution in Global := false
testOptions in Test += Tests.Argument("-oDF")
printBuildInfo := {
+ if (scalaBinaryVersion.value == "2.10")
+ streams.value.log.warn("Support for Scala 2.10 is deprecated. Please upgrade to a newer version of Scala.")
+ if (sparkBinaryVersion.value == "1.6")
+ streams.value.log.warn("Support for Spark 1.6 is deprecated. Please upgrade to a newer version of Spark.")
println(s"PIO_SCALA_VERSION=${scalaVersion.value}")
println(s"PIO_SPARK_VERSION=${sparkVersion.value}")
println(s"PIO_ELASTICSEARCH_VERSION=${elasticsearchVersion.value}")
http://git-wip-us.apache.org/repos/asf/predictionio/blob/ff6a076a/docs/manual/source/install/index.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/manual/source/install/index.html.md.erb b/docs/manual/source/install/index.html.md.erb
index 167d3bf..3b34871 100644
--- a/docs/manual/source/install/index.html.md.erb
+++ b/docs/manual/source/install/index.html.md.erb
@@ -41,6 +41,9 @@ or
* Apache HBase 0.98.5
* Elasticsearch 1.7.6
+WARNING: **Note that support for Scala 2.10 and Spark 1.6.x are deprecated as of PredictionIO 0.13.0,
+and may be removed in a future release.**
+
If you are running on a single machine, we recommend a minimum of 2GB memory.
INFO: If you are using Linux, Apache Spark local mode, which is the default
http://git-wip-us.apache.org/repos/asf/predictionio/blob/ff6a076a/docs/manual/source/install/install-sourcecode.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/manual/source/install/install-sourcecode.html.md.erb b/docs/manual/source/install/install-sourcecode.html.md.erb
index a16acde..8abc448 100644
--- a/docs/manual/source/install/install-sourcecode.html.md.erb
+++ b/docs/manual/source/install/install-sourcecode.html.md.erb
@@ -108,9 +108,9 @@ Starting from version 0.11.0, PredictionIO can be built against different
versions of dependencies. As of writing, one could build PredictionIO against
these different dependencies:
-* Scala 2.10.x, 2.11.x
-* Spark 1.6.x, 2.0.x, 2.1.x
-* Hadoop 2.4.x to 2.7.x
+* Scala 2.10.x(deprecated), 2.11.x
+* Spark 1.6.x(deprecated), 2.0.x, 2.1.x
+* Hadoop 2.6.x, 2.7.x
* Elasticsearch 1.7.x, 5.x
As an example, if you want to build PredictionIO to support Scala 2.11.8,
http://git-wip-us.apache.org/repos/asf/predictionio/blob/ff6a076a/docs/manual/source/system/index.html.md
----------------------------------------------------------------------
diff --git a/docs/manual/source/system/index.html.md b/docs/manual/source/system/index.html.md
index 1030fec..dcff342 100644
--- a/docs/manual/source/system/index.html.md
+++ b/docs/manual/source/system/index.html.md
@@ -19,13 +19,6 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-During the [installation](/install), you have installed the latest stable versions of the following software:
-
-* Apache Hadoop up to 2.7.2 (required only if YARN and HDFS are needed)
-* Apache HBase up to 1.2.4
-* Apache Spark up to 1.6.3 for Hadoop 2.6 (not Spark 2.x version)
-* Elasticsearch up to 1.7.5 (not the Elasticsearch 2.x version)
-
This section explains general rules-of-thumb for how they are used in PredictionIO. The actual implementation of the Template will define how much of this applies. PredictionIO is flexible about much of this configuration but its Templates generally fit the Lambda model for integrating real-time serving with background periodic model updates.
http://git-wip-us.apache.org/repos/asf/predictionio/blob/ff6a076a/docs/scaladoc/README.md
----------------------------------------------------------------------
diff --git a/docs/scaladoc/README.md b/docs/scaladoc/README.md
index 2f64966..2faa7e3 100644
--- a/docs/scaladoc/README.md
+++ b/docs/scaladoc/README.md
@@ -23,4 +23,4 @@ Scala API Documentation
$ sbt/sbt pioUnidoc
```
-2. Point your web browser at `target/scala-2.10/unidoc/index.html`.
+2. Point your web browser at `target/scala-2.11/unidoc/index.html`.
http://git-wip-us.apache.org/repos/asf/predictionio/blob/ff6a076a/tools/src/main/scala/org/apache/predictionio/tools/commands/Management.scala
----------------------------------------------------------------------
diff --git a/tools/src/main/scala/org/apache/predictionio/tools/commands/Management.scala b/tools/src/main/scala/org/apache/predictionio/tools/commands/Management.scala
index ee8cd50..cd71fdd 100644
--- a/tools/src/main/scala/org/apache/predictionio/tools/commands/Management.scala
+++ b/tools/src/main/scala/org/apache/predictionio/tools/commands/Management.scala
@@ -109,7 +109,7 @@ object Management extends EitherLogging {
val sparkHomePath = Common.getSparkHome(sparkHome)
if (new File(s"$sparkHomePath/bin/spark-submit").exists) {
info(s"Apache Spark is installed at $sparkHomePath")
- val sparkMinVersion = "1.3.0"
+ val sparkMinVersion = "1.6.3"
pioStatus = pioStatus.copy(
sparkHome = sparkHomePath,
sparkMinVersion = sparkMinVersion)