SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-06-02 10:47:39 +02:00
parent b5680c66a9 adc9645990
commit 6c02d8ce7a
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -44,3 +44,4 @@ dependency-reduced-pom.xml
.vscode/
.flattened-pom.xml
.sdkmanrc

2
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/loadbalancer/SpringCloudLoadBalancerAutoConfiguration.java
View File

@@ -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)

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle
View File

@@ -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'
}