Merge pull request #1294 from ryanjbaxter/upgrade-hystrix-1.5.5-1289

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixStreamEndpointTests.java

@@ -16,12 +16,7 @@
 
 package org.springframework.cloud.netflix.hystrix;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.InputStream;
-import java.net.URL;
-
+import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +35,11 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
+import java.io.InputStream;
+import java.net.URL;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author Dave Syer
@@ -74,7 +73,7 @@ public class HystrixStreamEndpointTests {
 		byte[] buffer = new byte[1024];
 		in.read(buffer);
 		String contents = new String(buffer);
-		assertTrue(contents.contains("ping"));
+		assertTrue(contents.contains("Hystrix"));
 		in.close();
 	}
 

spring-cloud-netflix-dependencies/pom.xml

@@ -20,7 +20,7 @@
 		<archaius.version>0.7.4</archaius.version>
 		<eureka.version>1.4.10</eureka.version>
 		<feign.version>9.3.0</feign.version>
-		<hystrix.version>1.5.3</hystrix.version>
+		<hystrix.version>1.5.5</hystrix.version>
 		<ribbon.version>2.2.0</ribbon.version>
 		<servo.version>0.10.1</servo.version>
 		<zuul.version>1.2.2</zuul.version>