From c1b02d39a2e544df68a33dc3786e1c2b2c5c329a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 21 Jan 2020 13:59:45 +0000 Subject: [PATCH 1/2] Bumping versions --- spring-cloud-cloudfoundry-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index a7bd9c7..26dc624 100644 --- a/spring-cloud-cloudfoundry-dependencies/pom.xml +++ b/spring-cloud-cloudfoundry-dependencies/pom.xml @@ -6,7 +6,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.2.1.RELEASE + 2.2.2.BUILD-SNAPSHOT spring-cloud-cloudfoundry-dependencies From 383338c56dc977eb895fe4d0b443020072d3eec2 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 21 Jan 2020 15:39:46 -0500 Subject: [PATCH 2/2] Renames nested config classes --- .../CloudFoundryReactiveDiscoveryClientConfiguration.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/reactive/CloudFoundryReactiveDiscoveryClientConfiguration.java b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/reactive/CloudFoundryReactiveDiscoveryClientConfiguration.java index 5bc3c94..5516966 100644 --- a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/reactive/CloudFoundryReactiveDiscoveryClientConfiguration.java +++ b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/reactive/CloudFoundryReactiveDiscoveryClientConfiguration.java @@ -89,13 +89,13 @@ public class CloudFoundryReactiveDiscoveryClientConfiguration { @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.cloud.cloudfoundry.discovery.use-dns", havingValue = "true") - public static class DnsBasedCloudFoundryReactiveDiscoveryClientConfig { + public static class DnsConfig { @Configuration(proxyBeanMethods = false) @ConditionalOnProperty( value = "spring.cloud.cloudfoundry.discovery.use-container-ip", havingValue = "true") - public static class CloudFoundrySimpleDnsBasedReactiveDiscoveryClientConfig { + public static class SimpleDnsConfig { @Bean @ConditionalOnMissingBean @@ -130,7 +130,7 @@ public class CloudFoundryReactiveDiscoveryClientConfiguration { @ConditionalOnProperty( value = "spring.cloud.cloudfoundry.discovery.use-container-ip", havingValue = "false", matchIfMissing = true) - public static class CloudFoundryAppServiceReactiveDiscoveryClientConfig { + public static class AppServiceConfig { @Bean @ConditionalOnMissingBean