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

Fix platform->cloud

Browse Source
This commit is contained in:
Dave Syer
2014-08-29 14:10:56 +01:00
parent 408535a235
commit 90c66b9208
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/CloudfoundryResourceCompilerAutoConfiguration.java
View File

@@ -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");
}

2
spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/CloudfoundrySsoCompilerAutoConfiguration.java
View File

@@ -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");
}

2
spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/ConfigServerCompilerAutoConfiguration.java
View File

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

2
spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/EurekaClientCompilerAutoConfiguration.java
View File

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

2
spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixCompilerAutoConfiguration.java
View File

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

6
spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringPlatformCompilerAutoConfiguration.java → spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudCompilerAutoConfiguration.java
View File

@@ -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<Dependencies> 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<String, String> dependency;
dependency = new HashMap<String, String>();

2
spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/ZuulCompilerAutoConfiguration.java
View File

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

2
spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory
View File

@@ -1 +1 @@
org.springframework.platform.cli.command.EncryptCommand
org.springframework.cloud.cli.command.EncryptCommand

14
spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration
View File

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

12
spring-cloud-versions/pom.xml
View File

@@ -6,10 +6,10 @@
<artifactId>spring-cloud-cli-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-cloud-components-versions</artifactId>
<artifactId>spring-cloud-versions</artifactId>
<packaging>pom</packaging>
<name>Spring Cloud Components Versions</name>
<description>Spring Cloud Components Versions Property File</description>
<name>Spring Cloud Versions</name>
<description>Spring Cloud Versions Property File</description>
<url>http://projects.spring.io/spring-boot/</url>
<organization>
<name>Pivotal Software, Inc.</name>
@@ -69,7 +69,7 @@
<goal>effective-pom</goal>
</goals>
<configuration>
<output>${project.build.directory}/effective-pom/spring-cloud-components-versions.xml</output>
<output>${project.build.directory}/effective-pom/spring-cloud-versions.xml</output>
</configuration>
</execution>
</executions>
@@ -113,11 +113,11 @@
<configuration>
<artifacts>
<artifact>
<file>${project.build.directory}/generated-resources/spring-cloud-components-versions.properties</file>
<file>${project.build.directory}/generated-resources/spring-cloud-versions.properties</file>
<type>properties</type>
</artifact>
<artifact>
<file>${project.build.directory}/effective-pom/spring-cloud-components-versions.xml</file>
<file>${project.build.directory}/effective-pom/spring-cloud-versions.xml</file>
<type>effective-pom</type>
</artifact>
</artifacts>