From 3b47f776274cec56b74429ee55ed5ba8f586757f Mon Sep 17 00:00:00 2001 From: Tim Ysewyn Date: Wed, 16 Jan 2019 21:56:22 +0100 Subject: [PATCH] Updated conditional for `ZipkinBackwardsCompatibilityAutoConfiguration` --- .../ZipkinBackwardsCompatibilityAutoConfiguration.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfiguration.java index 391e20122..4a7fd2066 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfiguration.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfiguration.java @@ -18,9 +18,7 @@ package org.springframework.cloud.sleuth.zipkin2; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; -import java.util.Map; import java.util.concurrent.TimeUnit; import zipkin2.Span; @@ -60,8 +58,7 @@ import org.springframework.util.Assert; * @deprecated */ @Configuration -@ConditionalOnProperty(value = { "spring.sleuth.enabled", - "spring.zipkin.enabled" }, matchIfMissing = true) +@ConditionalOnProperty(value = { "spring.sleuth.enabled" }, matchIfMissing = true) @AutoConfigureAfter({ ZipkinAutoConfiguration.class }) @Deprecated public class ZipkinBackwardsCompatibilityAutoConfiguration {