Merge #4495

4495: fix(broker): prevent auto config of elasticsearch client r=pihme a=pihme ## Description Prevent ElasticSearch auto configuration. ## Related issues closes #4403 # Co-authored-by: pihme <pihme@users.noreply.github.com>
camunda · May 12, 2020 · 43e195a · 43e195a
2 parents f005cea + 7d975e3
commit 43e195a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/dist/src/main/java/io/zeebe/broker/StandaloneBroker.java b/dist/src/main/java/io/zeebe/broker/StandaloneBroker.java
@@ -23,9 +23,10 @@
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.elasticsearch.rest.RestClientAutoConfiguration;
 import org.springframework.core.env.Environment;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = RestClientAutoConfiguration.class)
 public class StandaloneBroker implements CommandLineRunner {
 
   @Autowired BrokerCfg configuration;

diff --git a/dist/src/main/java/io/zeebe/gateway/StandaloneGateway.java b/dist/src/main/java/io/zeebe/gateway/StandaloneGateway.java
@@ -31,6 +31,7 @@
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.elasticsearch.rest.RestClientAutoConfiguration;
 import org.springframework.core.env.Environment;
 
 public class StandaloneGateway {
@@ -116,7 +117,7 @@ public void run() {
     SpringApplication.run(Launcher.class, args);
   }
 
-  @SpringBootApplication
+  @SpringBootApplication(exclude = RestClientAutoConfiguration.class)
   public static class Launcher implements CommandLineRunner {
 
     @Autowired GatewayCfg configuration;