SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumped Boot

Browse Source 
fixes gh-1153
This commit is contained in:
Marcin Grzejszczak
2019-01-21 14:12:34 +01:00
parent 9d140b1059
commit 8af5b71dda
5 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
benchmarks/pom.xml
View File

@@ -33,7 +33,7 @@
<sonar.skip>true</sonar.skip>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<spring-boot.version>2.1.1.RELEASE</spring-boot.version>
<spring-boot.version>2.1.2.RELEASE</spring-boot.version>
<brave.version>5.4.3</brave.version>
</properties>

4
pom.xml
View File

@@ -249,14 +249,14 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
<maven.compiler.testSource>1.8</maven.compiler.testSource>
<spring-cloud-build.version>2.1.0.BUILD-SNAPSHOT</spring-cloud-build.version>
<spring-cloud-build.version>2.1.2.BUILD-SNAPSHOT</spring-cloud-build.version>
<spring-cloud-commons.version>2.1.0.BUILD-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-gateway.version>2.1.0.BUILD-SNAPSHOT</spring-cloud-gateway.version>
<spring-cloud-stream.version>Fishtown.BUILD-SNAPSHOT</spring-cloud-stream.version>
<spring-cloud-netflix.version>2.1.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-openfeign.version>2.1.0.BUILD-SNAPSHOT</spring-cloud-openfeign.version>
<brave.version>5.6.1</brave.version>
<spring-security-boot-autoconfigure.version>2.0.4.RELEASE</spring-security-boot-autoconfigure.version>
<spring-security-boot-autoconfigure.version>2.1.2.RELEASE</spring-security-boot-autoconfigure.version>
</properties>
<profiles>

2
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
View File

@@ -93,7 +93,7 @@ public class TraceWebAutoConfiguration {
}
@Configuration
@ConditionalOnClass({ServerProperties.class, WebEndpointProperties.class})
@ConditionalOnClass({ ServerProperties.class, WebEndpointProperties.class })
protected static class ServerSkipPatternProviderConfig {
/**

7
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/grpc/stubs/HelloServiceGrpc.java
View File

@@ -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);

3
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java
View File

@@ -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) {