Fixed broken pom

2017-08-21 11:27:06 +02:00
parent 6c9e50df40
commit 1b0cb0a05e
13 changed files with 0 additions and 52 deletions
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -17,11 +17,7 @@
 	<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>
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -5,11 +5,7 @@
 	<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>
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -9,11 +9,7 @@
        <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>
--- a/spring-cloud-sleuth-samples/pom.xml
+++ b/spring-cloud-sleuth-samples/pom.xml
@@ -12,11 +12,7 @@
 	<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>

--- 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,11 +20,7 @@
 	<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>

--- 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,11 +28,7 @@
 	<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>

--- 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,11 +28,7 @@
 	<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>

--- 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,11 +28,7 @@
 	<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>

--- 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,11 +28,7 @@
 	<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>

--- 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,11 +28,7 @@
 	<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>

--- 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,11 +27,7 @@
 	<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>

--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml
@@ -28,11 +28,7 @@
 	<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>

--- a/spring-cloud-starter-zipkin/pom.xml
+++ b/spring-cloud-starter-zipkin/pom.xml
@@ -5,11 +5,7 @@
 	<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>