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

Updated libs

Browse Source
This commit is contained in:
Marcin Grzejszczak
2016-11-03 10:08:18 +01:00
parent 6391bdaaec
commit 0609396ea1
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>1.1.3.BUILD-SNAPSHOT</version>
<version>1.2.2.BUILD-SNAPSHOT</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
@@ -229,10 +229,10 @@
<maven.compiler.testSource>1.8</maven.compiler.testSource>
<surefire.plugin.version>2.19.1</surefire.plugin.version>
<checkstyle.version>2.17</checkstyle.version>
<spring-cloud-build.version>1.1.3.BUILD-SNAPSHOT</spring-cloud-build.version>
<spring-cloud-commons.version>1.1.3.BUILD-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-build.version>1.2.2.BUILD-SNAPSHOT</spring-cloud-build.version>
<spring-cloud-commons.version>1.1.6.BUILD-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-stream.version>Brooklyn.BUILD-SNAPSHOT</spring-cloud-stream.version>
<spring-cloud-netflix.version>1.1.6.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-netflix.version>1.2.3.BUILD-SNAPSHOT</spring-cloud-netflix.version>
</properties>
<profiles>

2
spring-cloud-sleuth-core/pom.xml
View File

@@ -61,7 +61,7 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.netflix.feign</groupId>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-core</artifactId>
<optional>true</optional>
</dependency>

3
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/zuul/TraceRestClientRibbonCommandFactoryTest.java
View File

@@ -34,6 +34,7 @@ import org.springframework.cloud.sleuth.SpanInjector;
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.cloud.sleuth.instrument.web.HttpTraceKeysInjector;
import org.springframework.cloud.sleuth.trace.TestSpanContextHolder;
import org.springframework.http.HttpHeaders;
import static org.assertj.core.api.BDDAssertions.then;
import static org.mockito.BDDMockito.given;
@@ -105,6 +106,6 @@ public class TraceRestClientRibbonCommandFactoryTest {
private RibbonCommandContext ribbonCommandContext() {
return new RibbonCommandContext("serviceId", "GET", "http://localhost:1234/foo",
false, null, null, null);
false, new HttpHeaders(), new HttpHeaders(), null);
}
}

2
spring-cloud-sleuth-dependencies/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>1.1.3.BUILD-SNAPSHOT</version>
<version>1.2.2.BUILD-SNAPSHOT</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-sleuth-dependencies</artifactId>