diff --git a/dependencies.gradle b/dependencies.gradle index 41c0f0317..3cb8aff90 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -24,7 +24,7 @@ ext { revCassandraUnit = '3.11.2.0' revCommonsIo = '2.7' revDynoQueues = '2.0.20' - revElasticSearch6 = '6.8.12' + revElasticSearch6 = '6.8.23' revEmbeddedRedis = '0.6' revEurekaClient = '1.10.10' revGroovy = '4.0.9' diff --git a/es6-persistence/dependencies.lock b/es6-persistence/dependencies.lock index 90c1e4bed..0aa67059d 100644 --- a/es6-persistence/dependencies.lock +++ b/es6-persistence/dependencies.lock @@ -36,13 +36,13 @@ "locked": "2.20.0" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.12" + "locked": "6.8.23" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.12" + "locked": "6.8.23" }, "org.elasticsearch.client:transport": { - "locked": "6.8.12" + "locked": "6.8.23" }, "org.springframework.boot:spring-boot-starter": { "locked": "3.1.4" @@ -206,13 +206,13 @@ "locked": "2.20.0" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.12" + "locked": "6.8.23" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.12" + "locked": "6.8.23" }, "org.elasticsearch.client:transport": { - "locked": "6.8.12" + "locked": "6.8.23" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -259,13 +259,13 @@ "locked": "3.1.6" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.12" + "locked": "6.8.23" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.12" + "locked": "6.8.23" }, "org.elasticsearch.client:transport": { - "locked": "6.8.12" + "locked": "6.8.23" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.9.3" @@ -444,13 +444,13 @@ "locked": "3.1.6" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.12" + "locked": "6.8.23" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.12" + "locked": "6.8.23" }, "org.elasticsearch.client:transport": { - "locked": "6.8.12" + "locked": "6.8.23" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.9.3" 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 5045c351b..2cbc2ff86 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 @@ -51,7 +51,7 @@ public ElasticSearchProperties elasticSearchProperties() { new ElasticsearchContainer( DockerImageName.parse( "docker.elastic.co/elasticsearch/elasticsearch-oss") - .withTag("6.8.17")) // this should match the client version + .withTag("6.8.23")) // this should match the client version // Resolve issue with es container not starting on m1/m2 macs .withEnv(Map.of("bootstrap.system_call_filter", "false")); diff --git a/server/dependencies.lock b/server/dependencies.lock index 551cb5f20..9c2d10ef9 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -474,19 +474,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "8.7.1" + "locked": "6.8.23" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.23" }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.23" }, "org.glassfish.jaxb:jaxb-runtime": { "locked": "4.0.1" @@ -934,19 +934,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "8.7.1" + "locked": "6.8.23" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.23" }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.23" }, "org.glassfish.jaxb:jaxb-runtime": { "locked": "4.0.1" @@ -1504,19 +1504,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "8.7.1" + "locked": "6.8.23" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.23" }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.23" }, "org.glassfish.jaxb:jaxb-runtime": { "locked": "4.0.1" diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index 3473f8f56..a866dff22 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -672,7 +672,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.23" }, "org.glassfish.jaxb:jaxb-runtime": { "firstLevelTransitive": [