Added symbolic link of index.adoc

docs/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-netflix-docs</artifactId>
 	<packaging>pom</packaging>

docs/src/main/asciidoc/index.adoc

@@ -0,0 +1 @@
+spring-cloud-netflix.adoc

pom.xml

@@ -3,14 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-netflix</artifactId>
-	<version>2.0.4.BUILD-SNAPSHOT</version>
+	<version>2.0.5.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Netflix</name>
 	<description>Spring Cloud Netflix</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.0.5.BUILD-SNAPSHOT</version>
+		<version>2.0.6.BUILD-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 	<scm>
@@ -22,8 +22,8 @@
 	<properties>
 		<bintray.package>netflix</bintray.package>
 		<jackson.version>2.7.3</jackson.version>
-		<spring-cloud-commons.version>2.0.3.BUILD-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-config.version>2.0.3.BUILD-SNAPSHOT</spring-cloud-config.version>
+		<spring-cloud-commons.version>2.0.4.BUILD-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-config.version>2.0.4.BUILD-SNAPSHOT</spring-cloud-config.version>
 		<spring-cloud-stream.version>Elmhurst.BUILD-SNAPSHOT</spring-cloud-stream.version>
 		<!-- Has to be a stable version (not one that depends on this version of netflix): -->
 		<donotreplacespring-cloud-contract.version>2.0.2.RELEASE</donotreplacespring-cloud-contract.version>

spring-cloud-netflix-archaius/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>spring-cloud-netflix</artifactId>
         <groupId>org.springframework.cloud</groupId>
-        <version>2.0.4.BUILD-SNAPSHOT</version>
+        <version>2.0.5.BUILD-SNAPSHOT</version>
         <relativePath>..</relativePath> <!-- lookup parent from repository -->
     </parent>
 

spring-cloud-netflix-core/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-netflix-core</artifactId>

spring-cloud-netflix-dependencies/pom.xml

@@ -5,11 +5,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.0.5.BUILD-SNAPSHOT</version>
+		<version>2.0.6.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-netflix-dependencies</artifactId>
-	<version>2.0.4.BUILD-SNAPSHOT</version>
+	<version>2.0.5.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-netflix-dependencies</name>
 	<description>Spring Cloud Netflix Dependencies</description>

spring-cloud-netflix-eureka-client/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-netflix-eureka-client</artifactId>

spring-cloud-netflix-eureka-server/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-netflix-eureka-server</artifactId>

spring-cloud-netflix-hystrix-contract/pom.xml

@@ -9,7 +9,7 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-netflix-hystrix-contract</artifactId>
-	<version>2.0.4.BUILD-SNAPSHOT</version>
+	<version>2.0.5.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>spring-cloud-netflix-hystrix-contract</name>
 	<description>Spring Cloud Netflix Hystrix Contract</description>

spring-cloud-netflix-hystrix-dashboard/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<dependencies>

spring-cloud-netflix-hystrix-stream/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-netflix-hystrix-stream</artifactId>

spring-cloud-netflix-ribbon/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-netflix</artifactId>
         <groupId>org.springframework.cloud</groupId>
-        <version>2.0.4.BUILD-SNAPSHOT</version>
+        <version>2.0.5.BUILD-SNAPSHOT</version>
         <relativePath>..</relativePath> <!-- lookup parent from repository -->
     </parent>
     <modelVersion>4.0.0</modelVersion>

spring-cloud-netflix-sidecar/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-netflix-sidecar</artifactId>

spring-cloud-netflix-turbine-stream/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-netflix-turbine-stream</artifactId>

spring-cloud-netflix-turbine/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-netflix-turbine</artifactId>

spring-cloud-netflix-zuul/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>spring-cloud-netflix</artifactId>
         <groupId>org.springframework.cloud</groupId>
-        <version>2.0.4.BUILD-SNAPSHOT</version>
+        <version>2.0.5.BUILD-SNAPSHOT</version>
         <relativePath>..</relativePath> <!-- lookup parent from repository -->
     </parent>
 

spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/support/RibbonRetryIntegrationTestBase.java

@@ -21,7 +21,6 @@ package org.springframework.cloud.netflix.zuul.filters.route.support;
 import com.netflix.loadbalancer.Server;
 import com.netflix.loadbalancer.ServerList;
 import com.netflix.zuul.context.RequestContext;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.Before;
@@ -35,8 +34,8 @@ import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
 import org.springframework.cloud.client.loadbalancer.ServiceInstanceChooser;
 import org.springframework.cloud.netflix.ribbon.RibbonClient;
 import org.springframework.cloud.netflix.ribbon.RibbonClients;
-import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancedRetryPolicy;
 import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancedRetryFactory;
+import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancedRetryPolicy;
 import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancerContext;
 import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.cloud.netflix.ribbon.StaticServerList;
@@ -49,7 +48,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
 import static org.junit.Assert.assertEquals;
@@ -181,7 +179,6 @@ public abstract class RibbonRetryIntegrationTestBase {
 		}
 
 		@RequestMapping("/404everyothererror")
-		@ResponseStatus(HttpStatus.NOT_FOUND)
 		public ResponseEntity<String> fourOFourError() {
 			boolean shouldError = error;
 			error = !error;

spring-cloud-starter-netflix/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-netflix</artifactId>

spring-cloud-starter-netflix/spring-cloud-starter-netflix-archaius/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-netflix</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-starter-netflix-archaius</artifactId>
 	<name>Spring Cloud Starter Netflix Archaius</name>

spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-client/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-netflix</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 	<name>Spring Cloud Starter Netflix Eureka Client</name>

spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-server/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-netflix</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
 	<name>Spring Cloud Starter Netflix Eureka Server</name>

spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix-dashboard/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-netflix</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-starter-netflix-hystrix-dashboard</artifactId>
 	<name>Spring Cloud Starter Netflix Hystrix Dashboard</name>

spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-netflix</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
 	<name>Spring Cloud Starter Netflix Hystrix</name>

spring-cloud-starter-netflix/spring-cloud-starter-netflix-ribbon/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-netflix</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
 	<name>Spring Cloud Starter Netflix Ribbon</name>

spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-stream/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-netflix</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-starter-netflix-turbine-stream</artifactId>
 	<name>Spring Cloud Starter Netflix Turbine Stream</name>

spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-netflix</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-starter-netflix-turbine</artifactId>
 	<name>Spring Cloud Starter Netflix Turbine</name>

spring-cloud-starter-netflix/spring-cloud-starter-netflix-zuul/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-netflix</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-starter-netflix-zuul</artifactId>
 	<name>Spring Cloud Starter Netflix Zuul</name>