From ceb344ba20d6d6348b913697d9306b4e48bf4f12 Mon Sep 17 00:00:00 2001 From: itshan Date: Thu, 3 Nov 2022 05:26:28 +0800 Subject: [PATCH] ConsulAutoConfiguration.consulRawClientBuilderSupplier conflict with JPA (#800) Fixes #797 --- .../springframework/cloud/consul/ConsulAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java index 3717cbc7..f4e6fd1d 100644 --- a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java @@ -56,7 +56,7 @@ public class ConsulAutoConfiguration { } @Bean - @ConditionalOnMissingBean + @ConditionalOnMissingBean(value = ConsulRawClient.Builder.class, parameterizedContainer = Supplier.class) public Supplier consulRawClientBuilderSupplier() { return createConsulRawClientBuilder(); }