Update to Brixton.M3

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.M1
+$ spring install org.springframework.cloud:spring-cloud-cli:1.1.0.BUILD-SNAPSHOT
 ```
 
 IMPORTANT: **Prerequisites:** to use the encryption and decryption features
@@ -81,10 +81,8 @@ https://github.com/spring-cloud-samples/scripts[scripts demo
 repository] for specific instructions about the common cases of mongo,
 rabbit and redis.
 
-NOTE: migration to the Maven wrapper (`./mvnw`) is underway. If you
-find a project that doesn't have it yet, raise an issue to get it
-added, and build with the command from `.travis.yml` (usually
-`mvn install -s .settings.xml`).
+NOTE: If all else fails, build with the command from `.travis.yml` (usually
+`./mvnw install`).
 
 === Documentation
 
@@ -152,6 +150,18 @@ The method getId() is undefined for the type ProxyRouteLocator.ProxyRouteSpec
 The method getLocation() is undefined for the type ProxyRouteLocator.ProxyRouteSpec PreDecorationFilter.java    /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre line 55 Java Problem
 ----
 
+==== Importing into Intellij
+Spring Cloud projects use annotation processing, particularly Lombok, which requires configuration
+or you will encounter compile problems. It also needs a specific version of maven and a profile
+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
+ 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*
+ 6. Click Build, Rebuild Project, and you are ready to go!
+
 ==== Importing into other IDEs
 Maven is well supported by most Java IDEs. Refer to you vendor documentation.
 
@@ -179,7 +189,7 @@ added after the original pull request but before a merge.
 * Use the Spring Framework code format conventions. If you use Eclipse
   you can import formatter settings using the
   `eclipse-code-formatter.xml` file from the
-  https://github.com/spring-cloud/build/tree/master/eclipse-coding-conventions.xml[Spring
+  https://github.com/spring-cloud/spring-cloud-build/blob/master/spring-cloud-build/eclipse-code-formatter.xml[Spring
   Cloud Build] project. If using IntelliJ, you can use the
   http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
   Plugin] to import the same file.

docs/pom.xml

@@ -3,11 +3,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-cli-docs</artifactId>
-	<version>1.1.0.BUILD-SNAPSHOT</version>
+	<version>1.1.0.M3</version>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.1.0.M3</version>
 		<relativePath/>
 	</parent>
 	<packaging>pom</packaging>

pom.xml

@@ -3,11 +3,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-cli-parent</artifactId>
-	<version>1.1.0.BUILD-SNAPSHOT</version>
+	<version>1.1.0.M3</version>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.1.0.M3</version>
 		<relativePath/>
 	</parent>
 	<packaging>pom</packaging>
@@ -83,14 +83,14 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-config</artifactId>
-				<version>1.1.0.BUILD-SNAPSHOT</version>
+				<version>1.1.0.M3</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-netflix</artifactId>
-				<version>1.1.0.BUILD-SNAPSHOT</version>
+				<version>1.1.0.M3</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

spring-cloud-cli/pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-cli</artifactId>
-	<version>1.1.0.BUILD-SNAPSHOT</version>
+	<version>1.1.0.M3</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.1.0.BUILD-SNAPSHOT</version>
+		<version>1.1.0.M3</version>
 	</parent>
 
 	<dependencies>

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.M3";
 
 	@Override
 	protected String getBomModule() {