From c5a937146f53af0a963a85ed691cce6899e6f5d1 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 24 Mar 2016 11:27:20 +0000 Subject: [PATCH] Bump for Brixton.RC1 --- README.adoc | 4 ++-- docs/README.adoc | 10 +++++----- docs/pom.xml | 4 ++-- docs/src/main/asciidoc/install.adoc | 2 +- pom.xml | 8 ++++---- spring-cloud-cli-integration-tests/pom.xml | 4 ++-- spring-cloud-cli/pom.xml | 4 ++-- .../cli/compiler/SpringCloudBomAstTransformation.java | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README.adoc b/README.adoc index b227046..c0c6ab4 100644 --- a/README.adoc +++ b/README.adoc @@ -29,7 +29,7 @@ and install the Spring Cloud plugin: ``` $ mvn install -$ spring install org.springframework.cloud:spring-cloud-cli:1.1.0.BUILD-SNAPSHOT +$ spring install org.springframework.cloud:spring-cloud-cli:1.1.0.RC1 ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features @@ -156,7 +156,7 @@ or you will encounter compile problems. It also needs a specific version of mave enabled. Intellij 14.1+ requires some configuration to ensure these are setup properly. 1. Click Preferences, Plugins. *Ensure Lombok is installed* - 2. Click New, Project from Existing Sources, choose your spring-cloud-sleuth directory + 2. Click New, Project from Existing Sources, choose your spring-cloud project directory 3. Choose Maven, and select Environment Settings. *Ensure you are using Maven 3.3.3* 4. In the next screen, *Select the profile `spring`* click Next until Finish. 5. Click Preferences, "Build, Execution, Deployment", Compiler, Annotation Processors. *Click Enable Annotation Processing* diff --git a/docs/README.adoc b/docs/README.adoc index 8ef6354..3259601 100644 --- a/docs/README.adoc +++ b/docs/README.adoc @@ -12,13 +12,13 @@ https://github.com/spring-projects/spring-boot[Spring Boot CLI] (1.1.x with x>=5): $ spring version - Spring CLI v1.1.5.RELEASE + Spring CLI v1.3.3.RELEASE E.g. for GVM users ``` -$ gvm install springboot 1.1.5.RELEASE -$ gvm use springboot 1.1.5.RELEASE +$ 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): @@ -30,12 +30,12 @@ $ 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.1.5.RELEASE/lib +$ 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.0.0.BUILD-SNAPSHOT +$ spring install org.springframework.cloud:spring-cloud-cli:1.1.0.RC1 ``` diff --git a/docs/pom.xml b/docs/pom.xml index 7ccf5ad..4d70e04 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -3,11 +3,11 @@ 4.0.0 org.springframework.cloud spring-cloud-cli-docs - 1.1.0.BUILD-SNAPSHOT + 1.1.0.RC1 org.springframework.cloud spring-cloud-build - 1.1.0.BUILD-SNAPSHOT + 1.1.0.RC1 pom diff --git a/docs/src/main/asciidoc/install.adoc b/docs/src/main/asciidoc/install.adoc index 8485975..2a55261 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.1.0.BUILD-SNAPSHOT +$ spring install org.springframework.cloud:spring-cloud-cli:1.1.0.RC1 ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features diff --git a/pom.xml b/pom.xml index a6e89da..d7aa4ab 100644 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,11 @@ 4.0.0 org.springframework.cloud spring-cloud-cli-parent - 1.1.0.BUILD-SNAPSHOT + 1.1.0.RC1 org.springframework.cloud spring-cloud-build - 1.1.0.BUILD-SNAPSHOT + 1.1.0.RC1 pom @@ -84,14 +84,14 @@ org.springframework.cloud spring-cloud-config - 1.1.0.BUILD-SNAPSHOT + 1.1.0.RC1 pom import org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.RC1 pom import diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index 7edcb81..a83770d 100644 --- a/spring-cloud-cli-integration-tests/pom.xml +++ b/spring-cloud-cli-integration-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cli-integration-tests - 1.1.0.BUILD-SNAPSHOT + 1.1.0.RC1 jar spring-cloud-cli-integration-tests @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.1.0.BUILD-SNAPSHOT + 1.1.0.RC1 diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml index 3457f44..47d2c3b 100644 --- a/spring-cloud-cli/pom.xml +++ b/spring-cloud-cli/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cli - 1.1.0.BUILD-SNAPSHOT + 1.1.0.RC1 jar spring-cloud-cli @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.1.0.BUILD-SNAPSHOT + 1.1.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 50c9f12..9880db0 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 = "Brixton.BUILD-SNAPSHOT"; + private static final String SPRING_CLOUD_VERSION = "Brixton.RC1"; @Override protected String getBomModule() {