You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by ch...@apache.org on 2017/09/13 19:03:07 UTC
incubator-predictionio git commit: Update versions in examples and
install script
Repository: incubator-predictionio
Updated Branches:
refs/heads/release/0.12.0 954f234b2 -> b9a9e5e13
Update versions in examples and install script
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/b9a9e5e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/b9a9e5e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/b9a9e5e1
Branch: refs/heads/release/0.12.0
Commit: b9a9e5e13a12832e3868cc4272b706d1dff12c6c
Parents: 954f234
Author: Chan Lee <ch...@gmail.com>
Authored: Wed Sep 13 10:30:55 2017 -0700
Committer: Chan Lee <ch...@gmail.com>
Committed: Wed Sep 13 12:02:32 2017 -0700
----------------------------------------------------------------------
bin/install.sh | 6 +++---
build.sbt | 2 ++
docs/manual/data/versions.yml | 8 ++++----
examples/scala-parallel-classification/README.md | 2 +-
.../scala-parallel-classification/add-algorithm/build.sbt | 2 +-
.../reading-custom-properties/build.sbt | 2 +-
examples/scala-parallel-ecommercerecommendation/README.md | 2 +-
.../adjust-score/build.sbt | 2 +-
.../train-with-rate-event/build.sbt | 2 +-
examples/scala-parallel-recommendation/README.md | 2 +-
.../scala-parallel-recommendation/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 +-
examples/scala-parallel-similarproduct/README.md | 2 +-
.../multi-events-multi-algos/build.sbt | 2 +-
.../scala-parallel-similarproduct/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 +-
21 files changed, 27 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/bin/install.sh
----------------------------------------------------------------------
diff --git a/bin/install.sh b/bin/install.sh
index ca7fcac..8277b57 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -18,10 +18,10 @@
#
OS=`uname`
-SPARK_VERSION=1.6.3
+SPARK_VERSION=2.1.1
# Looks like support for Elasticsearch 2.0 will require 2.0 so deferring
-ELASTICSEARCH_VERSION=1.7.5
-HBASE_VERSION=1.2.2
+ELASTICSEARCH_VERSION=5.5.2
+HBASE_VERSION=1.2.6
POSTGRES_VERSION=42.0.0
MYSQL_VERSION=5.1.41
PIO_DIR=$HOME/PredictionIO
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index 5a38e6f..a02bdd9 100644
--- a/build.sbt
+++ b/build.sbt
@@ -52,6 +52,8 @@ organization in ThisBuild := "org.apache.predictionio"
scalaVersion in ThisBuild := sys.props.getOrElse("scala.version", "2.11.8")
+scalaBinaryVersion in ThisBuild := binaryVersion(scalaVersion.value)
+
crossScalaVersions in ThisBuild := Seq("2.10.6", "2.11.8")
scalacOptions in ThisBuild ++= Seq("-deprecation", "-unchecked", "-feature")
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/docs/manual/data/versions.yml
----------------------------------------------------------------------
diff --git a/docs/manual/data/versions.yml b/docs/manual/data/versions.yml
index 7cbccc8..3fba629 100644
--- a/docs/manual/data/versions.yml
+++ b/docs/manual/data/versions.yml
@@ -1,7 +1,7 @@
-pio: 0.11.0-incubating
-spark: 1.6.3
-spark_download_filename: spark-1.6.3-bin-hadoop2.6
-elasticsearch_download_filename: elasticsearch-1.7.6
+pio: 0.12.0-incubating
+spark: 2.1.1
+spark_download_filename: spark-2.1.1-bin-hadoop2.6
+elasticsearch_download_filename: elasticsearch-5.5.2
hbase_version: 1.2.6
hbase_basename: hbase-1.2.6
hbase_variant: bin
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/examples/scala-parallel-classification/README.md
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-classification/README.md b/examples/scala-parallel-classification/README.md
index 2ec7d22..6b0d137 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.11.0-incubating.
+This is based on Classification Engine Template v0.12.0-incubating.
Please refer to http://predictionio.incubator.apache.org/templates/classification/how-to/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/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 f5fb250..aef4495 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.11.0-incubating" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.0-incubating" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/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 f5fb250..aef4495 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.11.0-incubating" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.0-incubating" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/examples/scala-parallel-ecommercerecommendation/README.md
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-ecommercerecommendation/README.md b/examples/scala-parallel-ecommercerecommendation/README.md
index c750458..27a13ce 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.11.0-incubating.
+This is based on E-Commerce Recommendation Template v0.12.0-incubating.
Please refer to http://predictionio.incubator.apache.org/templates/ecommercerecommendation/how-to/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/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 85b21d6..f5dc7e5 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.11.0-incubating" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.0-incubating" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/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 85b21d6..f5dc7e5 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.11.0-incubating" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.0-incubating" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/examples/scala-parallel-recommendation/README.md
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-recommendation/README.md b/examples/scala-parallel-recommendation/README.md
index 0be8090..4b0e2ca 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.11.0-incubating.
+This is based on Recommendation Template v0.12.0-incubating.
Please refer to http://predictionio.incubator.apache.org/templates/recommendation/how-to/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/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 3d25df1..1c38229 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.11.0-incubating" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.0-incubating" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/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 3d25df1..1c38229 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.11.0-incubating" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.0-incubating" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/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 3d25df1..1c38229 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.11.0-incubating" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.0-incubating" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/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 3d25df1..1c38229 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.11.0-incubating" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.0-incubating" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/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 3d25df1..1c38229 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.11.0-incubating" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.0-incubating" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/examples/scala-parallel-similarproduct/README.md
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-similarproduct/README.md b/examples/scala-parallel-similarproduct/README.md
index 0a56220..343afc6 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.11.0-incubating.
+This is based on Similar Product Template v0.12.0-incubating.
Please refer to http://predictionio.incubator.apache.org/templates/similarproduct/how-to/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/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 1daded6..9d7c345 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.11.0-incubating" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.0-incubating" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/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 7409ab6..a233b8b 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.11.0-incubating" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.0-incubating" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/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 1daded6..9d7c345 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.11.0-incubating" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.0-incubating" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/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 1daded6..9d7c345 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.11.0-incubating" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.0-incubating" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b9a9e5e1/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 1daded6..9d7c345 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.11.0-incubating" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.12.0-incubating" % "provided",
"org.apache.spark" %% "spark-mllib" % "2.1.1" % "provided")