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 2017/06/26 02:44:02 UTC
incubator-predictionio git commit: [PIO-83] move to scala 2.11.8,
spark 2.1.1 as default env
Repository: incubator-predictionio
Updated Branches:
refs/heads/develop 4b10fa5db -> 7ef13ec30
[PIO-83] move to scala 2.11.8, spark 2.1.1 as default env
[PIO-84] move to elasticsearch 5.4.1 as default env
Closes #398
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/7ef13ec3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/7ef13ec3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/7ef13ec3
Branch: refs/heads/develop
Commit: 7ef13ec30245f28769834618b5baf7474968ee73
Parents: 4b10fa5
Author: Shinsuke Sugaya <sh...@apache.org>
Authored: Mon Jun 26 11:38:59 2017 +0900
Committer: Shinsuke Sugaya <sh...@apache.org>
Committed: Mon Jun 26 11:38:59 2017 +0900
----------------------------------------------------------------------
.travis.yml | 24 ++++++++++++------------
build.sbt | 8 ++++----
conf/pio-env.sh.template | 4 ++--
conf/pio-vendors.sh | 8 ++++----
storage/elasticsearch/build.sbt | 2 +-
5 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/7ef13ec3/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 2d2d32e..6f62060 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,12 +57,12 @@ env:
METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS
PIO_SCALA_VERSION=2.10.6
PIO_SPARK_VERSION=1.6.3
- PIO_ELASTICSEARCH_VERSION=5.2.2
+ PIO_ELASTICSEARCH_VERSION=5.4.1
- BUILD_TYPE=Integration
METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
PIO_SCALA_VERSION=2.10.6
PIO_SPARK_VERSION=1.6.3
- PIO_ELASTICSEARCH_VERSION=5.2.2
+ PIO_ELASTICSEARCH_VERSION=5.4.1
- BUILD_TYPE=Integration
METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS
PIO_SCALA_VERSION=2.10.6
@@ -77,36 +77,36 @@ env:
- BUILD_TYPE=Unit
METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
PIO_SCALA_VERSION=2.11.8
- PIO_SPARK_VERSION=2.1.0
+ PIO_SPARK_VERSION=2.1.1
- BUILD_TYPE=Integration
METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
PIO_SCALA_VERSION=2.11.8
- PIO_SPARK_VERSION=2.1.0
+ PIO_SPARK_VERSION=2.1.1
- BUILD_TYPE=Integration
METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS
PIO_SCALA_VERSION=2.11.8
- PIO_SPARK_VERSION=2.1.0
- PIO_ELASTICSEARCH_VERSION=5.2.2
+ PIO_SPARK_VERSION=2.1.1
+ PIO_ELASTICSEARCH_VERSION=5.4.1
- BUILD_TYPE=Integration
METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
PIO_SCALA_VERSION=2.11.8
- PIO_SPARK_VERSION=2.1.0
- PIO_ELASTICSEARCH_VERSION=5.2.2
+ PIO_SPARK_VERSION=2.1.1
+ PIO_ELASTICSEARCH_VERSION=5.4.1
- BUILD_TYPE=Integration
METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS
PIO_SCALA_VERSION=2.11.8
- PIO_SPARK_VERSION=2.1.0
+ PIO_SPARK_VERSION=2.1.1
PIO_ELASTICSEARCH_VERSION=1.7.3
- BUILD_TYPE=Integration
METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
PIO_SCALA_VERSION=2.11.8
- PIO_SPARK_VERSION=2.1.0
+ PIO_SPARK_VERSION=2.1.1
PIO_ELASTICSEARCH_VERSION=1.7.3
- BUILD_TYPE=Integration
METADATA_REP=ELASTICSEARCH EVENTDATA_REP=ELASTICSEARCH MODELDATA_REP=S3
PIO_SCALA_VERSION=2.11.8
- PIO_SPARK_VERSION=2.1.0
- PIO_ELASTICSEARCH_VERSION=5.2.2
+ PIO_SPARK_VERSION=2.1.1
+ PIO_ELASTICSEARCH_VERSION=5.4.1
before_install:
- unset SBT_OPTS JVM_OPTS
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/7ef13ec3/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index 4287ea9..c1b3eb5 100644
--- a/build.sbt
+++ b/build.sbt
@@ -51,9 +51,9 @@ version in ThisBuild := "0.11.1-SNAPSHOT"
organization in ThisBuild := "org.apache.predictionio"
-scalaVersion in ThisBuild := sys.props.getOrElse("scala.version", "2.10.6")
+scalaVersion in ThisBuild := sys.props.getOrElse("scala.version", "2.11.8")
-crossScalaVersions in ThisBuild := Seq(scalaVersion.value, "2.11.8")
+crossScalaVersions in ThisBuild := Seq("2.10.6", "2.11.8")
scalacOptions in ThisBuild ++= Seq("-deprecation", "-unchecked", "-feature")
@@ -64,7 +64,7 @@ javacOptions in (ThisBuild, compile) ++= Seq("-source", "1.7", "-target", "1.7",
"-Xlint:deprecation", "-Xlint:unchecked")
// Ignore differentiation of Spark patch levels
-sparkVersion in ThisBuild := sys.props.getOrElse("spark.version", (if (scalaBinaryVersion.value == "2.10") "1.6.3" else "2.1.0"))
+sparkVersion in ThisBuild := sys.props.getOrElse("spark.version", (if (scalaBinaryVersion.value == "2.10") "1.6.3" else "2.1.1"))
sparkBinaryVersion in ThisBuild := binaryVersion(sparkVersion.value)
@@ -72,7 +72,7 @@ akkaVersion in ThisBuild := sys.props.getOrElse(
"akka.version",
scalaSparkDepsVersion(scalaBinaryVersion.value)(sparkBinaryVersion.value)("akka"))
-lazy val es = sys.props.getOrElse("elasticsearch.version", "1.7.6")
+lazy val es = sys.props.getOrElse("elasticsearch.version", "5.4.1")
elasticsearchVersion in ThisBuild := es
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/7ef13ec3/conf/pio-env.sh.template
----------------------------------------------------------------------
diff --git a/conf/pio-env.sh.template b/conf/pio-env.sh.template
index 2e55900..832b422 100644
--- a/conf/pio-env.sh.template
+++ b/conf/pio-env.sh.template
@@ -25,7 +25,7 @@
# SPARK_HOME: Apache Spark is a hard dependency and must be configured.
# SPARK_HOME=$PIO_HOME/vendors/spark-2.0.2-bin-hadoop2.7
-SPARK_HOME=$PIO_HOME/vendors/spark-1.6.3-bin-hadoop2.6
+SPARK_HOME=$PIO_HOME/vendors/spark-2.1.1-bin-hadoop2.6
POSTGRES_JDBC_DRIVER=$PIO_HOME/lib/postgresql-42.0.0.jar
MYSQL_JDBC_DRIVER=$PIO_HOME/lib/mysql-connector-java-5.1.41.jar
@@ -89,7 +89,7 @@ PIO_STORAGE_SOURCES_PGSQL_PASSWORD=pio
# PIO_STORAGE_SOURCES_ELASTICSEARCH_HOSTS=localhost
# PIO_STORAGE_SOURCES_ELASTICSEARCH_PORTS=9200
# PIO_STORAGE_SOURCES_ELASTICSEARCH_SCHEMES=http
-# PIO_STORAGE_SOURCES_ELASTICSEARCH_HOME=$PIO_HOME/vendors/elasticsearch-5.2.1
+# PIO_STORAGE_SOURCES_ELASTICSEARCH_HOME=$PIO_HOME/vendors/elasticsearch-5.4.1
# Elasticsearch 1.x Example
# PIO_STORAGE_SOURCES_ELASTICSEARCH_TYPE=elasticsearch
# PIO_STORAGE_SOURCES_ELASTICSEARCH_CLUSTERNAME=<elasticsearch_cluster_name>
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/7ef13ec3/conf/pio-vendors.sh
----------------------------------------------------------------------
diff --git a/conf/pio-vendors.sh b/conf/pio-vendors.sh
index 830b576..2159cf5 100644
--- a/conf/pio-vendors.sh
+++ b/conf/pio-vendors.sh
@@ -20,11 +20,11 @@
# `source conf/set_build_profile.sh $BUILD_PROFILE` to get the proper versions
if [ -z "$PIO_SCALA_VERSION" ]; then
- PIO_SCALA_VERSION="2.10.6"
+ PIO_SCALA_VERSION="2.11.8"
fi
if [ -z "$PIO_SPARK_VERSION" ]; then
- PIO_SPARK_VERSION="1.6.3"
+ PIO_SPARK_VERSION="2.1.1"
fi
if [ -z "$PIO_HADOOP_VERSION" ]; then
@@ -32,7 +32,7 @@ if [ -z "$PIO_HADOOP_VERSION" ]; then
fi
if [ -z "$PIO_ELASTICSEARCH_VERSION" ]; then
- PIO_ELASTICSEARCH_VERSION="1.7.3"
+ PIO_ELASTICSEARCH_VERSION="5.4.1"
fi
ES_MAJOR=`echo $PIO_ELASTICSEARCH_VERSION | awk -F. '{print $1}'`
@@ -42,7 +42,7 @@ if [ "$ES_MAJOR" = "1" ]; then
export ES_TAG="1"
else
export ES_IMAGE="docker.elastic.co/elasticsearch/elasticsearch"
- export ES_TAG="5.2.2"
+ export ES_TAG="5.4.1"
fi
PGSQL_JAR=postgresql-9.4-1204.jdbc41.jar
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/7ef13ec3/storage/elasticsearch/build.sbt
----------------------------------------------------------------------
diff --git a/storage/elasticsearch/build.sbt b/storage/elasticsearch/build.sbt
index 7500d1e..da4842e 100644
--- a/storage/elasticsearch/build.sbt
+++ b/storage/elasticsearch/build.sbt
@@ -21,7 +21,7 @@ name := "apache-predictionio-data-elasticsearch"
elasticsearchSparkArtifact := (if (majorVersion(sparkVersion.value) == 2) "elasticsearch-spark-20" else "elasticsearch-spark-13")
-elasticsearchVersion := (if (majorVersion(elasticsearchVersion.value) < 5) "5.2.2" else elasticsearchVersion.value)
+elasticsearchVersion := (if (majorVersion(elasticsearchVersion.value) < 5) "5.4.1" else elasticsearchVersion.value)
libraryDependencies ++= Seq(
"org.apache.predictionio" %% "apache-predictionio-core" % version.value % "provided",