Merge branch 'main' into community_merge

conductor-oss · Dec 18, 2023 · 6445f3b · 6445f3b
2 parents 72543e4 + 2978701
commit 6445f3b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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/...stence/src/main/java/com/netflix/conductor/redis/dynoqueue/ConfigurationHostSupplier.java b/...stence/src/main/java/com/netflix/conductor/redis/dynoqueue/ConfigurationHostSupplier.java
@@ -40,9 +40,6 @@ public List<Host> getHosts() {
     }
 
     private List<Host> 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
@@ -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

diff --git 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": [