chore: bump version of spring-cloud-xxxx. Remove obsolete zipkin module.

Author: iocanel

README.md

@@ -16,7 +16,6 @@
 -   [Transparency](#transparency) *(it is transparent whether the code runs in or outside of Kubernetes)*
 -   [Kubernetes Profile Autoconfiguration](#kubernetes-profile-autoconfiguration)
 -   [Ribbon discovery in Kubernetes](#ribbon-discovery-in-kubernetes)
--   [Zipkin discovery in Kubernetes](#zipkin-discovery-in-kubernetes)
 -   [ConfigMap Archaius Bridge](#configmap-archaius-bridge)
 
 ---
@@ -527,33 +526,6 @@ Examples that are using this module for ribbon discovery are:
 Remark : The Ribbon discovery client can be disabled by setting this key within the application properties file 
 `spring.cloud.kubernetes.ribbon.enabled=false`.
 
-
-### Zipkin discovery in Kubernetes
-
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.springframework.cloud/spring-cloud-starter-kubernetes-zipkin/badge.svg?style=flat-square)](https://maven-badges.herokuapp.com/maven-central/org.springframework.cloud/spring-cloud-starter-kubernetes-zipkin/)
-[![Javadocs](http://www.javadoc.io/badge/org.springframework.cloud/spring-cloud-starter-kubernetes-zipkin.svg?color=blue)](http://www.javadoc.io/doc/org.springframework.cloud/spring-cloud-starter-kubernetes-zipkin)
-[![Dependency Status](https://www.versioneye.com/java/org.springframework.cloud:spring-cloud-starter-kubernetes-zipkin/badge?style=flat)](https://www.versioneye.com/java/org.springframework.cloud:spring-cloud-starter-kubernetes-zipkin/)
-
-[Zipkin](https://github.com/openzipkin/zipkin) is a distributed tracing system which is supported by the project 
-[Spring Cloud Sleuth](https://github.com/spring-cloud/spring-cloud-sleuth) which allows
-to collect traces or spans from microservice applications. 
-
-A Discovery client has been implemented top of Kubernetes in order to fetch the Zipkin service (e.g. `zipkin`). This 
-client is provided by the [spring-cloud-kubernetes-zipkin](spring-cloud-kubernetes-zipkin/pom.xml) project that you 
-can use by adding this starter to your maven pom file:
-
-```xml
-<dependency>
-    <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-starter-kubernetes-zipkin</artifactId>
-    <version>${latest.version}</version>
-</dependency>
-```
-
-This works as an extension of the [spring-cloud-sleuth-zipkin](https://github.com/spring-cloud/spring-cloud-sleuth/tree/master/spring-cloud-sleuth-zipkin) project. 
-The name of the Zipkin service and the target Kubernetes namespace/project where the service runs can be specified 
-using the following `application.properties` properties:
-
 ```bash
 spring.cloud.kubernetes.zipkin.discovery.serviceName=my-zipkin
 spring.cloud.kubernetes.zipkin.discovery.serviceNamespace=tracing

pom.xml

@@ -59,9 +59,9 @@
 
 	<properties>
 		<!-- Dependency Versions -->
-		<spring-cloud-commons.version>1.2.3.RELEASE</spring-cloud-commons.version>
-		<spring-cloud-netflix.version>1.3.2.RELEASE</spring-cloud-netflix.version>
-		<spring-cloud-sleuth.version>1.2.2.RELEASE</spring-cloud-sleuth.version>
+		<spring-cloud-commons.version>1.3.5.RELEASE</spring-cloud-commons.version>
+		<spring-cloud-netflix.version>1.4.6.RELEASE</spring-cloud-netflix.version>
+		<spring-cloud-sleuth.version>1.3.5.RELEASE</spring-cloud-sleuth.version>
 
 		<!-- Maven Plugin Versions -->
 		<maven-compiler-plugin.version>3.5</maven-compiler-plugin.version>
@@ -78,13 +78,11 @@
 		<module>spring-cloud-kubernetes-config</module>
 		<module>spring-cloud-kubernetes-discovery</module>
 		<module>spring-cloud-kubernetes-ribbon</module>
-		<module>spring-cloud-kubernetes-zipkin</module>
 		<module>spring-cloud-kubernetes-hystrix</module>
 		<module>spring-cloud-kubernetes-archaius</module>
 		<module>spring-cloud-starter-kubernetes</module>
 		<module>spring-cloud-starter-kubernetes-config</module>
 		<module>spring-cloud-starter-kubernetes-netflix</module>
-		<module>spring-cloud-starter-kubernetes-zipkin</module>
 		<module>spring-cloud-starter-kubernetes-ribbon</module>
 		<module>spring-cloud-starter-kubernetes-all</module>
 		<module>spring-cloud-kubernetes-examples</module>

spring-cloud-kubernetes-examples/kubernetes-zipkin-example/pom.xml

@@ -87,10 +87,6 @@
 		</dependency>
 
 		<!-- Zipkin -->
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-kubernetes-zipkin</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-sleuth-zipkin</artifactId>

spring-cloud-kubernetes-examples/kubernetes-zipkin-example/src/main/java/org/springframework/cloud/kubernetes/examples/ZipkinApplication.java

@@ -21,8 +21,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.sleuth.zipkin.ZipkinSpanReporter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.scheduling.annotation.EnableAsync;

spring-cloud-kubernetes-examples/kubernetes-zipkin-example/src/main/resources/application.yml

@@ -5,6 +5,9 @@ spring:
   sleuth:
     sampler:
       percentage: 1.0
+  zipkin:
+    # Assuming that zipkinserver is the service name of zipkin server.
+    baseUrl: http://zipkinserver
 
 sample:
   zipkin:

spring-cloud-kubernetes-zipkin/.jdk8

@@ -61,16 +61,6 @@
 			<artifactId>spring-cloud-kubernetes-hystrix</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-kubernetes-zipkin</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>