diff --git a/dependencies.gradle b/dependencies.gradle index 2787461f27..34b0a7cab7 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -23,7 +23,7 @@ ext { revCassandraUnit = '3.11.2.0' revCommonsIo = '2.7' revDynoQueues = '2.0.20' - revElasticSearch6 = '6.8.23' + revElasticSearch6 = '6.8.12' revEmbeddedRedis = '0.6' revEurekaClient = '1.10.10' revGroovy = '3.0.19' diff --git a/es6-persistence/dependencies.lock b/es6-persistence/dependencies.lock index 9897df55d2..d121a0ec45 100644 --- a/es6-persistence/dependencies.lock +++ b/es6-persistence/dependencies.lock @@ -36,13 +36,13 @@ "locked": "2.17.2" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.23" + "locked": "6.8.12" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.23" + "locked": "6.8.12" }, "org.elasticsearch.client:transport": { - "locked": "6.8.23" + "locked": "6.8.12" }, "org.springframework.boot:spring-boot-starter": { "locked": "2.7.16" @@ -206,13 +206,13 @@ "locked": "2.17.2" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.23" + "locked": "6.8.12" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.23" + "locked": "6.8.12" }, "org.elasticsearch.client:transport": { - "locked": "6.8.23" + "locked": "6.8.12" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -259,13 +259,13 @@ "locked": "3.1.6" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.23" + "locked": "6.8.12" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.23" + "locked": "6.8.12" }, "org.elasticsearch.client:transport": { - "locked": "6.8.23" + "locked": "6.8.12" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" @@ -444,13 +444,13 @@ "locked": "3.1.6" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.23" + "locked": "6.8.12" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.23" + "locked": "6.8.12" }, "org.elasticsearch.client:transport": { - "locked": "6.8.23" + "locked": "6.8.12" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" diff --git a/es6-persistence/src/test/java/com/netflix/conductor/es6/dao/index/ElasticSearchTest.java b/es6-persistence/src/test/java/com/netflix/conductor/es6/dao/index/ElasticSearchTest.java index f3411e93cd..5bb2fe78e3 100644 --- a/es6-persistence/src/test/java/com/netflix/conductor/es6/dao/index/ElasticSearchTest.java +++ b/es6-persistence/src/test/java/com/netflix/conductor/es6/dao/index/ElasticSearchTest.java @@ -48,7 +48,7 @@ public ElasticSearchProperties elasticSearchProperties() { protected static final ElasticsearchContainer container = new ElasticsearchContainer( DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch-oss") - .withTag("6.8.23")); // this should match the client version + .withTag("6.8.12")); // this should match the client version @Autowired protected ObjectMapper objectMapper; diff --git a/server/dependencies.lock b/server/dependencies.lock index fb112c28a5..e080cc121e 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -459,19 +459,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.23" + "locked": "6.8.12" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.23" + "locked": "6.8.12" }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.23" + "locked": "6.8.12" }, "org.glassfish.jaxb:jaxb-runtime": { "locked": "2.3.3" @@ -907,19 +907,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.23" + "locked": "6.8.12" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.23" + "locked": "6.8.12" }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.23" + "locked": "6.8.12" }, "org.glassfish.jaxb:jaxb-runtime": { "locked": "2.3.3" @@ -1462,19 +1462,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.23" + "locked": "6.8.12" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.23" + "locked": "6.8.12" }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.23" + "locked": "6.8.12" }, "org.glassfish.jaxb:jaxb-runtime": { "locked": "2.3.3" diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index 7da7cc56e6..26d8e5c867 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -118,10 +118,10 @@ "locked": "3.0.19" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.23" + "locked": "6.8.12" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.23" + "locked": "6.8.12" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" @@ -647,19 +647,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.23" + "locked": "6.8.12" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.23" + "locked": "6.8.12" }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.23" + "locked": "6.8.12" }, "org.glassfish.jaxb:jaxb-runtime": { "firstLevelTransitive": [ diff --git a/test-harness/src/test/java/com/netflix/conductor/test/integration/AbstractEndToEndTest.java b/test-harness/src/test/java/com/netflix/conductor/test/integration/AbstractEndToEndTest.java index 47753d8f07..3feeafe250 100644 --- a/test-harness/src/test/java/com/netflix/conductor/test/integration/AbstractEndToEndTest.java +++ b/test-harness/src/test/java/com/netflix/conductor/test/integration/AbstractEndToEndTest.java @@ -62,7 +62,7 @@ public abstract class AbstractEndToEndTest { private static final ElasticsearchContainer container = new ElasticsearchContainer( DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch-oss") - .withTag("6.8.23")); // this should match the client version + .withTag("6.8.12")); // this should match the client version private static RestClient restClient;