diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index a41ea8b65..3f8b81f6d 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -33,7 +33,7 @@ true 1.8 1.8 - 2.1.1.RELEASE + 2.1.2.RELEASE 5.4.3 diff --git a/pom.xml b/pom.xml index 0c0f86f8a..275e75a62 100644 --- a/pom.xml +++ b/pom.xml @@ -249,14 +249,14 @@ 1.8 1.8 1.8 - 2.1.0.BUILD-SNAPSHOT + 2.1.2.BUILD-SNAPSHOT 2.1.0.BUILD-SNAPSHOT 2.1.0.BUILD-SNAPSHOT Fishtown.BUILD-SNAPSHOT 2.1.0.BUILD-SNAPSHOT 2.1.0.BUILD-SNAPSHOT 5.6.1 - 2.0.4.RELEASE + 2.1.2.RELEASE diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java index 665a23264..287d56cbd 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java @@ -93,7 +93,7 @@ public class TraceWebAutoConfiguration { } @Configuration - @ConditionalOnClass({ServerProperties.class, WebEndpointProperties.class}) + @ConditionalOnClass({ ServerProperties.class, WebEndpointProperties.class }) protected static class ServerSkipPatternProviderConfig { /** diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/grpc/stubs/HelloServiceGrpc.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/grpc/stubs/HelloServiceGrpc.java index cb4d1d534..7e4437c6a 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/grpc/stubs/HelloServiceGrpc.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/grpc/stubs/HelloServiceGrpc.java @@ -73,16 +73,15 @@ public final class HelloServiceGrpc { } /** - * Creates a new blocking-style stub that supports unary and streaming - * output calls on the service + * Creates a new blocking-style stub that supports unary and streaming output calls on + * the service */ public static HelloServiceBlockingStub newBlockingStub(io.grpc.Channel channel) { return new HelloServiceBlockingStub(channel); } /** - * Creates a new ListenableFuture-style stub that supports unary calls on - * the service + * Creates a new ListenableFuture-style stub that supports unary calls on the service */ public static HelloServiceFutureStub newFutureStub(io.grpc.Channel channel) { return new HelloServiceFutureStub(channel); diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java index e7c6b93d5..7ddb02ddd 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java @@ -389,8 +389,7 @@ public class WebClientTests { try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(span)) { this.webClient.get().uri("http://localhost:" + this.port + "/noresponse") - .retrieve().bodyToMono(String.class) - .timeout(Duration.ofMillis(0)) + .retrieve().bodyToMono(String.class).timeout(Duration.ofMillis(0)) .block(); } catch (Exception e) {