diff --git a/pom.xml b/pom.xml index e9e14eb..906105c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,151 +1,151 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - spring-cloud-cloudfoundry - 2.0.0.BUILD-SNAPSHOT - pom + spring-cloud-cloudfoundry + 2.0.0.BUILD-SNAPSHOT + pom - - org.springframework.cloud - spring-cloud-build - 2.0.0.BUILD-SNAPSHOT - - + + org.springframework.cloud + spring-cloud-build + 2.0.0.BUILD-SNAPSHOT + + - - 3.3.0.RELEASE - cloudfoundry - ${basedir} - 2.0.0.BUILD-SNAPSHOT - 2.0.0.BUILD-SNAPSHOT - + + 3.3.0.RELEASE + cloudfoundry + ${basedir} + 2.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT + - - https://github.com/spring-cloud/spring-cloud-consul - - scm:git:git://github.com/spring-cloud/spring-cloud-consul.git - - - scm:git:ssh://git@github.com/spring-cloud/spring-cloud-consul.git - - HEAD - + + https://github.com/spring-cloud/spring-cloud-consul + + scm:git:git://github.com/spring-cloud/spring-cloud-consul.git + + + scm:git:ssh://git@github.com/spring-cloud/spring-cloud-consul.git + + HEAD + - - spring-cloud-cloudfoundry-dependencies - spring-cloud-cloudfoundry-commons - spring-cloud-cloudfoundry-discovery - spring-cloud-cloudfoundry-web - spring-cloud-cloudfoundry-sample - spring-cloud-starter-cloudfoundry - docs - + + spring-cloud-cloudfoundry-dependencies + spring-cloud-cloudfoundry-commons + spring-cloud-cloudfoundry-discovery + spring-cloud-cloudfoundry-web + spring-cloud-cloudfoundry-sample + spring-cloud-starter-cloudfoundry + docs + - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + - - - - org.springframework.cloud - spring-cloud-cloudfoundry-dependencies - ${project.version} - pom - import - - - org.springframework.cloud - spring-cloud-netflix-dependencies - ${spring-cloud-netflix.version} - pom - import - - - org.springframework.cloud - spring-cloud-commons-dependencies - ${spring-cloud-commons.version} - pom - import - - - commons-logging - commons-logging - 1.1.3 - - - + + + + org.springframework.cloud + spring-cloud-cloudfoundry-dependencies + ${project.version} + pom + import + + + org.springframework.cloud + spring-cloud-netflix-dependencies + ${spring-cloud-netflix.version} + pom + import + + + org.springframework.cloud + spring-cloud-commons-dependencies + ${spring-cloud-commons.version} + pom + import + + + commons-logging + commons-logging + 1.1.3 + + + - - - spring - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot-local - - true - - - false - - - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - false - - - - spring-releases - Spring Releases - https://repo.spring.io/release - - false - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot-local - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - false - - - - spring-releases - Spring Releases - https://repo.spring.io/libs-release-local - - false - - - - - + + + spring + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/libs-snapshot-local + + true + + + false + + + + spring-milestones + Spring Milestones + https://repo.spring.io/libs-milestone-local + + false + + + + spring-releases + Spring Releases + https://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/libs-snapshot-local + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/libs-milestone-local + + false + + + + spring-releases + Spring Releases + https://repo.spring.io/libs-release-local + + false + + + + + diff --git a/spring-cloud-cloudfoundry-commons/pom.xml b/spring-cloud-cloudfoundry-commons/pom.xml index 3f2aca7..7833a43 100644 --- a/spring-cloud-cloudfoundry-commons/pom.xml +++ b/spring-cloud-cloudfoundry-commons/pom.xml @@ -1,51 +1,51 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - spring-cloud-cloudfoundry-commons - jar - Spring Cloud CloudFoundry Commons - - org.springframework.cloud - spring-cloud-cloudfoundry - 2.0.0.BUILD-SNAPSHOT - .. - - - - org.cloudfoundry - cloudfoundry-client-reactor - ${cf-java-client.version} - - - org.cloudfoundry - cloudfoundry-operations - ${cf-java-client.version} - - - org.cloudfoundry - cloudfoundry-util - ${cf-java-client.version} - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-actuator - true - - - org.springframework.boot - spring-boot-starter-test - test - - + spring-cloud-cloudfoundry-commons + jar + Spring Cloud CloudFoundry Commons + + org.springframework.cloud + spring-cloud-cloudfoundry + 2.0.0.BUILD-SNAPSHOT + .. + + + + org.cloudfoundry + cloudfoundry-client-reactor + ${cf-java-client.version} + + + org.cloudfoundry + cloudfoundry-operations + ${cf-java-client.version} + + + org.cloudfoundry + cloudfoundry-util + ${cf-java-client.version} + + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-actuator + true + + + org.springframework.boot + spring-boot-starter-test + test + + diff --git a/spring-cloud-cloudfoundry-commons/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryClientAutoConfiguration.java b/spring-cloud-cloudfoundry-commons/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryClientAutoConfiguration.java index 8e569a8..18013c1 100644 --- a/spring-cloud-cloudfoundry-commons/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryClientAutoConfiguration.java +++ b/spring-cloud-cloudfoundry-commons/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryClientAutoConfiguration.java @@ -62,9 +62,9 @@ public class CloudFoundryClientAutoConfiguration { @Lazy @ConditionalOnMissingBean public DefaultCloudFoundryOperations cloudFoundryOperations(CloudFoundryClient cloudFoundryClient, - DopplerClient dopplerClient, - RoutingClient routingClient, - UaaClient uaaClient) { + DopplerClient dopplerClient, + RoutingClient routingClient, + UaaClient uaaClient) { String organization = this.cloudFoundryProperties.getOrg(); String space = this.cloudFoundryProperties.getSpace(); return DefaultCloudFoundryOperations diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index d35c65b..5c4aefa 100644 --- a/spring-cloud-cloudfoundry-dependencies/pom.xml +++ b/spring-cloud-cloudfoundry-dependencies/pom.xml @@ -1,100 +1,100 @@ - 4.0.0 - - spring-cloud-dependencies-parent - org.springframework.cloud - 2.0.0.BUILD-SNAPSHOT - - - spring-cloud-cloudfoundry-dependencies - 2.0.0.BUILD-SNAPSHOT - pom - spring-cloud-cloudfoundry-dependencies - Spring Cloud Cloudfoundry Dependencies - - - - org.springframework.cloud - spring-cloud-cloudfoundry-discovery - ${project.version} - - - org.springframework.cloud - spring-cloud-cloudfoundry-commons - ${project.version} - - - org.springframework.cloud - spring-cloud-cloudfoundry-web - ${project.version} - - - org.springframework.cloud - spring-cloud-cloudfoundry-commons - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-cloudfoundry - ${project.version} - - - - - - spring - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot-local - - true - - - false - - - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - false - - - - spring-releases - Spring Releases - https://repo.spring.io/release - - false - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot-local - - true - - - false - - - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - false - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + spring-cloud-dependencies-parent + org.springframework.cloud + 2.0.0.BUILD-SNAPSHOT + + + spring-cloud-cloudfoundry-dependencies + 2.0.0.BUILD-SNAPSHOT + pom + spring-cloud-cloudfoundry-dependencies + Spring Cloud Cloudfoundry Dependencies + + + + org.springframework.cloud + spring-cloud-cloudfoundry-discovery + ${project.version} + + + org.springframework.cloud + spring-cloud-cloudfoundry-commons + ${project.version} + + + org.springframework.cloud + spring-cloud-cloudfoundry-web + ${project.version} + + + org.springframework.cloud + spring-cloud-cloudfoundry-commons + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-cloudfoundry + ${project.version} + + + + + + spring + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/libs-snapshot-local + + true + + + false + + + + spring-milestones + Spring Milestones + https://repo.spring.io/libs-milestone-local + + false + + + + spring-releases + Spring Releases + https://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/libs-snapshot-local + + true + + + false + + + + spring-milestones + Spring Milestones + https://repo.spring.io/libs-milestone-local + + false + + + + + diff --git a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClient.java b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClient.java index 526bf5e..1129ab0 100644 --- a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClient.java +++ b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClient.java @@ -49,7 +49,7 @@ public class CloudFoundryDiscoveryClient implements DiscoveryClient { CloudFoundryDiscoveryClient(CloudFoundryOperations cloudFoundryOperations, - CloudFoundryService svc) { + CloudFoundryService svc) { this.cloudFoundryService = svc; this.cloudFoundryOperations = cloudFoundryOperations; } diff --git a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryRibbonClientConfiguration.java b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryRibbonClientConfiguration.java index c3a4337..4a0ec71 100644 --- a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryRibbonClientConfiguration.java +++ b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryRibbonClientConfiguration.java @@ -52,7 +52,7 @@ public class CloudFoundryRibbonClientConfiguration { @Bean @ConditionalOnMissingBean public ServerList ribbonServerList(CloudFoundryService svc, - IClientConfig config) { + IClientConfig config) { CloudFoundryServerList cloudFoundryServerList = new CloudFoundryServerList(svc); cloudFoundryServerList.initWithNiwsConfig(config); return cloudFoundryServerList;