Update to SNAPSHOT

2016-11-01 16:06:04 -06:00
parent f240db174f
commit c66f05dd3a
20 changed files with 27 additions and 68 deletions
--- 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).
+  message (where XXXX is the issue number).
--- a/docs/README.adoc
+++ b/docs/README.adoc
@@ -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
-```
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-cli-parent</artifactId>
-		<version>1.2.2.RELEASE</version>
+		<version>1.2.3.BUILD-SNAPSHOT</version>
 	</parent>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Cli Docs</name>
--- 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
--- a/pom.xml
+++ b/pom.xml
@@ -3,11 +3,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-cli-parent</artifactId>
-	<version>1.2.2.RELEASE</version>
+	<version>1.2.3.BUILD-SNAPSHOT</version>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>1.2.1.RELEASE</version>
+		<version>1.2.2.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<packaging>pom</packaging>
@@ -24,7 +24,7 @@
        <bintray.package>cli</bintray.package>
        <docs.main>spring-cloud-cli</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
-		<spring-boot.version>1.4.1.RELEASE</spring-boot.version>
+		<spring-boot.version>1.4.2.BUILD-SNAPSHOT</spring-boot.version>
 	</properties>
 	<modules>
 		<module>spring-cloud-launcher</module>
@@ -111,7 +111,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Camden.SR2</version>
+				<version>Camden.BUILD-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
--- a/spring-cloud-cli-integration-tests/pom.xml
+++ b/spring-cloud-cli-integration-tests/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-cli-parent</artifactId>
-		<version>1.2.2.RELEASE</version>
+		<version>1.2.3.BUILD-SNAPSHOT</version>
 	</parent>

 	<dependencies>
--- a/spring-cloud-cli/pom.xml
+++ b/spring-cloud-cli/pom.xml
@@ -5,7 +5,7 @@

 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-cli</artifactId>
-	<version>1.2.2.RELEASE</version>
+	<version>1.2.3.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>

 	<name>spring-cloud-cli</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-cli-parent</artifactId>
-		<version>1.2.2.RELEASE</version>
+		<version>1.2.3.BUILD-SNAPSHOT</version>
 	</parent>

 	<dependencies>
--- 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() {
--- a/spring-cloud-launcher/pom.xml
+++ b/spring-cloud-launcher/pom.xml
@@ -5,7 +5,7 @@

 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-launcher</artifactId>
-	<version>1.2.2.RELEASE</version>
+	<version>1.2.3.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>

 	<name>spring-cloud-launcher</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-cli-parent</artifactId>
-		<version>1.2.2.RELEASE</version>
+		<version>1.2.3.BUILD-SNAPSHOT</version>
 	</parent>

 	<modules>
--- a/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml
+++ b/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-launcher</artifactId>
-		<version>1.2.2.RELEASE</version>
+		<version>1.2.3.BUILD-SNAPSHOT</version>
 	</parent>

 	<dependencies>
--- 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<HelpExample> EXAMPLES = new ArrayList<>();

--- a/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml
+++ b/spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-launcher</artifactId>
-		<version>1.2.2.RELEASE</version>
+		<version>1.2.3.BUILD-SNAPSHOT</version>
 	</parent>

 	<dependencies>
--- a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml
+++ b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml
@@ -13,11 +13,11 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-launcher</artifactId>
-		<version>1.2.2.RELEASE</version>
+		<version>1.2.3.BUILD-SNAPSHOT</version>
 	</parent>

 	<properties>
-		<spring-cloud-dataflow.version>1.0.1.RELEASE</spring-cloud-dataflow.version>
+		<spring-cloud-dataflow.version>1.0.2.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
 	</properties>

 	<dependencyManagement>
--- a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml
+++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml
@@ -13,11 +13,11 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-launcher</artifactId>
-		<version>1.2.2.RELEASE</version>
+		<version>1.2.3.BUILD-SNAPSHOT</version>
 	</parent>

 	<properties>
-		<spring-cloud-deployer.version>1.0.3.RELEASE</spring-cloud-deployer.version>
+		<spring-cloud-deployer.version>1.0.4.BUILD-SNAPSHOT</spring-cloud-deployer.version>
 	</properties>

 	<dependencyManagement>
--- 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;

--- a/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml
+++ b/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-launcher</artifactId>
-		<version>1.2.2.RELEASE</version>
+		<version>1.2.3.BUILD-SNAPSHOT</version>
 	</parent>

 	<dependencies>
--- a/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml
+++ b/spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-launcher</artifactId>
-		<version>1.2.2.RELEASE</version>
+		<version>1.2.3.BUILD-SNAPSHOT</version>
 	</parent>

 	<dependencies>
--- a/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/pom.xml
+++ b/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-launcher</artifactId>
-		<version>1.2.2.RELEASE</version>
+		<version>1.2.3.BUILD-SNAPSHOT</version>
 	</parent>

 	<dependencies>
--- a/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml
+++ b/spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-launcher</artifactId>
-		<version>1.2.2.RELEASE</version>
+		<version>1.2.3.BUILD-SNAPSHOT</version>
 	</parent>

 	<properties>
--- a/spring-cloud-launcher/spring-cloud-launcher-zipkin/pom.xml
+++ b/spring-cloud-launcher/spring-cloud-launcher-zipkin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-launcher</artifactId>
-		<version>1.2.2.RELEASE</version>
+		<version>1.2.3.BUILD-SNAPSHOT</version>
 	</parent>

 	<dependencies>