Update to 1.1.0.M3

2015-11-17 12:09:08 +00:00
parent eb97893b4c
commit 5574535b07
8 changed files with 35 additions and 25 deletions
--- a/README.adoc
+++ b/README.adoc
@@ -34,9 +34,9 @@ $ cd spring-cloud-config-server
 $ mvn spring-boot:run
 ----

-The server is a Spring Boot application so you can build the jar file
-and run that (`java -jar ...`) or pull it down from a Maven
-repository. Then try it out as a client:
+The server is a Spring Boot application so you can run it from your
+IDE instead if you prefer (the main class is
+`ConfigServerApplication`). Then try it out a client:

 ----
 $ curl localhost:8888/foo/development
@@ -271,10 +271,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

@@ -302,7 +300,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
@@ -342,6 +340,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.

@@ -369,7 +379,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.
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -3,11 +3,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-config-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>
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-config</artifactId>
-	<version>1.1.0.BUILD-SNAPSHOT</version>
+	<version>1.1.0.M3</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Config</name>
 	<description>Spring Cloud Config</description>
@@ -11,7 +11,7 @@
 	<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/> <!-- lookup parent from repository -->
 	</parent>
 	<scm>
@@ -22,8 +22,8 @@
 	</scm>
    <properties>
        <bintray.package>config</bintray.package>
-        <spring-cloud-bus.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-bus.version>
-        <spring-cloud-commons.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-commons.version>
+        <spring-cloud-bus.version>1.1.0.M3</spring-cloud-bus.version>
+        <spring-cloud-commons.version>1.1.0.M3</spring-cloud-commons.version>
    </properties>
 	<modules>
 	  <module>spring-cloud-config-client</module>
@@ -45,22 +45,22 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-config</artifactId>
-	        <version>1.1.0.BUILD-SNAPSHOT</version>
+	        <version>1.1.0.M3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-config-client</artifactId>
-	        <version>1.1.0.BUILD-SNAPSHOT</version>
+	        <version>1.1.0.M3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-config-server</artifactId>
-	        <version>1.1.0.BUILD-SNAPSHOT</version>
+	        <version>1.1.0.M3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-config-monitor</artifactId>
-	        <version>1.1.0.BUILD-SNAPSHOT</version>
+	        <version>1.1.0.M3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.retry</groupId>
--- a/spring-cloud-config-client/pom.xml
+++ b/spring-cloud-config-client/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.1.0.M3</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-config-monitor/pom.xml
+++ b/spring-cloud-config-monitor/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.1.0.M3</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-config-monitor</artifactId>
--- a/spring-cloud-config-sample/pom.xml
+++ b/spring-cloud-config-sample/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.1.0.M3</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-config-server/pom.xml
+++ b/spring-cloud-config-server/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.1.0.M3</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-starter-config/pom.xml
+++ b/spring-cloud-starter-config/pom.xml
@@ -5,10 +5,10 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.1.0.M3</version>
 	</parent>
 	<artifactId>spring-cloud-starter-config</artifactId>
-	<version>1.1.0.BUILD-SNAPSHOT</version>
+	<version>1.1.0.M3</version>
 	<name>spring-cloud-starter-config</name>
 	<description>Spring Cloud Starter</description>
 	<url>http://projects.spring.io/spring-cloud</url>