From d240697f6f13c5f2c396732d322d3965d787bb18 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 17 Nov 2015 22:04:46 +0000 Subject: [PATCH] Update to Brixton.M3 --- README.adoc | 22 ++++++++++++++----- docs/pom.xml | 4 ++-- pom.xml | 8 +++---- spring-cloud-cli/pom.xml | 4 ++-- .../SpringCloudBomAstTransformation.java | 2 +- 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/README.adoc b/README.adoc index 1ae5f67..3311549 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.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. diff --git a/docs/pom.xml b/docs/pom.xml index 7ccf5ad..f424856 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.M3 org.springframework.cloud spring-cloud-build - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 pom diff --git a/pom.xml b/pom.xml index 4ace128..66639fe 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.M3 org.springframework.cloud spring-cloud-build - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 pom @@ -83,14 +83,14 @@ org.springframework.cloud spring-cloud-config - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 pom import org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 pom import diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml index 1004dc6..ffd1d62 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.M3 jar spring-cloud-cli @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-cli-parent - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 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..f56be19 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.M3"; @Override protected String getBomModule() {