Repository: incubator-predictionio Updated Branches: refs/heads/develop df406bf92 -> a0a2c1261
[PIO-119] Bump up Elasticsearch to 5.5.2 Closes #430 Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/a0a2c126 Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/a0a2c126 Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/a0a2c126 Branch: refs/heads/develop Commit: a0a2c1261187451d343d70c4251d8f1775a8b6e8 Parents: df406bf Author: Shinsuke Sugaya <[email protected]> Authored: Mon Sep 11 13:22:43 2017 +0900 Committer: Shinsuke Sugaya <[email protected]> Committed: Mon Sep 11 13:22:43 2017 +0900 ---------------------------------------------------------------------- .travis.yml | 10 +++++----- build.sbt | 2 +- conf/pio-env.sh.template | 2 +- conf/pio-vendors.sh | 4 ++-- storage/elasticsearch/build.sbt | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/a0a2c126/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index e208189..61cc4b8 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.4.1 + PIO_ELASTICSEARCH_VERSION=5.5.2 - 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.4.1 + PIO_ELASTICSEARCH_VERSION=5.5.2 - BUILD_TYPE=Integration METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS PIO_SCALA_VERSION=2.10.6 @@ -86,12 +86,12 @@ env: METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS PIO_SCALA_VERSION=2.11.8 PIO_SPARK_VERSION=2.1.1 - PIO_ELASTICSEARCH_VERSION=5.4.1 + PIO_ELASTICSEARCH_VERSION=5.5.2 - BUILD_TYPE=Integration METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS PIO_SCALA_VERSION=2.11.8 PIO_SPARK_VERSION=2.1.1 - PIO_ELASTICSEARCH_VERSION=5.4.1 + PIO_ELASTICSEARCH_VERSION=5.5.2 - BUILD_TYPE=Integration METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS PIO_SCALA_VERSION=2.11.8 @@ -106,7 +106,7 @@ env: METADATA_REP=ELASTICSEARCH EVENTDATA_REP=ELASTICSEARCH MODELDATA_REP=S3 PIO_SCALA_VERSION=2.11.8 PIO_SPARK_VERSION=2.1.1 - PIO_ELASTICSEARCH_VERSION=5.4.1 + PIO_ELASTICSEARCH_VERSION=5.5.2 - BUILD_TYPE=LicenseCheck http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/a0a2c126/build.sbt ---------------------------------------------------------------------- diff --git a/build.sbt b/build.sbt index 139bf39..1a439c2 100644 --- a/build.sbt +++ b/build.sbt @@ -71,7 +71,7 @@ akkaVersion in ThisBuild := sys.props.getOrElse( "akka.version", scalaSparkDepsVersion(scalaBinaryVersion.value)(sparkBinaryVersion.value)("akka")) -lazy val es = sys.props.getOrElse("elasticsearch.version", "5.4.1") +lazy val es = sys.props.getOrElse("elasticsearch.version", "5.5.2") elasticsearchVersion in ThisBuild := es http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/a0a2c126/conf/pio-env.sh.template ---------------------------------------------------------------------- diff --git a/conf/pio-env.sh.template b/conf/pio-env.sh.template index 0b6b5b9..a96e4bd 100644 --- a/conf/pio-env.sh.template +++ b/conf/pio-env.sh.template @@ -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.4.1 +# PIO_STORAGE_SOURCES_ELASTICSEARCH_HOME=$PIO_HOME/vendors/elasticsearch-5.5.2 # Optional basic HTTP auth # PIO_STORAGE_SOURCES_ELASTICSEARCH_USERNAME=my-name # PIO_STORAGE_SOURCES_ELASTICSEARCH_PASSWORD=my-secret http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/a0a2c126/conf/pio-vendors.sh ---------------------------------------------------------------------- diff --git a/conf/pio-vendors.sh b/conf/pio-vendors.sh index 2159cf5..6420207 100644 --- a/conf/pio-vendors.sh +++ b/conf/pio-vendors.sh @@ -32,7 +32,7 @@ if [ -z "$PIO_HADOOP_VERSION" ]; then fi if [ -z "$PIO_ELASTICSEARCH_VERSION" ]; then - PIO_ELASTICSEARCH_VERSION="5.4.1" + PIO_ELASTICSEARCH_VERSION="5.5.2" 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.4.1" + export ES_TAG="5.5.2" fi PGSQL_JAR=postgresql-9.4-1204.jdbc41.jar http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/a0a2c126/storage/elasticsearch/build.sbt ---------------------------------------------------------------------- diff --git a/storage/elasticsearch/build.sbt b/storage/elasticsearch/build.sbt index b60e86e..754aefb 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.4.1" else elasticsearchVersion.value) +elasticsearchVersion := (if (majorVersion(elasticsearchVersion.value) < 5) "5.5.2" else elasticsearchVersion.value) libraryDependencies ++= Seq( "org.apache.predictionio" %% "apache-predictionio-core" % version.value % "provided",
