From 42d7a78fc665ed5d1a4014e1d42555bea8b3a4b1 Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Mon, 18 Dec 2023 08:00:22 +1100 Subject: [PATCH 1/2] Cleanup previous changes --- .../conductor/redis/dynoqueue/ConfigurationHostSupplier.java | 3 --- server/src/main/resources/application.properties | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/redis-persistence/src/main/java/com/netflix/conductor/redis/dynoqueue/ConfigurationHostSupplier.java b/redis-persistence/src/main/java/com/netflix/conductor/redis/dynoqueue/ConfigurationHostSupplier.java index 2ae22e7d0..9e32a1d5f 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/redis/dynoqueue/ConfigurationHostSupplier.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/redis/dynoqueue/ConfigurationHostSupplier.java @@ -40,9 +40,6 @@ public List getHosts() { } private List parseHostsFromConfig() { - System.out.println("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); - System.out.println("Properties in ConfigurationHostSupplier: "); - System.out.println(properties); String hosts = properties.getHosts(); if (hosts == null) { String message = diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties index 9889a2022..09b8f22b4 100644 --- a/server/src/main/resources/application.properties +++ b/server/src/main/resources/application.properties @@ -15,7 +15,7 @@ spring.application.name=conductor springdoc.api-docs.path=/api-docs loadSample=true -conductor.db.type=redis_standalone +conductor.db.type=memory conductor.queue.type=redis_standalone conductor.indexing.enabled=false From 922f528180872caff666c9fad790fb2aed3d28e4 Mon Sep 17 00:00:00 2001 From: yanghaojia <2453883990@qq.com> Date: Mon, 18 Dec 2023 15:09:16 +0800 Subject: [PATCH 2/2] Fix elasticsearch dependency error --- dependencies.gradle | 2 +- es6-persistence/dependencies.lock | 24 +++++++++---------- .../es6/dao/index/ElasticSearchTest.java | 2 +- server/dependencies.lock | 18 +++++++------- test-harness/dependencies.lock | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) 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": [