From 90c66b920863b88f79b5c4052ddaf5c3ad657892 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 29 Aug 2014 14:10:56 +0100 Subject: [PATCH] Fix platform->cloud --- ...udfoundryResourceCompilerAutoConfiguration.java | 2 +- .../CloudfoundrySsoCompilerAutoConfiguration.java | 2 +- .../ConfigServerCompilerAutoConfiguration.java | 2 +- .../EurekaClientCompilerAutoConfiguration.java | 2 +- .../compiler/HystrixCompilerAutoConfiguration.java | 2 +- ...a => SpringCloudCompilerAutoConfiguration.java} | 6 +++--- .../compiler/ZuulCompilerAutoConfiguration.java | 2 +- ...springframework.boot.cli.command.CommandFactory | 2 +- ...ork.boot.cli.compiler.CompilerAutoConfiguration | 14 +++++++------- spring-cloud-versions/pom.xml | 12 ++++++------ 10 files changed, 23 insertions(+), 23 deletions(-) rename spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/{SpringPlatformCompilerAutoConfiguration.java => SpringCloudCompilerAutoConfiguration.java} (95%) diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/CloudfoundryResourceCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/CloudfoundryResourceCompilerAutoConfiguration.java index 88df5d8..bc56e8e 100644 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/CloudfoundryResourceCompilerAutoConfiguration.java +++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/CloudfoundryResourceCompilerAutoConfiguration.java @@ -38,7 +38,7 @@ public class CloudfoundryResourceCompilerAutoConfiguration extends CompilerAutoC dependencies .ifAnyMissingClasses( "org.springframework.cloud.cloudfoundry.resource.EnableCloudfoundryResource") - .add("spring-platform-starter-cloudfoundry") + .add("spring-cloud-starter-cloudfoundry") .add("org.springframework.security.oauth:spring-security-oauth2:2.0.3.RELEASE"); } diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/CloudfoundrySsoCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/CloudfoundrySsoCompilerAutoConfiguration.java index 49052de..1647900 100644 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/CloudfoundrySsoCompilerAutoConfiguration.java +++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/CloudfoundrySsoCompilerAutoConfiguration.java @@ -38,7 +38,7 @@ public class CloudfoundrySsoCompilerAutoConfiguration extends CompilerAutoConfig dependencies .ifAnyMissingClasses( "org.springframework.cloud.cloudfoundry.sso.EnableCloudfoundrySso") - .add("spring-platform-starter-cloudfoundry") + .add("spring-cloud-starter-cloudfoundry") .add("org.springframework.security.oauth:spring-security-oauth2:2.0.3.RELEASE"); } diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/ConfigServerCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/ConfigServerCompilerAutoConfiguration.java index e78fc3e..c837ee4 100644 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/ConfigServerCompilerAutoConfiguration.java +++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/ConfigServerCompilerAutoConfiguration.java @@ -37,7 +37,7 @@ public class ConfigServerCompilerAutoConfiguration extends CompilerAutoConfigura public void applyDependencies(DependencyCustomizer dependencies) { dependencies .ifAnyMissingClasses("org.springframework.cloud.config.server.EnableConfigServer") - .add("spring-platform-config-server"); + .add("spring-cloud-config-server"); } @Override diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/EurekaClientCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/EurekaClientCompilerAutoConfiguration.java index 65f8556..c87dc7f 100644 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/EurekaClientCompilerAutoConfiguration.java +++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/EurekaClientCompilerAutoConfiguration.java @@ -37,7 +37,7 @@ public class EurekaClientCompilerAutoConfiguration extends CompilerAutoConfigura public void applyDependencies(DependencyCustomizer dependencies) { dependencies.ifAnyMissingClasses( "org.springframework.cloud.netflix.eureka.EnableEurekaClient").add( - "spring-platform-starter-eureka"); + "spring-cloud-starter-eureka"); } @Override diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixCompilerAutoConfiguration.java index e34aac7..2cf8675 100644 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixCompilerAutoConfiguration.java +++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixCompilerAutoConfiguration.java @@ -37,7 +37,7 @@ public class HystrixCompilerAutoConfiguration extends CompilerAutoConfiguration public void applyDependencies(DependencyCustomizer dependencies) { dependencies.ifAnyMissingClasses( "org.springframework.cloud.netflix.hystrix.annotations.EnableHystrix") - .add("spring-platform-starter-hystrix"); + .add("spring-cloud-starter-hystrix"); } @Override diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringPlatformCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudCompilerAutoConfiguration.java similarity index 95% rename from spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringPlatformCompilerAutoConfiguration.java rename to spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudCompilerAutoConfiguration.java index d47b01c..96f3528 100644 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringPlatformCompilerAutoConfiguration.java +++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudCompilerAutoConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.boot.dependency.tools.PropertiesFileDependencies; * @author Dave Syer * */ -public class SpringPlatformCompilerAutoConfiguration extends CompilerAutoConfiguration { +public class SpringCloudCompilerAutoConfiguration extends CompilerAutoConfiguration { @Override public void applyDependencies(DependencyCustomizer dependencies) { @@ -45,7 +45,7 @@ public class SpringPlatformCompilerAutoConfiguration extends CompilerAutoConfigu "spring-boot-starter-actuator"); dependencies .ifAnyMissingClasses("org.springframework.cloud.config.Environment") - .add("spring-platform-config-client"); + .add("spring-cloud-config-client"); } private void addManagedDependencies(DependencyCustomizer dependencies) { @@ -59,7 +59,7 @@ public class SpringPlatformCompilerAutoConfiguration extends CompilerAutoConfigu } private List getAdditionalDependencies() { - String[] components = "org.springframework.cloud:spring-platform-components-versions:1.0.0.BUILD-SNAPSHOT" + String[] components = "org.springframework.cloud:spring-cloud-versions:1.0.0.BUILD-SNAPSHOT" .split(":"); Map dependency; dependency = new HashMap(); diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/ZuulCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/ZuulCompilerAutoConfiguration.java index 20bd246..2f36dc2 100644 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/ZuulCompilerAutoConfiguration.java +++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/ZuulCompilerAutoConfiguration.java @@ -37,7 +37,7 @@ public class ZuulCompilerAutoConfiguration extends CompilerAutoConfiguration { public void applyDependencies(DependencyCustomizer dependencies) { dependencies .ifAnyMissingClasses("org.springframework.cloud.netflix.zuul.EnableZuulProxy") - .add("spring-platform-starter-zuul"); + .add("spring-cloud-starter-zuul"); } @Override diff --git a/spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory b/spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory index a784d0b..bc928ea 100644 --- a/spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory +++ b/spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory @@ -1 +1 @@ -org.springframework.platform.cli.command.EncryptCommand +org.springframework.cloud.cli.command.EncryptCommand diff --git a/spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration b/spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration index b1bb276..f353dc0 100644 --- a/spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration +++ b/spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration @@ -1,7 +1,7 @@ -org.springframework.platform.cli.compiler.SpringPlatformCompilerAutoConfiguration -org.springframework.platform.cli.compiler.ConfigServerCompilerAutoConfiguration -org.springframework.platform.cli.compiler.CloudfoundryResourceCompilerAutoConfiguration -org.springframework.platform.cli.compiler.CloudfoundrySsoCompilerAutoConfiguration -org.springframework.platform.cli.compiler.EurekaClientCompilerAutoConfiguration -org.springframework.platform.cli.compiler.HystrixCompilerAutoConfiguration -org.springframework.platform.cli.compiler.ZuulCompilerAutoConfiguration +org.springframework.cloud.cli.compiler.SpringCloudCompilerAutoConfiguration +org.springframework.cloud.cli.compiler.ConfigServerCompilerAutoConfiguration +org.springframework.cloud.cli.compiler.CloudfoundryResourceCompilerAutoConfiguration +org.springframework.cloud.cli.compiler.CloudfoundrySsoCompilerAutoConfiguration +org.springframework.cloud.cli.compiler.EurekaClientCompilerAutoConfiguration +org.springframework.cloud.cli.compiler.HystrixCompilerAutoConfiguration +org.springframework.cloud.cli.compiler.ZuulCompilerAutoConfiguration diff --git a/spring-cloud-versions/pom.xml b/spring-cloud-versions/pom.xml index 7e1c0d6..f3fa02d 100644 --- a/spring-cloud-versions/pom.xml +++ b/spring-cloud-versions/pom.xml @@ -6,10 +6,10 @@ spring-cloud-cli-parent 1.0.0.BUILD-SNAPSHOT - spring-cloud-components-versions + spring-cloud-versions pom - Spring Cloud Components Versions - Spring Cloud Components Versions Property File + Spring Cloud Versions + Spring Cloud Versions Property File http://projects.spring.io/spring-boot/ Pivotal Software, Inc. @@ -69,7 +69,7 @@ effective-pom - ${project.build.directory}/effective-pom/spring-cloud-components-versions.xml + ${project.build.directory}/effective-pom/spring-cloud-versions.xml @@ -113,11 +113,11 @@ - ${project.build.directory}/generated-resources/spring-cloud-components-versions.properties + ${project.build.directory}/generated-resources/spring-cloud-versions.properties properties - ${project.build.directory}/effective-pom/spring-cloud-components-versions.xml + ${project.build.directory}/effective-pom/spring-cloud-versions.xml effective-pom