Made ZIpkin 2 default

fixes #785

spring-cloud-sleuth-samples/README.adoc

@@ -6,7 +6,7 @@ There are a few samples with slightly different features. You can run all of the
 
 * `spring-cloud-sleuth-sample`: vanilla (no zipkin) web app that calls back to itself on various endpoints ("/", "/call", "/async")
 
-* `spring-cloud-sleuth-sample-zipkin2`: same as vanilla sample but with zipkin (set `sample.zipkin.enabled=true` if you have a collector running)
+* `spring-cloud-sleuth-sample-zipkin`: same as vanilla sample but with zipkin (set `sample.zipkin.enabled=true` if you have a collector running)
 
 * `spring-cloud-sleuth-sample-messaging`: a Spring Integration application with two HTTP endpoints ("/" and "/xform")
 
@@ -16,7 +16,7 @@ The Ribbon sample makes an interesting demo or playground for learning about zip
 
 === Running samples with Zipkin
 
-1. Optionally run the https://github.com/openzipkin/zipkin[Zipkin] Server, e.g. via docker compose (there's a `docker-compose.yml` in https://github.com/spring-cloud/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin2[Spring Cloud Sleuth], or in https://github.com/openzipkin/docker-zipkin[Docker Zipkin]
+1. Optionally run the https://github.com/openzipkin/zipkin[Zipkin] Server, e.g. via docker compose (there's a `docker-compose.yml` in https://github.com/spring-cloud/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin[Spring Cloud Sleuth], or in https://github.com/openzipkin/docker-zipkin[Docker Zipkin]
 7. Run the zipkin sample application (set `sample.zipkin.enabled=false` if you have no Zipkin running). If you are using a VM to run docker you might need to tunnel port 9411 to localhost, or change the `spring.zipkin.baseUrl`.
 8. Hit `http://localhost:3380`, `http://localhost:3380/call`, `http://localhost:3380/async` for some interesting sample traces (the app callas back to itself).
 9. Go to `http://localhost:9411` for Zipkin's UI (if you are using boot2docker the host will be different)

spring-cloud-sleuth-samples/pom.xml

@@ -23,7 +23,7 @@
 		<module>spring-cloud-sleuth-sample-websocket</module>
 		<module>spring-cloud-sleuth-sample-feign</module>
 		<module>spring-cloud-sleuth-sample-ribbon</module>
-		<module>spring-cloud-sleuth-sample-zipkin2</module>
+		<module>spring-cloud-sleuth-sample-zipkin</module>
 	</modules>
 
 	<build>

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ~ Copyright 2013-2017 the original author or authors. ~ ~ Licensed under
-	the Apache License, Version 2.0 (the "License"); ~ you may not use this file 
-	except in compliance with the License. ~ You may obtain a copy of the License 
-	at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by 
-	applicable law or agreed to in writing, software ~ distributed under the 
-	License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS 
-	OF ANY KIND, either express or implied. ~ See the License for the specific 
+	the Apache License, Version 2.0 (the "License"); ~ you may not use this file
+	except in compliance with the License. ~ You may obtain a copy of the License
+	at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by
+	applicable law or agreed to in writing, software ~ distributed under the
+	License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS
+	OF ANY KIND, either express or implied. ~ See the License for the specific
 	language governing permissions and ~ limitations under the License. -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -61,14 +61,14 @@
 			<artifactId>spring-cloud-starter-feign</artifactId>
 		</dependency>
 		<dependency>
-			<!-- Including Eureka is a good test, even if there is no service to connect 
+			<!-- Including Eureka is a good test, even if there is no service to connect
 				with because it exercises slightly different code paths in Ribbon -->
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-eureka</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-sleuth-zipkin2</artifactId>
+			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml

@@ -82,7 +82,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-sleuth-zipkin2</artifactId>
+			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml

@@ -70,7 +70,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-sleuth-zipkin2</artifactId>
+			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml

@@ -82,7 +82,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-sleuth-zipkin2</artifactId>
+			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml

@@ -19,10 +19,10 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>spring-cloud-sleuth-sample-zipkin2</artifactId>
+	<artifactId>spring-cloud-sleuth-sample-zipkin</artifactId>
 	<packaging>jar</packaging>
-	<name>spring-cloud-sleuth-sample-zipkin2</name>
-	<description>Spring Cloud Sleuth Sample Zipkin v2</description>
+	<name>spring-cloud-sleuth-sample-zipkin</name>
+	<description>Spring Cloud Sleuth Sample Zipkin</description>
 
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
@@ -77,7 +77,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-sleuth-zipkin2</artifactId>
+			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>