From 7c6966331ea57792f74e0cd7c7bfd86cefaea75c Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 21 Jul 2017 13:26:05 -0600 Subject: [PATCH 01/12] Update SNAPSHOT to 1.3.4.RELEASE --- README.adoc | 8 ++++---- docs/pom.xml | 2 +- docs/src/main/asciidoc/install.adoc | 8 ++++---- pom.xml | 6 +++--- spring-cloud-cli-integration-tests/pom.xml | 2 +- spring-cloud-cli/pom.xml | 4 ++-- .../cli/compiler/SpringCloudBomAstTransformation.java | 2 +- spring-cloud-launcher/pom.xml | 4 ++-- spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml | 2 +- .../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-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-zipkin/pom.xml | 2 +- 19 files changed, 29 insertions(+), 29 deletions(-) diff --git a/README.adoc b/README.adoc index fff47bc..4eeec18 100644 --- a/README.adoc +++ b/README.adoc @@ -21,20 +21,20 @@ https://github.com/spring-projects/spring-boot[Spring Boot CLI] (1.5.2 or better): $ spring version - Spring CLI v1.5.3.RELEASE + Spring CLI v1.5.4.RELEASE E.g. for SDKMan users ``` -$ sdk install springboot 1.5.3.RELEASE -$ sdk use springboot 1.5.3.RELEASE +$ sdk install springboot 1.5.4.RELEASE +$ sdk use springboot 1.5.4.RELEASE ``` and install the Spring Cloud plugin ``` $ mvn install -$ spring install org.springframework.cloud:spring-cloud-cli:1.3.4.BUILD-SNAPSHOT +$ spring install org.springframework.cloud:spring-cloud-cli:1.3.4.RELEASE ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features diff --git a/docs/pom.xml b/docs/pom.xml index 87f8750..4977497 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE pom Spring Cloud Cli Docs diff --git a/docs/src/main/asciidoc/install.adoc b/docs/src/main/asciidoc/install.adoc index 36ea57d..19d86fc 100644 --- a/docs/src/main/asciidoc/install.adoc +++ b/docs/src/main/asciidoc/install.adoc @@ -4,20 +4,20 @@ https://github.com/spring-projects/spring-boot[Spring Boot CLI] (1.5.2 or better): $ spring version - Spring CLI v1.5.3.RELEASE + Spring CLI v1.5.4.RELEASE E.g. for SDKMan users ``` -$ sdk install springboot 1.5.3.RELEASE -$ sdk use springboot 1.5.3.RELEASE +$ sdk install springboot 1.5.4.RELEASE +$ sdk use springboot 1.5.4.RELEASE ``` and install the Spring Cloud plugin ``` $ mvn install -$ spring install org.springframework.cloud:spring-cloud-cli:1.3.4.BUILD-SNAPSHOT +$ spring install org.springframework.cloud:spring-cloud-cli:1.3.4.RELEASE ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features diff --git a/pom.xml b/pom.xml index e57d81c..dd30c9d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,11 @@ 4.0.0 org.springframework.cloud spring-cloud-cli-parent - 1.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE org.springframework.cloud spring-cloud-build - 1.3.2.RELEASE + 1.3.3.RELEASE pom @@ -104,7 +104,7 @@ org.springframework.cloud spring-cloud-dependencies - Dalston.BUILD-SNAPSHOT + Dalston.SR2 pom import diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index bd308dd..39cfe56 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.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml index 19e3bfa..296a62b 100644 --- a/spring-cloud-cli/pom.xml +++ b/spring-cloud-cli/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cli - 1.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE jar spring-cloud-cli @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE 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 4c470e5..05fa60b 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 = "Dalston.BUILD-SNAPSHOT"; + private static final String SPRING_CLOUD_VERSION = "Dalston.SR2"; @Override protected String getBomModule() { diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml index 3e982e5..fed1be9 100644 --- a/spring-cloud-launcher/pom.xml +++ b/spring-cloud-launcher/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-launcher - 1.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE pom spring-cloud-launcher @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml index 00e2af4..48af4df 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.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE 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 fb274a5..3dea036 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.3.4.BUILD-SNAPSHOT"; + private static final String DEFAULT_VERSION = "1.3.4.RELEASE"; 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 5a47646..07a97d5 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.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml index 50b55f1..4b57503 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.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml index e7a1cf6..8f02c8c 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.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE 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 f7f27eb..2f02e3a 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.3.4.BUILD-SNAPSHOT"; + private static final String DEFAULT_VERSION = "1.3.4.RELEASE"; 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 b0f3ec3..4da2955 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.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml index 586c659..bb4563a 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.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/pom.xml index 1070cea..94b6aaf 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.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml index 2eb2073..b249db5 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.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-zipkin/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-zipkin/pom.xml index 816ff2e..d1df7d0 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.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE From 7329a8a091af805192e08f62bcd5f186c8c6498f Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 21 Jul 2017 13:41:45 -0600 Subject: [PATCH 02/12] Update to SNAPSHOT --- README.adoc | 2 +- docs/pom.xml | 2 +- docs/src/main/asciidoc/install.adoc | 2 +- pom.xml | 8 ++++---- spring-cloud-cli-integration-tests/pom.xml | 2 +- spring-cloud-cli/pom.xml | 4 ++-- .../cli/compiler/SpringCloudBomAstTransformation.java | 2 +- spring-cloud-launcher/pom.xml | 4 ++-- spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml | 2 +- .../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-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-zipkin/pom.xml | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.adoc b/README.adoc index 4eeec18..3f7ec59 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.3.4.RELEASE +$ spring install org.springframework.cloud:spring-cloud-cli:1.3.5.BUILD-SNAPSHOT ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features diff --git a/docs/pom.xml b/docs/pom.xml index 4977497..a9e166e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.3.4.RELEASE + 1.3.5.BUILD-SNAPSHOT pom Spring Cloud Cli Docs diff --git a/docs/src/main/asciidoc/install.adoc b/docs/src/main/asciidoc/install.adoc index 19d86fc..582b6e7 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.3.4.RELEASE +$ spring install org.springframework.cloud:spring-cloud-cli:1.3.5.BUILD-SNAPSHOT ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features diff --git a/pom.xml b/pom.xml index dd30c9d..a85f811 100644 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,11 @@ 4.0.0 org.springframework.cloud spring-cloud-cli-parent - 1.3.4.RELEASE + 1.3.5.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-build - 1.3.3.RELEASE + 1.3.3.BUILD-SNAPSHOT pom @@ -24,7 +24,7 @@ cli spring-cloud-cli ${basedir}/.. - 1.5.3.RELEASE + 1.5.4.RELEASE spring-cloud-launcher @@ -104,7 +104,7 @@ org.springframework.cloud spring-cloud-dependencies - Dalston.SR2 + Dalston.BUILD-SNAPSHOT pom import diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index 39cfe56..f857619 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.3.4.RELEASE + 1.3.5.BUILD-SNAPSHOT diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml index 296a62b..5e15c89 100644 --- a/spring-cloud-cli/pom.xml +++ b/spring-cloud-cli/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cli - 1.3.4.RELEASE + 1.3.5.BUILD-SNAPSHOT jar spring-cloud-cli @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.3.4.RELEASE + 1.3.5.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 05fa60b..4c470e5 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 = "Dalston.SR2"; + private static final String SPRING_CLOUD_VERSION = "Dalston.BUILD-SNAPSHOT"; @Override protected String getBomModule() { diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml index fed1be9..ac41ae1 100644 --- a/spring-cloud-launcher/pom.xml +++ b/spring-cloud-launcher/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-launcher - 1.3.4.RELEASE + 1.3.5.BUILD-SNAPSHOT pom spring-cloud-launcher @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.3.4.RELEASE + 1.3.5.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 48af4df..50491b0 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.3.4.RELEASE + 1.3.5.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 3dea036..347ae4a 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.3.4.RELEASE"; + private static final String DEFAULT_VERSION = "1.3.5.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 07a97d5..108198b 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.3.4.RELEASE + 1.3.5.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 4b57503..2cca73a 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.3.4.RELEASE + 1.3.5.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 8f02c8c..6387996 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.3.4.RELEASE + 1.3.5.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 2f02e3a..0de398f 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.3.4.RELEASE"; + private static final String DEFAULT_VERSION = "1.3.5.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 4da2955..4d9fdf9 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.3.4.RELEASE + 1.3.5.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 bb4563a..68e1c47 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.3.4.RELEASE + 1.3.5.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 94b6aaf..ca27db0 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.3.4.RELEASE + 1.3.5.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 b249db5..a2e31d2 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.3.4.RELEASE + 1.3.5.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 d1df7d0..a5828e8 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.3.4.RELEASE + 1.3.5.BUILD-SNAPSHOT From 3dc269d8a98b2ea37bbfb90cbaefcca3deefaf37 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 21 Jul 2017 13:47:40 -0600 Subject: [PATCH 03/12] Bump to version 1.4.0.BUILD-SNAPSHOT --- README.adoc | 2 +- docs/pom.xml | 2 +- docs/src/main/asciidoc/install.adoc | 2 +- pom.xml | 4 ++-- 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/spring-cloud-launcher-dataflow/pom.xml | 2 +- spring-cloud-launcher/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/spring-cloud-launcher-zipkin/pom.xml | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.adoc b/README.adoc index 3f7ec59..8f21227 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.3.5.BUILD-SNAPSHOT +$ 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 a9e166e..3f0cd6e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.3.5.BUILD-SNAPSHOT + 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 582b6e7..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.3.5.BUILD-SNAPSHOT +$ 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 a85f811..aabfe08 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.cloud spring-cloud-cli-parent - 1.3.5.BUILD-SNAPSHOT + 1.4.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-build @@ -104,7 +104,7 @@ org.springframework.cloud spring-cloud-dependencies - Dalston.BUILD-SNAPSHOT + Edgware.BUILD-SNAPSHOT pom import diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index f857619..b251c21 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.3.5.BUILD-SNAPSHOT + 1.4.0.BUILD-SNAPSHOT diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml index 5e15c89..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.3.5.BUILD-SNAPSHOT + 1.4.0.BUILD-SNAPSHOT jar spring-cloud-cli @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.3.5.BUILD-SNAPSHOT + 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 4c470e5..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 = "Dalston.BUILD-SNAPSHOT"; + 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 ac41ae1..1345328 100644 --- a/spring-cloud-launcher/pom.xml +++ b/spring-cloud-launcher/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-launcher - 1.3.5.BUILD-SNAPSHOT + 1.4.0.BUILD-SNAPSHOT pom spring-cloud-launcher @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.3.5.BUILD-SNAPSHOT + 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 50491b0..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.3.5.BUILD-SNAPSHOT + 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 347ae4a..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.3.5.BUILD-SNAPSHOT"; + 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 108198b..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.3.5.BUILD-SNAPSHOT + 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 2cca73a..5f2a890 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.3.5.BUILD-SNAPSHOT + 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 6387996..19f246a 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.3.5.BUILD-SNAPSHOT + 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 0de398f..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.3.5.BUILD-SNAPSHOT"; + 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 4d9fdf9..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.3.5.BUILD-SNAPSHOT + 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 68e1c47..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.3.5.BUILD-SNAPSHOT + 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 ca27db0..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.3.5.BUILD-SNAPSHOT + 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 a2e31d2..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.3.5.BUILD-SNAPSHOT + 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 a5828e8..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.3.5.BUILD-SNAPSHOT + 1.4.0.BUILD-SNAPSHOT From 6b83f5d86aa52856b9b1badc381b47d9b9cdf25c Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 23 Aug 2017 13:13:11 +0200 Subject: [PATCH 04/12] Fixes wrong dataflow versions (#67) * Fixes wrong dataflow versions * Fixed broken build --- spring-cloud-cli-integration-tests/pom.xml | 12 ++++++++++++ .../spring-cloud-launcher-dataflow/pom.xml | 12 ++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index b251c21..d6b2d35 100644 --- a/spring-cloud-cli-integration-tests/pom.xml +++ b/spring-cloud-cli-integration-tests/pom.xml @@ -55,6 +55,18 @@ true + + maven-jar-plugin + + true + + + + maven-install-plugin + + true + + diff --git a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml index 5f2a890..e54eecc 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml @@ -17,19 +17,11 @@ - 1.1.4.RELEASE - 1.4.4.RELEASE - + 1.2.3.RELEASE + - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - org.springframework.cloud spring-cloud-dataflow-dependencies From 5c34b170f413c88312087bc86b2bdca3cf4465b6 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 23 Aug 2017 16:53:36 +0200 Subject: [PATCH 05/12] Added Stub Runner, fixes #64 --- .travis.yml | 11 ----- docs/src/main/asciidoc/spring-cloud-cli.adoc | 18 ++++++- .../samples/stubrunner.groovy | 6 +++ .../cloud/cli/SampleIntegrationTests.java | 7 +++ .../StubRunnerCompilerAutoConfiguration.java | 48 +++++++++++++++++++ ...oot.cli.compiler.CompilerAutoConfiguration | 1 + spring-cloud-launcher/pom.xml | 1 + .../src/main/resources/cloud.yml | 15 ++++++ .../spring-cloud-launcher-stubrunner/pom.xml | 43 +++++++++++++++++ .../stubrunner/StubRunnerApplication.java | 32 +++++++++++++ .../resources/META-INF/thin-rabbit.properties | 2 + .../src/main/resources/application.yml | 11 +++++ .../main/resources/launcher/application.yml | 30 ++++++++++++ .../stubrunner/DeployerApplicationTests.java | 17 +++++++ 14 files changed, 229 insertions(+), 13 deletions(-) delete mode 100644 .travis.yml create mode 100644 spring-cloud-cli-integration-tests/samples/stubrunner.groovy create mode 100644 spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/StubRunnerCompilerAutoConfiguration.java create mode 100644 spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml create mode 100644 spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/java/org/springframework/cloud/launcher/stubrunner/StubRunnerApplication.java create mode 100644 spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/resources/META-INF/thin-rabbit.properties create mode 100644 spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/resources/application.yml create mode 100644 spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/resources/launcher/application.yml create mode 100644 spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/test/java/org/springframework/cloud/launcher/stubrunner/DeployerApplicationTests.java diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0fa19e0..0000000 --- a/.travis.yml +++ /dev/null @@ -1,11 +0,0 @@ -sudo: false -cache: - directories: - - $HOME/.m2 -language: java -jdk: # TODO: should work with java 1.7 - - oraclejdk8 -install: -- ./mvnw install -P docs -q -U -DskipTests=true -Dmaven.test.redirectTestOutputToFile=true -script: -- './mvnw install -nsu -Dmaven.test.redirectTestOutputToFile=true' diff --git a/docs/src/main/asciidoc/spring-cloud-cli.adoc b/docs/src/main/asciidoc/spring-cloud-cli.adoc index ea05e9e..51ee3e5 100644 --- a/docs/src/main/asciidoc/spring-cloud-cli.adoc +++ b/docs/src/main/asciidoc/spring-cloud-cli.adoc @@ -21,7 +21,7 @@ of services just `spring cloud`. To choose the services to deploy, just list them on the command line, e.g. ---- -$ spring cloud eureka configserver h2 kafka zipkin +$ spring cloud eureka configserver h2 kafka stubrunner zipkin ---- Summary of supported deployables: @@ -50,6 +50,9 @@ Summary of supported deployables: |zipkin | Zipkin Server | http://localhost:9411 | Zipkin Server with UI for visualizing traces. Stores span data in memory and accepts them via HTTP POST of JSON data. + +|stubrunner | Stub Runner Boot | http://localhost:8750 +| Downloads WireMock stubs, starts WireMock and feeds the started servers with stored stubs. Pass `stubrunner.ids` to pass stub coordinates and then go to `http://localhost:8750/stubs`. |=== Each of these apps can be configured using a local YAML file with the same name (in the current @@ -69,6 +72,17 @@ spring: uri: file://${user.home}/dev/demo/config-repo ---- +E.g. in Stub Runner app you could fetch stubs from your local `.m2` in the following way. + +.stubrunner.yml +[source,yaml,indent=0] +---- +stubrunner: + workOffline: true + ids: + - com.example:beer-api-producer:+:9876 +---- + === Adding Additional Applications Additional applications can be added to `./config/cloud.yml` (not @@ -94,7 +108,7 @@ when you list the apps: [source] ---- $ spring cloud --list -source sink configserver dataflow eureka h2 hystrixdashboard kafka zipkin +source sink configserver dataflow eureka h2 hystrixdashboard kafka stubrunner zipkin ---- (notice the additional apps at the start of the list). diff --git a/spring-cloud-cli-integration-tests/samples/stubrunner.groovy b/spring-cloud-cli-integration-tests/samples/stubrunner.groovy new file mode 100644 index 0000000..992ad99 --- /dev/null +++ b/spring-cloud-cli-integration-tests/samples/stubrunner.groovy @@ -0,0 +1,6 @@ +package org.test + +@EnableStubRunnerServer +class Example { +} + diff --git a/spring-cloud-cli-integration-tests/src/test/java/org/springframework/cloud/cli/SampleIntegrationTests.java b/spring-cloud-cli-integration-tests/src/test/java/org/springframework/cloud/cli/SampleIntegrationTests.java index eeb0d6f..743d555 100644 --- a/spring-cloud-cli-integration-tests/src/test/java/org/springframework/cloud/cli/SampleIntegrationTests.java +++ b/spring-cloud-cli-integration-tests/src/test/java/org/springframework/cloud/cli/SampleIntegrationTests.java @@ -76,4 +76,11 @@ public class SampleIntegrationTests { output.contains("[/routes || /routes.json],methods=[GET]")); } + @Test + public void stubRunnerSample() throws Exception { + String output = this.cli.run("stubrunner.groovy"); + assertTrue("Wrong output: " + output, + output.contains("[/stubs],produces=[application/json]")); + } + } diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/StubRunnerCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/StubRunnerCompilerAutoConfiguration.java new file mode 100644 index 0000000..3e4ba5d --- /dev/null +++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/StubRunnerCompilerAutoConfiguration.java @@ -0,0 +1,48 @@ +/* + * Copyright 2013-2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.cloud.cli.compiler; + +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.control.CompilationFailedException; +import org.codehaus.groovy.control.customizers.ImportCustomizer; +import org.springframework.boot.cli.compiler.AstUtils; +import org.springframework.boot.cli.compiler.CompilerAutoConfiguration; +import org.springframework.boot.cli.compiler.DependencyCustomizer; + +/** + * @author Marcin Grzejszczak + * + */ +public class StubRunnerCompilerAutoConfiguration extends CompilerAutoConfiguration { + + @Override + public boolean matches(ClassNode classNode) { + return AstUtils.hasAtLeastOneAnnotation(classNode, "EnableStubRunnerServer"); + } + + @Override + public void applyDependencies(DependencyCustomizer dependencies) { + dependencies + .ifAnyMissingClasses("org.springframework.cloud.contract.stubrunner.server.EnableStubRunnerServer") + .add("spring-cloud-starter-contract-stub-runner"); + } + + @Override + public void applyImports(ImportCustomizer imports) throws CompilationFailedException { + imports.addImports("org.springframework.cloud.contract.stubrunner.server.EnableStubRunnerServer"); + } + +} 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 4dfc5d6..902572a 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 @@ -8,4 +8,5 @@ org.springframework.cloud.cli.compiler.OAuth2LoadBalancedCompilerAutoConfigurati org.springframework.cloud.cli.compiler.RibbonClientCompilerAutoConfiguration org.springframework.cloud.cli.compiler.StreamKafkaCompilerAutoConfiguration org.springframework.cloud.cli.compiler.StreamRabbitCompilerAutoConfiguration +org.springframework.cloud.cli.compiler.StubRunnerCompilerAutoConfiguration org.springframework.cloud.cli.compiler.ZuulCompilerAutoConfiguration diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml index 1345328..3201a10 100644 --- a/spring-cloud-launcher/pom.xml +++ b/spring-cloud-launcher/pom.xml @@ -30,6 +30,7 @@ spring-cloud-launcher-h2 spring-cloud-launcher-hystrixdashboard spring-cloud-launcher-kafka + spring-cloud-launcher-stubrunner spring-cloud-launcher-zipkin diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/cloud.yml b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/cloud.yml index b649079..b31de48 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/cloud.yml +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/cloud.yml @@ -79,6 +79,16 @@ spring: spring.cloud.deployer.local.javaOpts: ${dt.opts} application-properties: management.security.enabled: false + stubrunner: + coordinates: ${dt.pre}stubrunner:${dt.ver} + port: 8750 + message: To see the registered stubs open http://localhost:8750/stubs + order: 0 + properties: + spring.cloud.deployer.memory: ${dt.mem} + spring.cloud.deployer.local.javaOpts: ${dt.opts} + application-properties: + management.security.enabled: false zipkin: coordinates: ${dt.pre}zipkin:${dt.ver} port: 9411 @@ -121,6 +131,11 @@ spring: spring.cloud.deployer.thin.profile: rabbit application-properties: spring.cloud.bus.enabled: true + stubrunner: + properties: + spring.cloud.deployer.thin.profile: rabbit + application-properties: + spring.cloud.bus.enabled: true zipkin: properties: spring.cloud.deployer.thin.profile: rabbit diff --git a/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml new file mode 100644 index 0000000..017d5c0 --- /dev/null +++ b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml @@ -0,0 +1,43 @@ + + + 4.0.0 + + org.springframework.cloud.launcher + spring-cloud-launcher-stubrunner + jar + + spring-cloud-launcher-stubrunner + Spring Cloud Launcher Stub Runner + + + org.springframework.cloud + spring-cloud-launcher + 1.4.0.BUILD-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.cloud + spring-cloud-starter-contract-stub-runner + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/java/org/springframework/cloud/launcher/stubrunner/StubRunnerApplication.java b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/java/org/springframework/cloud/launcher/stubrunner/StubRunnerApplication.java new file mode 100644 index 0000000..6353115 --- /dev/null +++ b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/java/org/springframework/cloud/launcher/stubrunner/StubRunnerApplication.java @@ -0,0 +1,32 @@ +/* + * Copyright 2013-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.launcher.stubrunner; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.contract.stubrunner.server.EnableStubRunnerServer; + +/** + * @author Marcin Grzejszczak + */ +@EnableStubRunnerServer +@SpringBootApplication +public class StubRunnerApplication { + public static void main(String[] args) { + SpringApplication.run(StubRunnerApplication.class, args); + } +} diff --git a/spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/resources/META-INF/thin-rabbit.properties b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/resources/META-INF/thin-rabbit.properties new file mode 100644 index 0000000..0343528 --- /dev/null +++ b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/resources/META-INF/thin-rabbit.properties @@ -0,0 +1,2 @@ +exclusions.spring-cloud-starter-bus-kafka: org.springframework.cloud:spring-cloud-starter-bus-kafka +dependencies.spring-cloud-starter-bus-amqp: org.springframework.cloud:spring-cloud-starter-bus-amqp diff --git a/spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/resources/application.yml b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/resources/application.yml new file mode 100644 index 0000000..d65102d --- /dev/null +++ b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/resources/application.yml @@ -0,0 +1,11 @@ +spring: + application: + name: stubrunner + +server: + port: 8750 + +info: + artifactId: "@project.artifactId@" + description: "@project.description@" + version: "@project.version@" \ No newline at end of file diff --git a/spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/resources/launcher/application.yml b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/resources/launcher/application.yml new file mode 100644 index 0000000..2fcfda4 --- /dev/null +++ b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/main/resources/launcher/application.yml @@ -0,0 +1,30 @@ +info: + description: Spring Cloud Launcher + +eureka: + client: + instance-info-replication-interval-seconds: 5 + initial-instance-info-replication-interval-seconds: 5 + serviceUrl: + defaultZone: http://localhost:8761/eureka/ + +endpoints: + restart: + enabled: true + +ribbon: + ConnectTimeout: 3000 + ReadTimeout: 60000 + +h2.datasource.url: jdbc:h2:tcp://localhost:9096/./target/test +#spring: +# datasource: +# url: ${h2.datasource.url} + +logging: + level: + kafka: WARN + org.apache.zookeeper: WARN + org.apache.zookeeper.ClientCnxn: ERROR + org.apache.kafka: WARN + org.I0Itec: WARN diff --git a/spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/test/java/org/springframework/cloud/launcher/stubrunner/DeployerApplicationTests.java b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/test/java/org/springframework/cloud/launcher/stubrunner/DeployerApplicationTests.java new file mode 100644 index 0000000..96f9c04 --- /dev/null +++ b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/src/test/java/org/springframework/cloud/launcher/stubrunner/DeployerApplicationTests.java @@ -0,0 +1,17 @@ +package org.springframework.cloud.launcher.stubrunner; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class DeployerApplicationTests { + + @Test + public void contextLoads() { + } + +} From 2ced66f57fb75015741791e94c86f7ef85b2d5c8 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 23 Aug 2017 16:55:21 +0200 Subject: [PATCH 06/12] Updated docs --- README.adoc | 2 +- docs/src/main/asciidoc/README.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 8f21227..3a1c45b 100644 --- a/README.adoc +++ b/README.adoc @@ -1,6 +1,6 @@ // Do not edit this file (e.g. go instead to src/main/asciidoc) -image::https://travis-ci.org/spring-cloud/spring-cloud-cli.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud/spring-cloud-cli] +image:https://circleci.com/gh/spring-cloud/spring-cloud-cli.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-cli"] Spring Boot CLI provides http://projects.spring.io/spring-boot[Spring Boot] command line features for https://github.com/spring-cloud[Spring diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index e81a787..d973af4 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -1,4 +1,4 @@ -image::https://travis-ci.org/spring-cloud/spring-cloud-cli.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud/spring-cloud-cli] +image:https://circleci.com/gh/spring-cloud/spring-cloud-cli.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-cli"] include::intro.adoc[] From 52cf87d728988b24c0f2e243d3a7004da551d8f1 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 24 Oct 2017 14:02:12 -0400 Subject: [PATCH 07/12] Updates to latest versions --- pom.xml | 4 ++-- spring-cloud-launcher/pom.xml | 2 +- spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml | 2 +- spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index aabfe08..699c55e 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-build - 1.3.3.BUILD-SNAPSHOT + 1.3.5.BUILD-SNAPSHOT pom @@ -24,7 +24,7 @@ cli spring-cloud-cli ${basedir}/.. - 1.5.4.RELEASE + 1.5.7.RELEASE spring-cloud-launcher diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml index 3201a10..bbba8b2 100644 --- a/spring-cloud-launcher/pom.xml +++ b/spring-cloud-launcher/pom.xml @@ -18,7 +18,7 @@ - 1.0.1.RELEASE + 1.0.7.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml index e54eecc..8a751e4 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml @@ -18,7 +18,7 @@ 1.2.3.RELEASE - + diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml index 19f246a..2bc1096 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml @@ -17,8 +17,8 @@ - 1.1.4.RELEASE - 1.0.2.RELEASE + 1.2.2.RELEASE + 1.0.7.RELEASE From 96a096de649ce78fb5fa4f65e95751a09a0c322b Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 24 Oct 2017 14:11:45 -0400 Subject: [PATCH 08/12] Update to 1.4.0.RC1 for Finchley.RC1 --- 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 3a1c45b..9d37e1e 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.BUILD-SNAPSHOT +$ spring install org.springframework.cloud:spring-cloud-cli:1.4.0.RC1 ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features diff --git a/docs/pom.xml b/docs/pom.xml index 3f0cd6e..9ca92c5 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.4.0.BUILD-SNAPSHOT + 1.4.0.RC1 pom Spring Cloud Cli Docs diff --git a/docs/src/main/asciidoc/install.adoc b/docs/src/main/asciidoc/install.adoc index 6b93ed8..105593d 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.BUILD-SNAPSHOT +$ spring install org.springframework.cloud:spring-cloud-cli:1.4.0.RC1 ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features diff --git a/pom.xml b/pom.xml index 699c55e..ece9e65 100644 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,11 @@ 4.0.0 org.springframework.cloud spring-cloud-cli-parent - 1.4.0.BUILD-SNAPSHOT + 1.4.0.RC1 org.springframework.cloud spring-cloud-build - 1.3.5.BUILD-SNAPSHOT + 1.3.5.RELEASE pom @@ -104,7 +104,7 @@ org.springframework.cloud spring-cloud-dependencies - Edgware.BUILD-SNAPSHOT + Edgware.RC1 pom import diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index d6b2d35..756a1aa 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.BUILD-SNAPSHOT + 1.4.0.RC1 diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml index 4430798..0d4efe3 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.BUILD-SNAPSHOT + 1.4.0.RC1 jar spring-cloud-cli @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.4.0.BUILD-SNAPSHOT + 1.4.0.RC1 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 cc187ae..086a2bd 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.BUILD-SNAPSHOT"; + private static final String SPRING_CLOUD_VERSION = "Edgware.RC1"; @Override protected String getBomModule() { diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml index bbba8b2..1561244 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.BUILD-SNAPSHOT + 1.4.0.RC1 pom spring-cloud-launcher @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.4.0.BUILD-SNAPSHOT + 1.4.0.RC1 diff --git a/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml index 26d5b60..1de2b74 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.BUILD-SNAPSHOT + 1.4.0.RC1 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 ea25162..76698d9 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.BUILD-SNAPSHOT"; + private static final String DEFAULT_VERSION = "1.4.0.RC1"; 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 28a0c2b..ada3c2b 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.BUILD-SNAPSHOT + 1.4.0.RC1 diff --git a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml index 8a751e4..aae0693 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.BUILD-SNAPSHOT + 1.4.0.RC1 diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml index 2bc1096..58bc805 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.BUILD-SNAPSHOT + 1.4.0.RC1 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 973e75a..2cd6e7b 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.BUILD-SNAPSHOT"; + private static final String DEFAULT_VERSION = "1.4.0.RC1"; 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 a44b0c2..b3f7e37 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.BUILD-SNAPSHOT + 1.4.0.RC1 diff --git a/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml index 5bfc0d6..c70c0c9 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.BUILD-SNAPSHOT + 1.4.0.RC1 diff --git a/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/pom.xml index 7ae93f0..32304de 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.BUILD-SNAPSHOT + 1.4.0.RC1 diff --git a/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml index 22f1c13..63d7a9b 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.BUILD-SNAPSHOT + 1.4.0.RC1 diff --git a/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml index 017d5c0..5a76e91 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.BUILD-SNAPSHOT + 1.4.0.RC1 diff --git a/spring-cloud-launcher/spring-cloud-launcher-zipkin/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-zipkin/pom.xml index 190a9b2..a8ac829 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.BUILD-SNAPSHOT + 1.4.0.RC1 From 4237446aa6a15afe9bbcda1b7998231f77cfa069 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 24 Oct 2017 14:14:52 -0400 Subject: [PATCH 09/12] 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 From b6f21a0221f8bd545b20179375e35b684ee813cc Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 25 Oct 2017 09:26:16 -0400 Subject: [PATCH 10/12] Update to new docs --- docs/pom.xml | 71 +++++++++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 3f0cd6e..723c5c8 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.springframework.cloud spring-cloud-cli-docs @@ -12,43 +13,51 @@ Spring Cloud Cli Docs Spring Cloud Docs - spring-cloud-cli + spring-cloud-cli ${basedir}/.. 1.0.x - + - - - maven-deploy-plugin - - true - - + + + maven-deploy-plugin + + true + + - + docs - - - - org.asciidoctor - asciidoctor-maven-plugin - false - - - org.apache.maven.plugins - maven-antrun-plugin - false - - - org.codehaus.mojo - build-helper-maven-plugin - false - - - + + + + org.apache.maven.plugins + maven-dependency-plugin + + + org.asciidoctor + asciidoctor-maven-plugin + false + + + com.agilejava.docbkx + docbkx-maven-plugin + + + org.apache.maven.plugins + maven-antrun-plugin + false + + + org.codehaus.mojo + build-helper-maven-plugin + false + + + - + From b96d49e765ef9c3e6d0f2e3226ea865b147536f7 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 22 Nov 2017 17:10:20 -0500 Subject: [PATCH 11/12] Update to 1.4.0.RELEASE with Edgware.RELEASE --- README.adoc | 2 +- docs/pom.xml | 2 +- docs/src/main/asciidoc/install.adoc | 2 +- pom.xml | 6 +++--- spring-cloud-cli-integration-tests/pom.xml | 8 +++++++- spring-cloud-cli/pom.xml | 4 ++-- .../cli/compiler/SpringCloudBomAstTransformation.java | 2 +- spring-cloud-launcher/pom.xml | 4 ++-- spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml | 2 +- .../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-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-zipkin/pom.xml | 2 +- 20 files changed, 30 insertions(+), 24 deletions(-) diff --git a/README.adoc b/README.adoc index 3a1c45b..619b322 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.BUILD-SNAPSHOT +$ spring install org.springframework.cloud:spring-cloud-cli:1.4.0.RELEASE ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features diff --git a/docs/pom.xml b/docs/pom.xml index 723c5c8..50b0f34 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.4.0.BUILD-SNAPSHOT + 1.4.0.RELEASE pom Spring Cloud Cli Docs diff --git a/docs/src/main/asciidoc/install.adoc b/docs/src/main/asciidoc/install.adoc index 6b93ed8..944720c 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.BUILD-SNAPSHOT +$ spring install org.springframework.cloud:spring-cloud-cli:1.4.0.RELEASE ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features diff --git a/pom.xml b/pom.xml index 699c55e..cd47c1f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,11 @@ 4.0.0 org.springframework.cloud spring-cloud-cli-parent - 1.4.0.BUILD-SNAPSHOT + 1.4.0.RELEASE org.springframework.cloud spring-cloud-build - 1.3.5.BUILD-SNAPSHOT + 1.3.6.RELEASE pom @@ -104,7 +104,7 @@ org.springframework.cloud spring-cloud-dependencies - Edgware.BUILD-SNAPSHOT + Edgware.RELEASE pom import diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index d6b2d35..795286a 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.BUILD-SNAPSHOT + 1.4.0.RELEASE @@ -67,6 +67,12 @@ true + + maven-gpg-plugin + + true + + diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml index 4430798..e4cd88d 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.BUILD-SNAPSHOT + 1.4.0.RELEASE jar spring-cloud-cli @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.4.0.BUILD-SNAPSHOT + 1.4.0.RELEASE 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 cc187ae..8182207 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.BUILD-SNAPSHOT"; + private static final String SPRING_CLOUD_VERSION = "Edgware.RELEASE"; @Override protected String getBomModule() { diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml index bbba8b2..1c9320e 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.BUILD-SNAPSHOT + 1.4.0.RELEASE pom spring-cloud-launcher @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.4.0.BUILD-SNAPSHOT + 1.4.0.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml index 26d5b60..f43c396 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.BUILD-SNAPSHOT + 1.4.0.RELEASE 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 ea25162..3b527a4 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.BUILD-SNAPSHOT"; + private static final String DEFAULT_VERSION = "1.4.0.RELEASE"; 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 28a0c2b..ec5e63c 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.BUILD-SNAPSHOT + 1.4.0.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml index 8a751e4..f1df7d1 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.BUILD-SNAPSHOT + 1.4.0.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml index 2bc1096..387000f 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.BUILD-SNAPSHOT + 1.4.0.RELEASE 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 973e75a..36a252d 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.BUILD-SNAPSHOT"; + private static final String DEFAULT_VERSION = "1.4.0.RELEASE"; 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 a44b0c2..f7883a3 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.BUILD-SNAPSHOT + 1.4.0.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml index 5bfc0d6..997f658 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.BUILD-SNAPSHOT + 1.4.0.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/pom.xml index 7ae93f0..56dc0fe 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.BUILD-SNAPSHOT + 1.4.0.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml index 22f1c13..8e38a01 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.BUILD-SNAPSHOT + 1.4.0.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml index 017d5c0..325ade2 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.BUILD-SNAPSHOT + 1.4.0.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-zipkin/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-zipkin/pom.xml index 190a9b2..316b260 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.BUILD-SNAPSHOT + 1.4.0.RELEASE From bb95cb50bdbbcbf63c414541b4d2524e5e331d1b Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 22 Nov 2017 17:33:33 -0500 Subject: [PATCH 12/12] Update to snapshots --- README.adoc | 2 +- docs/pom.xml | 4 ++-- docs/src/main/asciidoc/install.adoc | 8 ++++---- pom.xml | 6 +++--- spring-cloud-cli-integration-tests/pom.xml | 2 +- spring-cloud-cli/pom.xml | 4 ++-- .../cli/compiler/SpringCloudBomAstTransformation.java | 2 +- spring-cloud-launcher/pom.xml | 4 ++-- spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml | 2 +- .../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-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-zipkin/pom.xml | 2 +- 20 files changed, 28 insertions(+), 28 deletions(-) diff --git a/README.adoc b/README.adoc index 619b322..4f72ee6 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.RELEASE +$ spring install org.springframework.cloud:spring-cloud-cli:1.4.1.BUILD-SNAPSHOT ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features diff --git a/docs/pom.xml b/docs/pom.xml index 50b0f34..77cc82b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.4.0.RELEASE + 1.4.1.BUILD-SNAPSHOT pom Spring Cloud Cli Docs @@ -15,7 +15,7 @@ spring-cloud-cli ${basedir}/.. - 1.0.x + 1.0.x,1.1.x,1.2.x,1.3.x diff --git a/docs/src/main/asciidoc/install.adoc b/docs/src/main/asciidoc/install.adoc index 944720c..856f207 100644 --- a/docs/src/main/asciidoc/install.adoc +++ b/docs/src/main/asciidoc/install.adoc @@ -4,20 +4,20 @@ https://github.com/spring-projects/spring-boot[Spring Boot CLI] (1.5.2 or better): $ spring version - Spring CLI v1.5.4.RELEASE + Spring CLI v1.5.8.RELEASE E.g. for SDKMan users ``` -$ sdk install springboot 1.5.4.RELEASE -$ sdk use springboot 1.5.4.RELEASE +$ sdk install springboot 1.5.8.RELEASE +$ sdk use springboot 1.5.8.RELEASE ``` and install the Spring Cloud plugin ``` $ mvn install -$ spring install org.springframework.cloud:spring-cloud-cli:1.4.0.RELEASE +$ spring install org.springframework.cloud:spring-cloud-cli:1.4.1.BUILD-SNAPSHOT ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features diff --git a/pom.xml b/pom.xml index cd47c1f..5eee7cb 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.cloud spring-cloud-cli-parent - 1.4.0.RELEASE + 1.4.1.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-build @@ -24,7 +24,7 @@ cli spring-cloud-cli ${basedir}/.. - 1.5.7.RELEASE + 1.5.8.RELEASE spring-cloud-launcher @@ -104,7 +104,7 @@ org.springframework.cloud spring-cloud-dependencies - Edgware.RELEASE + Edgware.BUILD-SNAPSHOT pom import diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index 795286a..4893549 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.RELEASE + 1.4.1.BUILD-SNAPSHOT diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml index e4cd88d..5c4f07a 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.RELEASE + 1.4.1.BUILD-SNAPSHOT jar spring-cloud-cli @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.4.0.RELEASE + 1.4.1.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 8182207..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.RELEASE"; + 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 1c9320e..050b98a 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.RELEASE + 1.4.1.BUILD-SNAPSHOT pom spring-cloud-launcher @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.4.0.RELEASE + 1.4.1.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 f43c396..4cd6e07 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.RELEASE + 1.4.1.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 3b527a4..56f30f7 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.RELEASE"; + private static final String DEFAULT_VERSION = "1.4.1.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 ec5e63c..eb27b93 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.RELEASE + 1.4.1.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 f1df7d1..916d135 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.RELEASE + 1.4.1.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 387000f..f30499e 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.RELEASE + 1.4.1.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 36a252d..d460bee 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.RELEASE"; + private static final String DEFAULT_VERSION = "1.4.1.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 f7883a3..9104f8c 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.RELEASE + 1.4.1.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 997f658..d4bd6b6 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.RELEASE + 1.4.1.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 56dc0fe..41015e4 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.RELEASE + 1.4.1.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 8e38a01..67e7b6e 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.RELEASE + 1.4.1.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 325ade2..dbf6179 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.RELEASE + 1.4.1.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 316b260..4a51a3e 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.RELEASE + 1.4.1.BUILD-SNAPSHOT