SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-08-21 10:16:03 +02:00
parent 3931087628 17df781524
commit 6c9e50df40
13 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
benchmarks/pom.xml
View File

@@ -17,7 +17,11 @@
<name>Benchmarks</name>
<description>Benchmarks (JMH)</description>
<groupId>org.springframework.cloud</groupId>
<<<<<<< HEAD
<version>1.3.0.BUILD-SNAPSHOT</version>
=======
<version>1.2.5.BUILD-SNAPSHOT</version>
>>>>>>> 1.2.x
<artifactId>benchmarks</artifactId>
<properties>

4
docs/pom.xml
View File

@@ -5,7 +5,11 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<<<<<<< HEAD
<version>1.3.0.BUILD-SNAPSHOT</version>
=======
<version>1.2.5.BUILD-SNAPSHOT</version>
>>>>>>> 1.2.x
</parent>
<artifactId>spring-cloud-sleuth-docs</artifactId>
<packaging>pom</packaging>

4
spring-cloud-sleuth-dependencies/pom.xml
View File

@@ -9,7 +9,11 @@
<relativePath/>
</parent>
<artifactId>spring-cloud-sleuth-dependencies</artifactId>
<<<<<<< HEAD
<version>1.3.0.BUILD-SNAPSHOT</version>
=======
<version>1.2.5.BUILD-SNAPSHOT</version>
>>>>>>> 1.2.x
<packaging>pom</packaging>
<name>spring-cloud-sleuth-dependencies</name>
<description>Spring Cloud Sleuth Dependencies</description>

4
spring-cloud-sleuth-samples/pom.xml
View File

@@ -12,7 +12,11 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<<<<<<< HEAD
<version>1.3.0.BUILD-SNAPSHOT</version>
=======
<version>1.2.5.BUILD-SNAPSHOT</version>
>>>>>>> 1.2.x
<relativePath>..</relativePath>
</parent>

4
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml
View File

@@ -20,7 +20,11 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<<<<<<< HEAD
<version>1.3.0.BUILD-SNAPSHOT</version>
=======
<version>1.2.5.BUILD-SNAPSHOT</version>
>>>>>>> 1.2.x
<relativePath>..</relativePath>
</parent>

4
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml
View File

@@ -28,7 +28,11 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<<<<<<< HEAD
<version>1.3.0.BUILD-SNAPSHOT</version>
=======
<version>1.2.5.BUILD-SNAPSHOT</version>
>>>>>>> 1.2.x
<relativePath>..</relativePath>
</parent>

4
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml
View File

@@ -28,7 +28,11 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<<<<<<< HEAD
<version>1.3.0.BUILD-SNAPSHOT</version>
=======
<version>1.2.5.BUILD-SNAPSHOT</version>
>>>>>>> 1.2.x
<relativePath>..</relativePath>
</parent>

4
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/pom.xml
View File

@@ -28,7 +28,11 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<<<<<<< HEAD
<version>1.3.0.BUILD-SNAPSHOT</version>
=======
<version>1.2.5.BUILD-SNAPSHOT</version>
>>>>>>> 1.2.x
<relativePath>..</relativePath>
</parent>

4
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml
View File

@@ -28,7 +28,11 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<<<<<<< HEAD
<version>1.3.0.BUILD-SNAPSHOT</version>
=======
<version>1.2.5.BUILD-SNAPSHOT</version>
>>>>>>> 1.2.x
<relativePath>..</relativePath>
</parent>

4
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml
View File

@@ -28,7 +28,11 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<<<<<<< HEAD
<version>1.3.0.BUILD-SNAPSHOT</version>
=======
<version>1.2.5.BUILD-SNAPSHOT</version>
>>>>>>> 1.2.x
<relativePath>..</relativePath>
</parent>

4
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
View File

@@ -27,7 +27,11 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<<<<<<< HEAD
<version>1.3.0.BUILD-SNAPSHOT</version>
=======
<version>1.2.5.BUILD-SNAPSHOT</version>
>>>>>>> 1.2.x
<relativePath>..</relativePath>
</parent>

4
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml
View File

@@ -28,7 +28,11 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<<<<<<< HEAD
<version>1.3.0.BUILD-SNAPSHOT</version>
=======
<version>1.2.5.BUILD-SNAPSHOT</version>
>>>>>>> 1.2.x
<relativePath>..</relativePath>
</parent>

4
spring-cloud-starter-zipkin/pom.xml
View File

@@ -5,7 +5,11 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<<<<<<< HEAD
<version>1.3.0.BUILD-SNAPSHOT</version>
=======
<version>1.2.5.BUILD-SNAPSHOT</version>
>>>>>>> 1.2.x
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-zipkin</artifactId>