Update ES to 5.6.9 everywhere
diff --git a/.travis.yml b/.travis.yml
index 65f4166..c26ae03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,12 +57,12 @@
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.5.2
+ PIO_ELASTICSEARCH_VERSION=5.6.9
- 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.5.2
+ PIO_ELASTICSEARCH_VERSION=5.6.9
- BUILD_TYPE=Integration
METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS
PIO_SCALA_VERSION=2.10.6
@@ -86,12 +86,12 @@
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.5.2
+ PIO_ELASTICSEARCH_VERSION=5.6.9
- 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.5.2
+ PIO_ELASTICSEARCH_VERSION=5.6.9
- BUILD_TYPE=Integration
METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS
PIO_SCALA_VERSION=2.11.8
@@ -106,7 +106,7 @@
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.5.2
+ PIO_ELASTICSEARCH_VERSION=5.6.9
- BUILD_TYPE=Unit
METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
@@ -125,12 +125,12 @@
METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
PIO_SCALA_VERSION=2.11.8
PIO_SPARK_VERSION=2.2.0
- PIO_ELASTICSEARCH_VERSION=5.5.2
+ PIO_ELASTICSEARCH_VERSION=5.6.9
- BUILD_TYPE=Integration
METADATA_REP=ELASTICSEARCH EVENTDATA_REP=ELASTICSEARCH MODELDATA_REP=S3
PIO_SCALA_VERSION=2.11.8
PIO_SPARK_VERSION=2.2.0
- PIO_ELASTICSEARCH_VERSION=5.5.2
+ PIO_ELASTICSEARCH_VERSION=5.6.9
- BUILD_TYPE=LicenseCheck
diff --git a/bin/install.sh b/bin/install.sh
index d785b12..93e4eb5 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -20,7 +20,7 @@
OS=`uname`
SPARK_VERSION=2.1.1
# Looks like support for Elasticsearch 2.0 will require 2.0 so deferring
-ELASTICSEARCH_VERSION=5.5.2
+ELASTICSEARCH_VERSION=5.6.9
HBASE_VERSION=1.2.6
POSTGRES_VERSION=42.0.0
MYSQL_VERSION=5.1.41
diff --git a/conf/pio-env.sh.template b/conf/pio-env.sh.template
index 16ebcd3..3cd2415 100644
--- a/conf/pio-env.sh.template
+++ b/conf/pio-env.sh.template
@@ -89,7 +89,7 @@
# 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.5.2
+# PIO_STORAGE_SOURCES_ELASTICSEARCH_HOME=$PIO_HOME/vendors/elasticsearch-5.6.9
# Optional basic HTTP auth
# PIO_STORAGE_SOURCES_ELASTICSEARCH_USERNAME=my-name
# PIO_STORAGE_SOURCES_ELASTICSEARCH_PASSWORD=my-secret
diff --git a/conf/pio-vendors.sh b/conf/pio-vendors.sh
index 6420207..4825014 100644
--- a/conf/pio-vendors.sh
+++ b/conf/pio-vendors.sh
@@ -32,7 +32,7 @@
fi
if [ -z "$PIO_ELASTICSEARCH_VERSION" ]; then
- PIO_ELASTICSEARCH_VERSION="5.5.2"
+ PIO_ELASTICSEARCH_VERSION="5.6.9"
fi
ES_MAJOR=`echo $PIO_ELASTICSEARCH_VERSION | awk -F. '{print $1}'`
@@ -42,7 +42,7 @@
export ES_TAG="1"
else
export ES_IMAGE="docker.elastic.co/elasticsearch/elasticsearch"
- export ES_TAG="5.5.2"
+ export ES_TAG="5.6.9"
fi
PGSQL_JAR=postgresql-9.4-1204.jdbc41.jar
diff --git a/docs/manual/data/versions.yml b/docs/manual/data/versions.yml
index d21c99b..23a307b 100644
--- a/docs/manual/data/versions.yml
+++ b/docs/manual/data/versions.yml
@@ -1,7 +1,7 @@
pio: 0.12.1
spark: 2.1.1
spark_download_filename: spark-2.1.1-bin-hadoop2.6
-elasticsearch_download_filename: elasticsearch-5.5.2
+elasticsearch_download_filename: elasticsearch-5.6.9
hbase_version: 1.2.6
hbase_basename: hbase-1.2.6
hbase_variant: bin
diff --git a/docs/manual/source/install/install-sourcecode.html.md.erb b/docs/manual/source/install/install-sourcecode.html.md.erb
index 6b9bd63..adc52a5 100644
--- a/docs/manual/source/install/install-sourcecode.html.md.erb
+++ b/docs/manual/source/install/install-sourcecode.html.md.erb
@@ -30,7 +30,7 @@
* Scala 2.11.8
* Spark 2.1.1
* Hadoop 2.7.3
-* Elasticsearch 5.5.2
+* Elasticsearch 5.6.9
Download and extract binary release.
@@ -72,7 +72,7 @@
* Scala 2.11.8
* Spark 2.1.1
* Hadoop 2.7.3
-* Elasticsearch 5.5.2
+* Elasticsearch 5.6.9
```
$ tar zxvf apache-predictionio-<%= data.versions.pio %>.tar.gz
diff --git a/storage/elasticsearch/build.sbt b/storage/elasticsearch/build.sbt
index 797cd58..f340136 100644
--- a/storage/elasticsearch/build.sbt
+++ b/storage/elasticsearch/build.sbt
@@ -21,7 +21,7 @@
elasticsearchSparkArtifact := (if (majorVersion(sparkVersion.value) == 2) "elasticsearch-spark-20" else "elasticsearch-spark-13")
-elasticsearchVersion := (if (majorVersion(elasticsearchVersion.value) < 5) "5.5.2" else elasticsearchVersion.value)
+elasticsearchVersion := (if (majorVersion(elasticsearchVersion.value) < 5) "5.6.9" else elasticsearchVersion.value)
libraryDependencies ++= Seq(
"org.apache.predictionio" %% "apache-predictionio-core" % version.value % "provided",
