From 0609396ea1343e64e464d48631a2095cece3b26e Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Thu, 3 Nov 2016 10:08:18 +0100
Subject: [PATCH] Updated libs

---
 pom.xml                                                   | 8 ++++----
 spring-cloud-sleuth-core/pom.xml                          | 2 +-
 .../zuul/TraceRestClientRibbonCommandFactoryTest.java     | 3 ++-
 spring-cloud-sleuth-dependencies/pom.xml                  | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7aa189141..c87327474 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml
index 9457b8e2c..0d99a353b 100644
--- a/spring-cloud-sleuth-core/pom.xml
+++ b/spring-cloud-sleuth-core/pom.xml
@@ -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>
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/zuul/TraceRestClientRibbonCommandFactoryTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/zuul/TraceRestClientRibbonCommandFactoryTest.java
index 26ebf11fb..f85932401 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/zuul/TraceRestClientRibbonCommandFactoryTest.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/zuul/TraceRestClientRibbonCommandFactoryTest.java
@@ -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);
 	}
 }
\ No newline at end of file
diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index d2f77d9c0..25666c929 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -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>