From 4237446aa6a15afe9bbcda1b7998231f77cfa069 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 24 Oct 2017 14:14:52 -0400 Subject: [PATCH] Revert "Update to 1.4.0.RC1 for Finchley.RC1" This reverts commit 96a096de649ce78fb5fa4f65e95751a09a0c322b. --- README.adoc | 2 +- docs/pom.xml | 2 +- docs/src/main/asciidoc/install.adoc | 2 +- pom.xml | 6 +++--- spring-cloud-cli-integration-tests/pom.xml | 2 +- spring-cloud-cli/pom.xml | 4 ++-- .../cloud/cli/compiler/SpringCloudBomAstTransformation.java | 2 +- spring-cloud-launcher/pom.xml | 4 ++-- spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml | 2 +- .../springframework/cloud/launcher/cli/LauncherCommand.java | 2 +- .../spring-cloud-launcher-configserver/pom.xml | 2 +- .../spring-cloud-launcher-dataflow/pom.xml | 2 +- .../spring-cloud-launcher-deployer/pom.xml | 2 +- .../cloud/launcher/deployer/DeployerApplication.java | 2 +- spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml | 2 +- spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml | 2 +- .../spring-cloud-launcher-hystrixdashboard/pom.xml | 2 +- spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml | 2 +- .../spring-cloud-launcher-stubrunner/pom.xml | 2 +- spring-cloud-launcher/spring-cloud-launcher-zipkin/pom.xml | 2 +- 20 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.adoc b/README.adoc index 9d37e1e..3a1c45b 100644 --- a/README.adoc +++ b/README.adoc @@ -34,7 +34,7 @@ and install the Spring Cloud plugin ``` $ mvn install -$ spring install org.springframework.cloud:spring-cloud-cli:1.4.0.RC1 +$ spring install org.springframework.cloud:spring-cloud-cli:1.4.0.BUILD-SNAPSHOT ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features diff --git a/docs/pom.xml b/docs/pom.xml index 9ca92c5..3f0cd6e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.4.0.RC1 + 1.4.0.BUILD-SNAPSHOT pom Spring Cloud Cli Docs diff --git a/docs/src/main/asciidoc/install.adoc b/docs/src/main/asciidoc/install.adoc index 105593d..6b93ed8 100644 --- a/docs/src/main/asciidoc/install.adoc +++ b/docs/src/main/asciidoc/install.adoc @@ -17,7 +17,7 @@ and install the Spring Cloud plugin ``` $ mvn install -$ spring install org.springframework.cloud:spring-cloud-cli:1.4.0.RC1 +$ spring install org.springframework.cloud:spring-cloud-cli:1.4.0.BUILD-SNAPSHOT ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features diff --git a/pom.xml b/pom.xml index ece9e65..699c55e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,11 @@ 4.0.0 org.springframework.cloud spring-cloud-cli-parent - 1.4.0.RC1 + 1.4.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-build - 1.3.5.RELEASE + 1.3.5.BUILD-SNAPSHOT pom @@ -104,7 +104,7 @@ org.springframework.cloud spring-cloud-dependencies - Edgware.RC1 + Edgware.BUILD-SNAPSHOT pom import diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index 756a1aa..d6b2d35 100644 --- a/spring-cloud-cli-integration-tests/pom.xml +++ b/spring-cloud-cli-integration-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.4.0.RC1 + 1.4.0.BUILD-SNAPSHOT diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml index 0d4efe3..4430798 100644 --- a/spring-cloud-cli/pom.xml +++ b/spring-cloud-cli/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cli - 1.4.0.RC1 + 1.4.0.BUILD-SNAPSHOT jar spring-cloud-cli @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.4.0.RC1 + 1.4.0.BUILD-SNAPSHOT diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudBomAstTransformation.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudBomAstTransformation.java index 086a2bd..cc187ae 100644 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudBomAstTransformation.java +++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudBomAstTransformation.java @@ -28,7 +28,7 @@ import org.springframework.boot.cli.compiler.GenericBomAstTransformation; @GroovyASTTransformation(phase = CompilePhase.CONVERSION) public class SpringCloudBomAstTransformation extends GenericBomAstTransformation { - private static final String SPRING_CLOUD_VERSION = "Edgware.RC1"; + private static final String SPRING_CLOUD_VERSION = "Edgware.BUILD-SNAPSHOT"; @Override protected String getBomModule() { diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml index 1561244..bbba8b2 100644 --- a/spring-cloud-launcher/pom.xml +++ b/spring-cloud-launcher/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-launcher - 1.4.0.RC1 + 1.4.0.BUILD-SNAPSHOT pom spring-cloud-launcher @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.4.0.RC1 + 1.4.0.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml index 1de2b74..26d5b60 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-launcher - 1.4.0.RC1 + 1.4.0.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-cli/src/main/java/org/springframework/cloud/launcher/cli/LauncherCommand.java b/spring-cloud-launcher/spring-cloud-launcher-cli/src/main/java/org/springframework/cloud/launcher/cli/LauncherCommand.java index 76698d9..ea25162 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-cli/src/main/java/org/springframework/cloud/launcher/cli/LauncherCommand.java +++ b/spring-cloud-launcher/spring-cloud-launcher-cli/src/main/java/org/springframework/cloud/launcher/cli/LauncherCommand.java @@ -51,7 +51,7 @@ public class LauncherCommand extends OptionParsingCommand { public static final Log log = LogFactory.getLog(LauncherCommand.class); - private static final String DEFAULT_VERSION = "1.4.0.RC1"; + private static final String DEFAULT_VERSION = "1.4.0.BUILD-SNAPSHOT"; private static final Collection EXAMPLES = new ArrayList<>(); diff --git a/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml index ada3c2b..28a0c2b 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-launcher - 1.4.0.RC1 + 1.4.0.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml index aae0693..8a751e4 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-launcher - 1.4.0.RC1 + 1.4.0.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml index 58bc805..2bc1096 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-launcher - 1.4.0.RC1 + 1.4.0.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerApplication.java b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerApplication.java index 2cd6e7b..973e75a 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerApplication.java +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerApplication.java @@ -41,7 +41,7 @@ public class DeployerApplication { private static final Logger logger = LoggerFactory .getLogger(DeployerApplication.class); - private static final String DEFAULT_VERSION = "1.4.0.RC1"; + private static final String DEFAULT_VERSION = "1.4.0.BUILD-SNAPSHOT"; private String[] args; diff --git a/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml index b3f7e37..a44b0c2 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-launcher - 1.4.0.RC1 + 1.4.0.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml index c70c0c9..5bfc0d6 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-launcher - 1.4.0.RC1 + 1.4.0.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/pom.xml index 32304de..7ae93f0 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-launcher - 1.4.0.RC1 + 1.4.0.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml index 63d7a9b..22f1c13 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-launcher - 1.4.0.RC1 + 1.4.0.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml index 5a76e91..017d5c0 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-launcher - 1.4.0.RC1 + 1.4.0.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-zipkin/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-zipkin/pom.xml index a8ac829..190a9b2 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-zipkin/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-zipkin/pom.xml @@ -17,7 +17,7 @@ org.springframework.cloud spring-cloud-launcher - 1.4.0.RC1 + 1.4.0.BUILD-SNAPSHOT