diff --git a/README.adoc b/README.adoc index c6d0e35..d4197c3 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.2.1.RELEASE +$ spring install org.springframework.cloud:spring-cloud-cli:1.2.3.BUILD-SNAPSHOT ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features @@ -179,4 +179,4 @@ added after the original pull request but before a merge. other target branch in the main project). * When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit - message (where XXXX is the issue number). \ No newline at end of file + message (where XXXX is the issue number). diff --git a/docs/README.adoc b/docs/README.adoc deleted file mode 100644 index 3259601..0000000 --- a/docs/README.adoc +++ /dev/null @@ -1,41 +0,0 @@ -// Do not edit this file (e.g. go instead to src/main/asciidoc) - -Spring Boot command line features for -https://github.com/spring-cloud[Spring Cloud]. - - -== Installation - -To install, make -sure you have -https://github.com/spring-projects/spring-boot[Spring Boot CLI] -(1.1.x with x>=5): - - $ spring version - Spring CLI v1.3.3.RELEASE - -E.g. for GVM users - -``` -$ gvm install springboot 1.3.3.RELEASE -$ gvm use springboot 1.3.3.RELEASE -``` - -then get the install command plugin (backported from Boot 1.2.0): - -``` -$ wget http://dl.bintray.com/dsyer/generic/install-0.0.1.jar -``` - -install it in the Spring Boot CLI, e.g. with GVM (MacOS users that rely on brew might have to find the `/lib` directory by scanning `brew info springboot`): - -``` -$ cp install-0.0.1.jar ~/.gvm/springboot/1.3.3.RELEASE/lib -``` - -and finally install the Spring Cloud plugin: - -``` -$ mvn install -$ spring install org.springframework.cloud:spring-cloud-cli:1.1.0.RC1 -``` diff --git a/docs/pom.xml b/docs/pom.xml index ecd8651..82aa829 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.2.2.RELEASE + 1.2.3.BUILD-SNAPSHOT pom Spring Cloud Cli Docs diff --git a/docs/src/main/asciidoc/install.adoc b/docs/src/main/asciidoc/install.adoc index 9759395..536981d 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.2.1.RELEASE +$ spring install org.springframework.cloud:spring-cloud-cli:1.2.3.BUILD-SNAPSHOT ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features diff --git a/pom.xml b/pom.xml index 135589c..c9ed3c2 100644 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,11 @@ 4.0.0 org.springframework.cloud spring-cloud-cli-parent - 1.2.2.RELEASE + 1.2.3.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-build - 1.2.1.RELEASE + 1.2.2.BUILD-SNAPSHOT pom @@ -24,7 +24,7 @@ cli spring-cloud-cli ${basedir}/.. - 1.4.1.RELEASE + 1.4.2.BUILD-SNAPSHOT spring-cloud-launcher @@ -111,7 +111,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR2 + Camden.BUILD-SNAPSHOT pom import diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index f70e492..5269bd6 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.2.2.RELEASE + 1.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml index 070fd97..3a5dd79 100644 --- a/spring-cloud-cli/pom.xml +++ b/spring-cloud-cli/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cli - 1.2.2.RELEASE + 1.2.3.BUILD-SNAPSHOT jar spring-cloud-cli @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.2.2.RELEASE + 1.2.3.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 5883b31..219c56b 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 = "Camden.SR2"; + private static final String SPRING_CLOUD_VERSION = "Camden.BUILD-SNAPSHOT"; @Override protected String getBomModule() { diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml index 98ae64d..e2116fa 100644 --- a/spring-cloud-launcher/pom.xml +++ b/spring-cloud-launcher/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-launcher - 1.2.2.RELEASE + 1.2.3.BUILD-SNAPSHOT pom spring-cloud-launcher @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.2.2.RELEASE + 1.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 ac526e9..b46f63d 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.2.2.RELEASE + 1.2.3.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 99257e7..e11b1bf 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 @@ -52,7 +52,7 @@ public class LauncherCommand extends OptionParsingCommand { public static final Log log = LogFactory.getLog(LauncherCommand.class); - private static final String DEFAULT_VERSION = "1.2.1.RELEASE"; + private static final String DEFAULT_VERSION = "1.2.3.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 5770e1b..0bb860f 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.2.2.RELEASE + 1.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 a9862bf..e71ce70 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml @@ -13,11 +13,11 @@ org.springframework.cloud spring-cloud-launcher - 1.2.2.RELEASE + 1.2.3.BUILD-SNAPSHOT - 1.0.1.RELEASE + 1.0.2.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 2035137..bad0494 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml @@ -13,11 +13,11 @@ org.springframework.cloud spring-cloud-launcher - 1.2.2.RELEASE + 1.2.3.BUILD-SNAPSHOT - 1.0.3.RELEASE + 1.0.4.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerThread.java b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerThread.java index 1d03267..23fea51 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerThread.java +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerThread.java @@ -39,7 +39,7 @@ public class DeployerThread extends Thread { private static final Logger logger = LoggerFactory.getLogger(DeployerThread.class); - private static final String DEFAULT_VERSION = "1.2.1.RELEASE"; + private static final String DEFAULT_VERSION = "1.2.3.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 7b727e6..1a16a48 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.2.2.RELEASE + 1.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 f4ea881..3801219 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.2.2.RELEASE + 1.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 ce6a995..624ce98 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.2.2.RELEASE + 1.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 8118011..2cf0bc0 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.2.2.RELEASE + 1.2.3.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 dd2ecdf..6f7771e 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.2.2.RELEASE + 1.2.3.BUILD-SNAPSHOT