Bumping versions before release

2016-08-19 14:26:49 +02:00
parent 1b348abbde
commit f56779e255
22 changed files with 28 additions and 25 deletions
--- a/README.adoc
+++ b/README.adoc
@@ -239,6 +239,9 @@ Below you can find an example of a Logback configuration (file named `https://gi
 </configuration>
 -----

+NOTE: If you're using a custom `logback-spring.xml` then you have to pass the `spring.application.name` in
+`bootstrap` instead of `application` property file. Otherwise your custom logback file won't read the property properly.
+
 === Adding to the project

 ==== Only Sleuth (log correlation)
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -17,7 +17,7 @@
 	<name>Benchmarks</name>
 	<description>Benchmarks (JMH)</description>
 	<groupId>org.springframework.cloud</groupId>
-	<version>1.0.5.BUILD-SNAPSHOT</version>
+	<version>1.0.5.RELEASE</version>
 	<artifactId>benchmarks</artifactId>

 	<properties>
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>1.0.5.BUILD-SNAPSHOT</version>
+		<version>1.0.5.RELEASE</version>
 	</parent>
 	<artifactId>spring-cloud-sleuth-docs</artifactId>
 	<packaging>pom</packaging>
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>

 	<artifactId>spring-cloud-sleuth</artifactId>
-	<version>1.0.5.BUILD-SNAPSHOT</version>
+	<version>1.0.5.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Sleuth</name>
 	<description>Spring Cloud Sleuth</description>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>1.1.2.BUILD-SNAPSHOT</version>
+		<version>1.1.2.RELEASE</version>
 		<relativePath/>
 		<!-- lookup parent from repository -->
 	</parent>
@@ -208,7 +208,7 @@
 		<maven.compiler.testSource>1.8</maven.compiler.testSource>
 		<surefire.plugin.version>2.19.1</surefire.plugin.version>
 		<checkstyle.version>2.17</checkstyle.version>
-		<spring-cloud-build.version>1.1.2.BUILD-SNAPSHOT</spring-cloud-build.version>
+		<spring-cloud-build.version>1.1.2.RELEASE</spring-cloud-build.version>
 	</properties>

 	<profiles>
--- a/spring-cloud-sleuth-core/pom.xml
+++ b/spring-cloud-sleuth-core/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>1.0.5.BUILD-SNAPSHOT</version>
+		<version>1.0.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -5,16 +5,16 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.1.2.BUILD-SNAPSHOT</version>
+		<version>1.1.2.RELEASE</version>
        <relativePath/>
 	</parent>
 	<artifactId>spring-cloud-sleuth-dependencies</artifactId>
-	<version>1.0.5.BUILD-SNAPSHOT</version>
+	<version>1.0.5.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-sleuth-dependencies</name>
 	<description>Spring Cloud Sleuth Dependencies</description>
 	<properties>
-		<spring-cloud-netflix.version>1.1.6.BUILD-SNAPSHOT</spring-cloud-netflix.version>
+		<spring-cloud-netflix.version>1.1.5.RELEASE</spring-cloud-netflix.version>
 		<aspectj.version>1.8.4</aspectj.version>
 		<zipkin.version>1.1.5</zipkin.version>
 	</properties>
--- a/spring-cloud-sleuth-samples/pom.xml
+++ b/spring-cloud-sleuth-samples/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>1.0.5.BUILD-SNAPSHOT</version>
+		<version>1.0.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>1.0.5.BUILD-SNAPSHOT</version>
+		<version>1.0.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>1.0.5.BUILD-SNAPSHOT</version>
+		<version>1.0.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>1.0.5.BUILD-SNAPSHOT</version>
+		<version>1.0.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>1.0.5.BUILD-SNAPSHOT</version>
+		<version>1.0.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>1.0.5.BUILD-SNAPSHOT</version>
+		<version>1.0.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>1.0.5.BUILD-SNAPSHOT</version>
+		<version>1.0.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/README.md
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/README.md
@@ -20,7 +20,7 @@ or running the packaged app from the root:

 ```
 ./mvnw package --projects spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream
-java -jar spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/target/spring-cloud-sleuth-sample-zipkin-stream-1.0.0.BUILD-SNAPSHOT-exec.jar
+java -jar spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/target/spring-cloud-sleuth-sample-zipkin-stream-1.0.0.RELEASE-exec.jar
 ```

 and test it
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>1.0.5.BUILD-SNAPSHOT</version>
+		<version>1.0.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
@@ -27,7 +27,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>1.0.5.BUILD-SNAPSHOT</version>
+		<version>1.0.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>1.0.5.BUILD-SNAPSHOT</version>
+		<version>1.0.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-sleuth-stream/pom.xml
+++ b/spring-cloud-sleuth-stream/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>1.0.5.BUILD-SNAPSHOT</version>
+		<version>1.0.5.RELEASE</version>
 	</parent>

 	<dependencies>
--- a/spring-cloud-sleuth-zipkin-stream/pom.xml
+++ b/spring-cloud-sleuth-zipkin-stream/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>1.0.5.BUILD-SNAPSHOT</version>
+		<version>1.0.5.RELEASE</version>
 	</parent>

 	<properties>
--- a/spring-cloud-sleuth-zipkin/pom.xml
+++ b/spring-cloud-sleuth-zipkin/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>1.0.5.BUILD-SNAPSHOT</version>
+		<version>1.0.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-starter-sleuth/pom.xml
+++ b/spring-cloud-starter-sleuth/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>1.0.5.BUILD-SNAPSHOT</version>
+		<version>1.0.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-sleuth</artifactId>
--- a/spring-cloud-starter-zipkin/pom.xml
+++ b/spring-cloud-starter-zipkin/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>1.0.5.BUILD-SNAPSHOT</version>
+		<version>1.0.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-zipkin</artifactId>