diff --git a/.gitignore b/.gitignore index 052b287229..c7d7048ba0 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ dependency-reduced-pom.xml .vscode/ .flattened-pom.xml +.sdkmanrc diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/loadbalancer/SpringCloudLoadBalancerAutoConfiguration.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/loadbalancer/SpringCloudLoadBalancerAutoConfiguration.java index 5ca4e925df..92d38259a8 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/loadbalancer/SpringCloudLoadBalancerAutoConfiguration.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/loadbalancer/SpringCloudLoadBalancerAutoConfiguration.java @@ -57,7 +57,7 @@ import org.springframework.util.StringUtils; * @author Marcin Grzejszczak */ @Configuration(proxyBeanMethods = false) -@ConditionalOnClass(LoadBalancerClient.class) +@ConditionalOnClass({LoadBalancerClient.class, LoadBalancerClientFactory.class}) @ConditionalOnProperty(value = "stubrunner.cloud.loadbalancer.enabled", matchIfMissing = true) @ConditionalOnBean(StubMapperProperties.class) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle index 1b794027c2..d4d589f5cc 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle @@ -12,7 +12,7 @@ buildscript { dependencies { classpath "com.bmuschko:gradle-nexus-plugin:2.3" classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.3" - classpath 'com.gradle.publish:plugin-publish-plugin:0.9.10' + classpath 'com.gradle.publish:plugin-publish-plugin:0.11.0' if (project.hasProperty('fatJar')) { classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3' }