Update ES to use 5.6.16 as base and version 7.6.2 for the ES7 tests

Signed-off-by: Christian Rohmann <[email protected]>
jaegertracing · Apr 24, 2020 · a4a0d42 · a4a0d42
1 parent 03b7d98
commit a4a0d42
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,7 +29,7 @@ jobs:
 
     - stage: test
       env: [ NAME=Jaeger latest, ES7 ]
-      script: ELASTICSEARCH_VERSION=7.3.0 ./mvnw clean test -pl jaeger-spark-dependencies-elasticsearch
+      script: ELASTICSEARCH_VERSION=7.6.2 ./mvnw clean test -pl jaeger-spark-dependencies-elasticsearch
 
 # Don't build release tags. This avoids publish conflicts because the version commit exists both on master and the release tag.
 # See https://github.com/travis-ci/travis-ci/issues/1532

diff --git a/jaeger-spark-dependencies-elasticsearch/pom.xml b/jaeger-spark-dependencies-elasticsearch/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.elasticsearch</groupId>
       <artifactId>elasticsearch-spark-20_${version.scala.binary}</artifactId>
-      <version>7.3.0</version>
+      <version>7.6.2</version>
     </dependency>
 
     <dependency>

diff --git a/...test/java/io/jaegertracing/spark/dependencies/elastic/JaegerElasticsearchEnvironment.java b/...test/java/io/jaegertracing/spark/dependencies/elastic/JaegerElasticsearchEnvironment.java
@@ -48,7 +48,7 @@ public class JaegerElasticsearchEnvironment {
 
   public static String elasticsearchVersion() {
     String version = System.getProperty("elasticsearch.version", System.getenv("ELASTICSEARCH_VERSION"));
-    return version != null ? version : "5.6.9";
+    return version != null ? version : "5.6.16";
   }
 
   public void start(Map<String, String> jaegerEnvs, String jaegerVersion, String elasticsearchVersion) {