From 4724e60b9d5a61c7f4a92322aa6c899216df21b1 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 29 May 2020 12:27:04 -0400 Subject: [PATCH 01/14] Ignores .sdkmanrc --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0dc6b9c..99b7964 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ target/ .factorypath *.versionsBackup .flattened-pom.xml +.sdkmanrc From f51073beb088eedca77f224b535923f30edb930e Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 3 Aug 2020 15:47:22 -0400 Subject: [PATCH 02/14] Update SNAPSHOT to 2.2.2.RELEASE --- README.adoc | 13 +++++++++---- docs/pom.xml | 2 +- docs/src/main/asciidoc/install.adoc | 8 ++++---- pom.xml | 8 ++++---- spring-cloud-cli-integration-tests/pom.xml | 2 +- spring-cloud-cli/pom.xml | 2 +- .../compiler/SpringCloudBomAstTransformation.java | 2 +- spring-cloud-launcher/pom.xml | 4 ++-- .../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 +- .../launcher/deployer/DeployerApplication.java | 2 +- .../spring-cloud-launcher-eureka/pom.xml | 2 +- .../spring-cloud-launcher-h2/pom.xml | 2 +- .../spring-cloud-launcher-hystrixdashboard/pom.xml | 2 +- .../spring-cloud-launcher-kafka/pom.xml | 2 +- .../spring-cloud-launcher-stubrunner/pom.xml | 2 +- 19 files changed, 34 insertions(+), 29 deletions(-) diff --git a/README.adoc b/README.adoc index 0a6d738..701f972 100644 --- a/README.adoc +++ b/README.adoc @@ -25,20 +25,20 @@ https://github.com/spring-projects/spring-boot[Spring Boot CLI] (2.0.0 or better): $ spring version - Spring CLI v2.2.0.BUILD-SNAPSHOT + Spring CLI v2.2.3.RELEASE E.g. for SDKMan users ``` -$ sdk install springboot 2.2.0.BUILD-SNAPSHOT -$ sdk use springboot 2.2.0.BUILD-SNAPSHOT +$ sdk install springboot 2.2.3.RELEASE +$ sdk use springboot 2.2.3.RELEASE ``` and install the Spring Cloud plugin ``` $ mvn install -$ spring install org.springframework.cloud:spring-cloud-cli:2.2.0.BUILD-SNAPSHOT +$ spring install org.springframework.cloud:spring-cloud-cli:2.2.0.RELEASE ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features @@ -111,6 +111,11 @@ https://eclipse.org[Eclipse] when working with the code. We use the https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better. +==== Activate the Spring Maven profile +Spring Cloud projects require the 'spring' Maven profile to be activated to resolve +the spring milestone and snapshot repositories. Use your preferred IDE to set this +profile to be active, or you may experience build errors. + ==== Importing into eclipse with m2eclipse We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with eclipse. If you don't already have m2eclipse installed it is available from the "eclipse diff --git a/docs/pom.xml b/docs/pom.xml index b657b77..a28ced5 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE pom Spring Cloud Cli Docs diff --git a/docs/src/main/asciidoc/install.adoc b/docs/src/main/asciidoc/install.adoc index 7999bb5..b5e4393 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] (2.0.0 or better): $ spring version - Spring CLI v2.2.0.BUILD-SNAPSHOT + Spring CLI v2.2.3.RELEASE E.g. for SDKMan users ``` -$ sdk install springboot 2.2.0.BUILD-SNAPSHOT -$ sdk use springboot 2.2.0.BUILD-SNAPSHOT +$ sdk install springboot 2.2.3.RELEASE +$ sdk use springboot 2.2.3.RELEASE ``` and install the Spring Cloud plugin ``` $ mvn install -$ spring install org.springframework.cloud:spring-cloud-cli:2.2.0.BUILD-SNAPSHOT +$ spring install org.springframework.cloud:spring-cloud-cli:2.2.0.RELEASE ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features diff --git a/pom.xml b/pom.xml index e349244..dd24326 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ 4.0.0 org.springframework.cloud spring-cloud-cli-parent - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE org.springframework.cloud spring-cloud-build - 2.2.2.BUILD-SNAPSHOT + 2.2.3.RELEASE pom @@ -29,8 +29,8 @@ cli spring-cloud-cli ${basedir}/.. - 2.2.2.RELEASE - Hoxton.BUILD-SNAPSHOT + 2.2.3.RELEASE + Hoxton.SR7 spring-cloud-launcher diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index fe2b931..c779dd0 100644 --- a/spring-cloud-cli-integration-tests/pom.xml +++ b/spring-cloud-cli-integration-tests/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml index dc0391e..bd7e8a4 100644 --- a/spring-cloud-cli/pom.xml +++ b/spring-cloud-cli/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.2.BUILD-SNAPSHOT + 2.2.2.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 fc4741a..2186020 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 = "Hoxton.BUILD-SNAPSHOT"; + private static final String SPRING_CLOUD_VERSION = "Hoxton.SR7"; @Override protected String getBomModule() { diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml index be25115..665f148 100644 --- a/spring-cloud-launcher/pom.xml +++ b/spring-cloud-launcher/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE pom spring-cloud-launcher @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml index 4c399f3..1eeabf6 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 - 2.2.2.BUILD-SNAPSHOT + 2.2.2.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 b6a62d5..8514dec 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 = "2.2.0.BUILD-SNAPSHOT"; + private static final String DEFAULT_VERSION = "2.2.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 d53ed1c..1a731fb 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 - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml index ec94414..e9d449c 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 - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml index 49a04de..b33baab 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.2.BUILD-SNAPSHOT + 2.2.2.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 204947b..c6ec793 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 @@ -42,7 +42,7 @@ public class DeployerApplication { private static final Logger logger = LoggerFactory .getLogger(DeployerApplication.class); - private static final String DEFAULT_VERSION = "2.2.0.BUILD-SNAPSHOT"; + private static final String DEFAULT_VERSION = "2.2.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 62e4452..2ee291e 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml index 6e344bc..05dda3f 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/pom.xml index 78e4934..b859cab 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 - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml index 9ff88a7..2f71a14 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 - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml index 12f5ce5..42ccda6 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 - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE From 67d2608e105ffe418bd189f0098a3e13d97593a6 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 3 Aug 2020 15:55:06 -0400 Subject: [PATCH 03/14] Update spring-cloud-build to 2.3.1.RELEASE --- README.adoc | 3 ++- pom.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 701f972..28b24f1 100644 --- a/README.adoc +++ b/README.adoc @@ -4,6 +4,7 @@ Manual changes to this file will be lost when it is generated again. Edit the files in the src/main/asciidoc/ directory instead. //// + 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 https://projects.spring.io/spring-boot[Spring @@ -323,4 +324,4 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t - `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL. - `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`. -IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources. \ No newline at end of file +IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources. diff --git a/pom.xml b/pom.xml index dd24326..49de0f2 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-build - 2.2.3.RELEASE + 2.3.1.RELEASE pom From 09c87e1cfb1a282aaa81c5a8a350878ff7197d6b Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 3 Aug 2020 16:02:21 -0400 Subject: [PATCH 04/14] Update docs to updload zip --- docs/pom.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index a28ced5..7404e9e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -15,24 +15,21 @@ spring-cloud-cli ${basedir}/.. - 1.4.x,2.0.x,2.1.x + deploy - - - - - maven-deploy-plugin - - true - - - - docs + + pl.project13.maven + git-commit-id-plugin + + + org.codehaus.mojo + exec-maven-plugin + org.apache.maven.plugins maven-dependency-plugin @@ -49,6 +46,9 @@ org.apache.maven.plugins maven-antrun-plugin + + maven-deploy-plugin + From 0ecf37739c022efda35475ada081e518a3ca139d Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 3 Aug 2020 17:18:28 -0400 Subject: [PATCH 05/14] Updates to snapshot after release. --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-cli-integration-tests/pom.xml | 2 +- spring-cloud-cli/pom.xml | 2 +- spring-cloud-launcher/pom.xml | 4 ++-- spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml | 2 +- .../spring-cloud-launcher-configserver/pom.xml | 2 +- .../spring-cloud-launcher-dataflow/pom.xml | 2 +- .../spring-cloud-launcher-deployer/pom.xml | 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 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 7404e9e..87e710f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.2.RELEASE + 2.2.3.BUILD-SNAPSHOT pom Spring Cloud Cli Docs diff --git a/pom.xml b/pom.xml index 49de0f2..ddaa575 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ 4.0.0 org.springframework.cloud spring-cloud-cli-parent - 2.2.2.RELEASE + 2.2.3.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-build - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT pom @@ -29,8 +29,8 @@ cli spring-cloud-cli ${basedir}/.. - 2.2.3.RELEASE - Hoxton.SR7 + 2.2.9.RELEASE + Hoxton.BUILD-SNAPSHOT spring-cloud-launcher diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index c779dd0..ad57dd6 100644 --- a/spring-cloud-cli-integration-tests/pom.xml +++ b/spring-cloud-cli-integration-tests/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.2.RELEASE + 2.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml index bd7e8a4..c7b2b21 100644 --- a/spring-cloud-cli/pom.xml +++ b/spring-cloud-cli/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.2.RELEASE + 2.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml index 665f148..b8ab93f 100644 --- a/spring-cloud-launcher/pom.xml +++ b/spring-cloud-launcher/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.2.RELEASE + 2.2.3.BUILD-SNAPSHOT pom spring-cloud-launcher @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.2.RELEASE + 2.2.3.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 1eeabf6..83fb40d 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 - 2.2.2.RELEASE + 2.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml index 1a731fb..3e8a0ce 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 - 2.2.2.RELEASE + 2.2.3.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 e9d449c..61eda3b 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 - 2.2.2.RELEASE + 2.2.3.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 b33baab..1533b72 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.2.RELEASE + 2.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml index 2ee291e..8bde57d 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.2.RELEASE + 2.2.3.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 05dda3f..05802c4 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.2.RELEASE + 2.2.3.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 b859cab..defa014 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 - 2.2.2.RELEASE + 2.2.3.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 2f71a14..ac2a39d 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 - 2.2.2.RELEASE + 2.2.3.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 42ccda6..ff14f01 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 - 2.2.2.RELEASE + 2.2.3.BUILD-SNAPSHOT From 5426b8f080b8c9d685b7b605704eab59e0d0aeb3 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 9 Nov 2020 14:34:00 +0100 Subject: [PATCH 06/14] Aligned maven versions --- pom.xml | 4 ++-- spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index ddaa575..d1713a9 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ cli spring-cloud-cli ${basedir}/.. - 2.2.9.RELEASE + 2.2.9.RELEASE Hoxton.BUILD-SNAPSHOT @@ -111,7 +111,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot.version} + ${spring-boot-do-not-replace-with-releaser.version} pom import diff --git a/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml index 83fb40d..1d631d8 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml @@ -17,7 +17,7 @@ - 3.5.4 + 3.6.3 @@ -40,7 +40,8 @@ org.codehaus.plexus plexus-utils - 3.1.0 + + 3.2.1 commons-logging From 58592c80ea69ffd8930a8e0a8b7217fc7a9d2a16 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 9 Nov 2020 14:39:05 +0100 Subject: [PATCH 07/14] Fixing the OutputCapture issue --- .../cloud/cli/command/url/OutputCapture.java | 127 ++++++++++++++++++ .../cli/command/url/UrlDecodeCommandTest.java | 1 - .../cli/command/url/UrlEncodeCommandTest.java | 1 - 3 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 spring-cloud-cli/src/test/java/org/springframework/cloud/cli/command/url/OutputCapture.java diff --git a/spring-cloud-cli/src/test/java/org/springframework/cloud/cli/command/url/OutputCapture.java b/spring-cloud-cli/src/test/java/org/springframework/cloud/cli/command/url/OutputCapture.java new file mode 100644 index 0000000..fcb141e --- /dev/null +++ b/spring-cloud-cli/src/test/java/org/springframework/cloud/cli/command/url/OutputCapture.java @@ -0,0 +1,127 @@ +/* + * Copyright 2012-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 + * + * https://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.command.url; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintStream; + +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; + +/** + * Capture output from System.out and System.err. + * + * @author Phillip Webb + */ +public class OutputCapture implements TestRule { + + private CaptureOutputStream captureOut; + + private CaptureOutputStream captureErr; + + private ByteArrayOutputStream copy; + + @Override + public Statement apply(final Statement base, Description description) { + return new Statement() { + @Override + public void evaluate() throws Throwable { + captureOutput(); + try { + base.evaluate(); + } + finally { + releaseOutput(); + } + } + }; + } + + protected void captureOutput() { + this.copy = new ByteArrayOutputStream(); + this.captureOut = new CaptureOutputStream(System.out, this.copy); + this.captureErr = new CaptureOutputStream(System.err, this.copy); + System.setOut(new PrintStream(this.captureOut)); + System.setErr(new PrintStream(this.captureErr)); + } + + protected void releaseOutput() { + System.setOut(this.captureOut.getOriginal()); + System.setErr(this.captureErr.getOriginal()); + this.copy = null; + } + + public void flush() { + try { + this.captureOut.flush(); + this.captureErr.flush(); + } + catch (IOException ex) { + // ignore + } + } + + @Override + public String toString() { + flush(); + return this.copy.toString(); + } + + private static class CaptureOutputStream extends OutputStream { + + private final PrintStream original; + + private final OutputStream copy; + + CaptureOutputStream(PrintStream original, OutputStream copy) { + this.original = original; + this.copy = copy; + } + + @Override + public void write(int b) throws IOException { + this.copy.write(b); + this.original.write(b); + this.original.flush(); + } + + @Override + public void write(byte[] b) throws IOException { + write(b, 0, b.length); + } + + @Override + public void write(byte[] b, int off, int len) throws IOException { + this.copy.write(b, off, len); + this.original.write(b, off, len); + } + + public PrintStream getOriginal() { + return this.original; + } + + @Override + public void flush() throws IOException { + this.copy.flush(); + this.original.flush(); + } + } + +} diff --git a/spring-cloud-cli/src/test/java/org/springframework/cloud/cli/command/url/UrlDecodeCommandTest.java b/spring-cloud-cli/src/test/java/org/springframework/cloud/cli/command/url/UrlDecodeCommandTest.java index a65f3a8..cc970ed 100644 --- a/spring-cloud-cli/src/test/java/org/springframework/cloud/cli/command/url/UrlDecodeCommandTest.java +++ b/spring-cloud-cli/src/test/java/org/springframework/cloud/cli/command/url/UrlDecodeCommandTest.java @@ -19,7 +19,6 @@ import org.junit.Rule; import org.junit.Test; import org.springframework.boot.cli.command.Command; import org.springframework.boot.cli.command.status.ExitStatus; -import org.springframework.boot.test.rule.OutputCapture; import static org.junit.Assert.*; diff --git a/spring-cloud-cli/src/test/java/org/springframework/cloud/cli/command/url/UrlEncodeCommandTest.java b/spring-cloud-cli/src/test/java/org/springframework/cloud/cli/command/url/UrlEncodeCommandTest.java index b866797..8a59ce6 100644 --- a/spring-cloud-cli/src/test/java/org/springframework/cloud/cli/command/url/UrlEncodeCommandTest.java +++ b/spring-cloud-cli/src/test/java/org/springframework/cloud/cli/command/url/UrlEncodeCommandTest.java @@ -19,7 +19,6 @@ import org.junit.Rule; import org.junit.Test; import org.springframework.boot.cli.command.Command; import org.springframework.boot.cli.command.status.ExitStatus; -import org.springframework.boot.test.rule.OutputCapture; import static org.junit.Assert.*; From 7131641ede06532d11484fbe5a1d5c678abfb3ac Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 9 Nov 2020 14:47:40 +0100 Subject: [PATCH 08/14] Aligned maven versions --- spring-cloud-cli-integration-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index ad57dd6..cf08ac2 100644 --- a/spring-cloud-cli-integration-tests/pom.xml +++ b/spring-cloud-cli-integration-tests/pom.xml @@ -56,7 +56,7 @@ UTF-8 1.8 1.8 - 3.5.4 + 3.6.3 From 06d383e5b667c0a1e0d24800a87b1c6a58d42226 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Nov 2020 13:51:31 +0000 Subject: [PATCH 09/14] Update SNAPSHOT to 2.2.3.RELEASE --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-cli-integration-tests/pom.xml | 2 +- spring-cloud-cli/pom.xml | 2 +- spring-cloud-launcher/pom.xml | 4 ++-- spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml | 2 +- .../spring-cloud-launcher-configserver/pom.xml | 2 +- .../spring-cloud-launcher-dataflow/pom.xml | 2 +- .../spring-cloud-launcher-deployer/pom.xml | 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 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 87e710f..db542cf 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.3.BUILD-SNAPSHOT + 2.2.3.RELEASE pom Spring Cloud Cli Docs diff --git a/pom.xml b/pom.xml index d1713a9..0ab8b9f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ 4.0.0 org.springframework.cloud spring-cloud-cli-parent - 2.2.3.BUILD-SNAPSHOT + 2.2.3.RELEASE org.springframework.cloud spring-cloud-build - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE pom @@ -30,7 +30,7 @@ spring-cloud-cli ${basedir}/.. 2.2.9.RELEASE - Hoxton.BUILD-SNAPSHOT + Hoxton.SR9 spring-cloud-launcher diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index cf08ac2..fae9eef 100644 --- a/spring-cloud-cli-integration-tests/pom.xml +++ b/spring-cloud-cli-integration-tests/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.3.BUILD-SNAPSHOT + 2.2.3.RELEASE diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml index c7b2b21..22d72e9 100644 --- a/spring-cloud-cli/pom.xml +++ b/spring-cloud-cli/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.3.BUILD-SNAPSHOT + 2.2.3.RELEASE diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml index b8ab93f..4c89e5e 100644 --- a/spring-cloud-launcher/pom.xml +++ b/spring-cloud-launcher/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.3.BUILD-SNAPSHOT + 2.2.3.RELEASE pom spring-cloud-launcher @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.3.BUILD-SNAPSHOT + 2.2.3.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml index 1d631d8..477efa6 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 - 2.2.3.BUILD-SNAPSHOT + 2.2.3.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml index 3e8a0ce..e71536c 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 - 2.2.3.BUILD-SNAPSHOT + 2.2.3.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml index 61eda3b..5662281 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 - 2.2.3.BUILD-SNAPSHOT + 2.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 1533b72..a0f23d1 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.3.BUILD-SNAPSHOT + 2.2.3.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml index 8bde57d..d1bd991 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.3.BUILD-SNAPSHOT + 2.2.3.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml index 05802c4..302dbaf 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.3.BUILD-SNAPSHOT + 2.2.3.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/pom.xml index defa014..c335f9f 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 - 2.2.3.BUILD-SNAPSHOT + 2.2.3.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml index ac2a39d..92e18fe 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 - 2.2.3.BUILD-SNAPSHOT + 2.2.3.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml index ff14f01..0050c50 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 - 2.2.3.BUILD-SNAPSHOT + 2.2.3.RELEASE From 3710abd318fae696e7c0be45a2c7d21dea26d0db Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Nov 2020 13:53:25 +0000 Subject: [PATCH 10/14] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-cli-integration-tests/pom.xml | 2 +- spring-cloud-cli/pom.xml | 2 +- spring-cloud-launcher/pom.xml | 4 ++-- spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml | 2 +- .../spring-cloud-launcher-configserver/pom.xml | 2 +- .../spring-cloud-launcher-dataflow/pom.xml | 2 +- .../spring-cloud-launcher-deployer/pom.xml | 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 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index db542cf..87e710f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT pom Spring Cloud Cli Docs diff --git a/pom.xml b/pom.xml index 0ab8b9f..d1713a9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ 4.0.0 org.springframework.cloud spring-cloud-cli-parent - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-build - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT pom @@ -30,7 +30,7 @@ spring-cloud-cli ${basedir}/.. 2.2.9.RELEASE - Hoxton.SR9 + Hoxton.BUILD-SNAPSHOT spring-cloud-launcher diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index fae9eef..cf08ac2 100644 --- a/spring-cloud-cli-integration-tests/pom.xml +++ b/spring-cloud-cli-integration-tests/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml index 22d72e9..c7b2b21 100644 --- a/spring-cloud-cli/pom.xml +++ b/spring-cloud-cli/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml index 4c89e5e..b8ab93f 100644 --- a/spring-cloud-launcher/pom.xml +++ b/spring-cloud-launcher/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT pom spring-cloud-launcher @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.3.RELEASE + 2.2.3.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 477efa6..1d631d8 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 - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml index e71536c..3e8a0ce 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 - 2.2.3.RELEASE + 2.2.3.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 5662281..61eda3b 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 - 2.2.3.RELEASE + 2.2.3.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 a0f23d1..1533b72 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml index d1bd991..8bde57d 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.3.RELEASE + 2.2.3.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 302dbaf..05802c4 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.3.RELEASE + 2.2.3.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 c335f9f..defa014 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 - 2.2.3.RELEASE + 2.2.3.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 92e18fe..ac2a39d 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 - 2.2.3.RELEASE + 2.2.3.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 0050c50..ff14f01 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 - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT From f922e552fba262a54a3a80eacc5afcc3550026c2 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Nov 2020 13:53:26 +0000 Subject: [PATCH 11/14] Bumping versions to 2.2.4.SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-cli-integration-tests/pom.xml | 2 +- spring-cloud-cli/pom.xml | 2 +- spring-cloud-launcher/pom.xml | 4 ++-- spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml | 2 +- .../spring-cloud-launcher-configserver/pom.xml | 2 +- .../spring-cloud-launcher-dataflow/pom.xml | 2 +- .../spring-cloud-launcher-deployer/pom.xml | 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 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 87e710f..1d8f95f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.3.BUILD-SNAPSHOT + 2.2.4.SNAPSHOT pom Spring Cloud Cli Docs diff --git a/pom.xml b/pom.xml index d1713a9..e724bd7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ 4.0.0 org.springframework.cloud spring-cloud-cli-parent - 2.2.3.BUILD-SNAPSHOT + 2.2.4.SNAPSHOT org.springframework.cloud spring-cloud-build - 2.3.2.BUILD-SNAPSHOT + 2.3.2.SNAPSHOT pom @@ -30,7 +30,7 @@ spring-cloud-cli ${basedir}/.. 2.2.9.RELEASE - Hoxton.BUILD-SNAPSHOT + Hoxton.SNAPSHOT spring-cloud-launcher diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index cf08ac2..c9276bb 100644 --- a/spring-cloud-cli-integration-tests/pom.xml +++ b/spring-cloud-cli-integration-tests/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.3.BUILD-SNAPSHOT + 2.2.4.SNAPSHOT diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml index c7b2b21..5d74596 100644 --- a/spring-cloud-cli/pom.xml +++ b/spring-cloud-cli/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.3.BUILD-SNAPSHOT + 2.2.4.SNAPSHOT diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml index b8ab93f..73c2e92 100644 --- a/spring-cloud-launcher/pom.xml +++ b/spring-cloud-launcher/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.3.BUILD-SNAPSHOT + 2.2.4.SNAPSHOT pom spring-cloud-launcher @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.3.BUILD-SNAPSHOT + 2.2.4.SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml index 1d631d8..648f505 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 - 2.2.3.BUILD-SNAPSHOT + 2.2.4.SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml index 3e8a0ce..b8755ed 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 - 2.2.3.BUILD-SNAPSHOT + 2.2.4.SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml index 61eda3b..0d1ffad 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 - 2.2.3.BUILD-SNAPSHOT + 2.2.4.SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml index 1533b72..ffada3f 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.3.BUILD-SNAPSHOT + 2.2.4.SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml index 8bde57d..d80e860 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.3.BUILD-SNAPSHOT + 2.2.4.SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml index 05802c4..fdec3a8 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.3.BUILD-SNAPSHOT + 2.2.4.SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/pom.xml index defa014..d9f7da0 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 - 2.2.3.BUILD-SNAPSHOT + 2.2.4.SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml index ac2a39d..877e2f8 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 - 2.2.3.BUILD-SNAPSHOT + 2.2.4.SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-stubrunner/pom.xml index ff14f01..21384bc 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 - 2.2.3.BUILD-SNAPSHOT + 2.2.4.SNAPSHOT From 5fe10b791001fb44d777eed892aec649bece6c7c Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 16 Nov 2020 13:59:28 +0100 Subject: [PATCH 12/14] Fixed wrong sc-build version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e724bd7..b32a817 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-build - 2.3.2.SNAPSHOT + 2.3.2.BUILD-SNAPSHOT pom From 7c1d3e1433c9938d8e498143709d762489c37874 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 16 Nov 2020 14:00:49 +0100 Subject: [PATCH 13/14] Fixed wrong versions after the release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-cli-integration-tests/pom.xml | 2 +- spring-cloud-cli/pom.xml | 2 +- spring-cloud-launcher/pom.xml | 4 ++-- spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml | 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 +- 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 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 1d8f95f..34a4319 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.4.SNAPSHOT + 2.2.4.BUILD-SNAPSHOT pom Spring Cloud Cli Docs diff --git a/pom.xml b/pom.xml index b32a817..51c36b8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-cli-parent - 2.2.4.SNAPSHOT + 2.2.4.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-build @@ -30,7 +30,7 @@ spring-cloud-cli ${basedir}/.. 2.2.9.RELEASE - Hoxton.SNAPSHOT + Hoxton.BUILD-SNAPSHOT spring-cloud-launcher diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index c9276bb..06d1fa9 100644 --- a/spring-cloud-cli-integration-tests/pom.xml +++ b/spring-cloud-cli-integration-tests/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.4.SNAPSHOT + 2.2.4.BUILD-SNAPSHOT diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml index 5d74596..3be39f0 100644 --- a/spring-cloud-cli/pom.xml +++ b/spring-cloud-cli/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.4.SNAPSHOT + 2.2.4.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml index 73c2e92..5957ca6 100644 --- a/spring-cloud-launcher/pom.xml +++ b/spring-cloud-launcher/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.4.SNAPSHOT + 2.2.4.BUILD-SNAPSHOT pom spring-cloud-launcher @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 2.2.4.SNAPSHOT + 2.2.4.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 648f505..664a07b 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 - 2.2.4.SNAPSHOT + 2.2.4.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml index b8755ed..1dc53a2 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 - 2.2.4.SNAPSHOT + 2.2.4.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 0d1ffad..fe3ac3e 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 - 2.2.4.SNAPSHOT + 2.2.4.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 ffada3f..81f1bf2 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.4.SNAPSHOT + 2.2.4.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml index d80e860..ed90560 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.4.SNAPSHOT + 2.2.4.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 fdec3a8..f4b53df 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-launcher - 2.2.4.SNAPSHOT + 2.2.4.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 d9f7da0..4f19da0 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 - 2.2.4.SNAPSHOT + 2.2.4.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 877e2f8..6c864c1 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 - 2.2.4.SNAPSHOT + 2.2.4.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 21384bc..3771143 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 - 2.2.4.SNAPSHOT + 2.2.4.BUILD-SNAPSHOT From de714224a910513027bfd78b1db5e73394417258 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 8 Feb 2021 13:26:25 -0500 Subject: [PATCH 14/14] Replace static version field with ClassPathResource. Previously, the default version was loaded from a java constant. This version used to be updated by hand after the release train was published to maven central, then built and deployed by hand. Spring-Cloud-Cli is now built and deployed automatically, but the default version hasn't been updated. The default version was only used if the version couldn't be read from the manifest (which should be the version used during release. The constant was replaced with the contents of a file that is updated at build time. This process works for development and release without any manual intervention. Fixes gh-174 --- .../spring-cloud-launcher-deployer/pom.xml | 6 +++++ .../deployer/DeployerApplication.java | 23 +++++++++++++++---- .../main/resources/META-INF/cli-version.txt | 1 + .../deployer/DeployerApplicationTests.java | 22 +++++++++++------- 4 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/META-INF/cli-version.txt diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml index 81f1bf2..2036806 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml @@ -87,6 +87,12 @@ + + + src/main/resources + true + + org.springframework.boot 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 c6ec793..2c776f1 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 @@ -16,6 +16,9 @@ package org.springframework.cloud.launcher.deployer; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -31,7 +34,10 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.logging.LogLevel; import org.springframework.boot.logging.logback.LogbackLoggingSystem; import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.core.io.ClassPathResource; import org.springframework.util.ClassUtils; +import org.springframework.util.ReflectionUtils; +import org.springframework.util.StreamUtils; import org.springframework.util.StringUtils; /** @@ -42,8 +48,6 @@ public class DeployerApplication { private static final Logger logger = LoggerFactory .getLogger(DeployerApplication.class); - private static final String DEFAULT_VERSION = "2.2.0.RELEASE"; - private String[] args; public DeployerApplication(String... args) { @@ -103,8 +107,19 @@ public class DeployerApplication { String getVersion() { Package pkg = DeployerApplication.class.getPackage(); - return (pkg != null ? pkg.getImplementationVersion() == null ? DEFAULT_VERSION - : pkg.getImplementationVersion() : DEFAULT_VERSION); + return (pkg != null ? pkg.getImplementationVersion() == null ? getDefaultVersion() + : pkg.getImplementationVersion() : getDefaultVersion()); + } + + String getDefaultVersion() { + try (InputStream in = new ClassPathResource("META-INF/cli-version.txt").getInputStream()) { + return StreamUtils.copyToString(in, StandardCharsets.UTF_8); + } + catch (IOException e) { + ReflectionUtils.rethrowRuntimeException(e); + } + // not reachable since exception rethrown at runtime + return null; } private void launch() { diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/META-INF/cli-version.txt b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/META-INF/cli-version.txt new file mode 100644 index 0000000..73f30eb --- /dev/null +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/META-INF/cli-version.txt @@ -0,0 +1 @@ +@project.version@ diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/test/java/org/springframework/cloud/launcher/deployer/DeployerApplicationTests.java b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/test/java/org/springframework/cloud/launcher/deployer/DeployerApplicationTests.java index 76928ec..f3a350e 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/test/java/org/springframework/cloud/launcher/deployer/DeployerApplicationTests.java +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/test/java/org/springframework/cloud/launcher/deployer/DeployerApplicationTests.java @@ -20,8 +20,7 @@ import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; -import static org.hamcrest.CoreMatchers.containsString; -import static org.junit.Assert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Spencer Gibb @@ -36,28 +35,35 @@ public class DeployerApplicationTests { public void testDefaultLibrary() throws Exception { DeployerApplication wrapper = new DeployerApplication(); if (System.getProperty("project.version") != null) { - assertThat(wrapper.getVersion(), - containsString(System.getProperty("project.version"))); + assertThat(wrapper.getVersion()) + .contains(System.getProperty("project.version")); } } @Test public void testCreateClassLoaderAndListDeployables() throws Exception { new DeployerApplication("--launcher.list=true").run(); - assertThat(output.toString(), containsString("configserver")); + assertThat(output.toString()).contains("configserver"); } @Test public void testNonOptionArgsPassedDown() throws Exception { new DeployerApplication("--launcher.list=true", "--spring.profiles.active=test") .run(); - assertThat(output.toString(), containsString("foo")); + assertThat(output.toString()).contains("foo"); } @Test public void testInvalidDeployableFails() throws Exception { new DeployerApplication("--launcher.deploy=foo,bar").run(); - assertThat(output.toString(), - containsString("The following are not valid: 'foo,bar'")); + assertThat(output.toString()) + .contains("The following are not valid: 'foo,bar'"); + } + + @Test + public void defaultVersionReadFromFile() { + String defaultVersion = new DeployerApplication("--launcher.deploy=foo,bar").getDefaultVersion(); + // starts with one or more digits then a . + assertThat(defaultVersion).isNotBlank().containsPattern("^\\d+\\..*"); } }