From 346e513bcbb3c54f7ed94c09a7da5aef257e4492 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 17 Nov 2015 09:52:52 +0000 Subject: [PATCH] Revert to snapshots --- README.adoc | 22 ++++++++++++++++------ docs/pom.xml | 4 ++-- pom.xml | 10 +++++----- spring-cloud-commons/pom.xml | 2 +- spring-cloud-context/pom.xml | 2 +- spring-cloud-starter/pom.xml | 4 ++-- 6 files changed, 27 insertions(+), 17 deletions(-) diff --git a/README.adoc b/README.adoc index f0f513fc..a28725d6 100644 --- a/README.adoc +++ b/README.adoc @@ -58,10 +58,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 @@ -89,7 +87,7 @@ marketplace". Unfortunately m2e does not yet support Maven 3.3, so once the projects are imported into Eclipse you will also need to tell m2eclipse to use the `.settings.xml` file for the projects. If you do not do this you -may see errors many different errors related to the POMs in the +may see many different errors related to the POMs in the projects. Open your Eclipse preferences, expand the Maven preferences, and select User Settings. In the User Settings field click Browse and navigate to the Spring Cloud project you imported @@ -129,6 +127,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. @@ -156,7 +166,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 3bbae2c8..ecc8fbb6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -3,11 +3,11 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-docs - 1.1.0.M3 + 1.1.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-build - 1.1.0.M3 + 1.1.0.BUILD-SNAPSHOT pom diff --git a/pom.xml b/pom.xml index e9a6360c..5b2ff972 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 1.1.0.M3 + 1.1.0.BUILD-SNAPSHOT pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 1.1.0.M3 + 1.1.0.BUILD-SNAPSHOT @@ -29,17 +29,17 @@ org.springframework.cloud spring-cloud-commons - 1.1.0.M3 + 1.1.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-context - 1.1.0.M3 + 1.1.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter - 1.1.0.M3 + 1.1.0.BUILD-SNAPSHOT diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index ef89ca34..ccc5a6f5 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 1.1.0.M3 + 1.1.0.BUILD-SNAPSHOT .. spring-cloud-commons diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index 0ea1573d..22f02409 100644 --- a/spring-cloud-context/pom.xml +++ b/spring-cloud-context/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 1.1.0.M3 + 1.1.0.BUILD-SNAPSHOT .. spring-cloud-context diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index 45861956..5f5f27db 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -5,10 +5,10 @@ org.springframework.cloud spring-cloud-commons-parent - 1.1.0.M3 + 1.1.0.BUILD-SNAPSHOT spring-cloud-starter - 1.1.0.M3 + 1.1.0.BUILD-SNAPSHOT spring-cloud-starter Spring Cloud Starter http://projects.spring.io/spring-cloud