Going back to snapshots

docs/pom.xml

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

pom.xml

@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-netflix</artifactId>
-	<version>1.3.1.RELEASE</version>
+	<version>1.3.1.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Netflix</name>
 	<description>Spring Cloud Netflix</description>
@@ -24,9 +24,9 @@
 		<main.basedir>${basedir}</main.basedir>
         <netty.version>4.0.27.Final</netty.version>
 		<jackson.version>2.7.3</jackson.version>
-		<spring-cloud-commons.version>1.2.2.RELEASE</spring-cloud-commons.version>
-		<spring-cloud-config.version>1.3.1.RELEASE</spring-cloud-config.version>
-		<spring-cloud-stream.version>Chelsea.SR2</spring-cloud-stream.version>
+		<spring-cloud-commons.version>1.2.1.BUILD-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-config.version>1.3.1.BUILD-SNAPSHOT</spring-cloud-config.version>
+		<spring-cloud-stream.version>Chelsea.BUILD-SNAPSHOT</spring-cloud-stream.version>
 
 		<!-- Sonar -->
 		<surefire.plugin.version>2.19.1</surefire.plugin.version>

spring-cloud-netflix-core/pom.xml

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

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorOverridesRetryTests.java

-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.ribbon;
-
-import java.net.ConnectException;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.util.Assert;
-
-import com.netflix.client.DefaultLoadBalancerRetryHandler;
-import com.netflix.client.RetryHandler;
-import com.netflix.client.config.IClientConfig;
-
-/**
- * @author Tyler Van Gorder
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = RibbonClientPreprocessorOverridesRetryTests.TestConfiguration.class, value = {
-		"customRetry.ribbon.MaxAutoRetries=0",
-		"customRetry.ribbon.MaxAutoRetriesNextServer=1",
-		"customRetry.ribbon.OkToRetryOnAllOperations=true" })
-@DirtiesContext
-public class RibbonClientPreprocessorOverridesRetryTests {
-
-	@Autowired
-	private SpringClientFactory factory;
-
-	@Test
-	public void customRetryIsConfigured() throws Exception {
-		RibbonLoadBalancerContext context = (RibbonLoadBalancerContext) this.factory
-				.getLoadBalancerContext("customRetry");
-		Assert.isInstanceOf(RetryRibbonConfiguration.CustomRetryHandler.class,
-				context.getRetryHandler());
-		Assert.isTrue(context.getRetryHandler().getMaxRetriesOnSameServer() == 0);
-		Assert.isTrue(context.getRetryHandler().getMaxRetriesOnNextServer() == 1);
-		Assert.isTrue(context.getRetryHandler()
-				.isCircuitTrippingException(new UnknownHostException("Unknown Host")));
-	}
-
-	@Configuration
-	@RibbonClient(name = "customRetry", configuration = RetryRibbonConfiguration.class)
-	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
-			RibbonAutoConfiguration.class })
-	protected static class TestConfiguration {
-	}
-
-}
-
-@Configuration
-class RetryRibbonConfiguration {
-	@Bean
-	public RetryHandler retryHandler(IClientConfig config) {
-		return new CustomRetryHandler(config);
-	}
-
-	class CustomRetryHandler extends DefaultLoadBalancerRetryHandler {
-
-		@SuppressWarnings("unchecked")
-		private List<Class<? extends Throwable>> retriable = new ArrayList() {
-			{
-				add(UnknownHostException.class);
-				add(ConnectException.class);
-				add(SocketTimeoutException.class);
-			}
-		};
-
-		@SuppressWarnings("unchecked")
-		private List<Class<? extends Throwable>> circuitRelated = new ArrayList() {
-			{
-				add(UnknownHostException.class);
-				add(SocketException.class);
-				add(SocketTimeoutException.class);
-			}
-		};
-
-		CustomRetryHandler(IClientConfig config) {
-			super(config);
-		}
-
-		@Override
-		protected List<Class<? extends Throwable>> getRetriableExceptions() {
-			return retriable;
-		}
-
-		@Override
-		protected List<Class<? extends Throwable>> getCircuitRelatedExceptions() {
-			return circuitRelated;
-		}
-
-	}
-}
+/*
+ * Copyright 2013-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.ribbon;
+
+import java.net.ConnectException;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.util.Assert;
+
+import com.netflix.client.DefaultLoadBalancerRetryHandler;
+import com.netflix.client.RetryHandler;
+import com.netflix.client.config.IClientConfig;
+
+/**
+ * @author Tyler Van Gorder
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = RibbonClientPreprocessorOverridesRetryTests.TestConfiguration.class, value = {
+		"customRetry.ribbon.MaxAutoRetries=0",
+		"customRetry.ribbon.MaxAutoRetriesNextServer=1",
+		"customRetry.ribbon.OkToRetryOnAllOperations=true" })
+@DirtiesContext
+public class RibbonClientPreprocessorOverridesRetryTests {
+
+	@Autowired
+	private SpringClientFactory factory;
+
+	@Test
+	public void customRetryIsConfigured() throws Exception {
+		RibbonLoadBalancerContext context = (RibbonLoadBalancerContext) this.factory
+				.getLoadBalancerContext("customRetry");
+		Assert.isInstanceOf(RetryRibbonConfiguration.CustomRetryHandler.class,
+				context.getRetryHandler());
+		Assert.isTrue(context.getRetryHandler().getMaxRetriesOnSameServer() == 0);
+		Assert.isTrue(context.getRetryHandler().getMaxRetriesOnNextServer() == 1);
+		Assert.isTrue(context.getRetryHandler()
+				.isCircuitTrippingException(new UnknownHostException("Unknown Host")));
+	}
+
+	@Configuration
+	@RibbonClient(name = "customRetry", configuration = RetryRibbonConfiguration.class)
+	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
+			RibbonAutoConfiguration.class })
+	protected static class TestConfiguration {
+	}
+
+}
+
+@Configuration
+class RetryRibbonConfiguration {
+	@Bean
+	public RetryHandler retryHandler(IClientConfig config) {
+		return new CustomRetryHandler(config);
+	}
+
+	class CustomRetryHandler extends DefaultLoadBalancerRetryHandler {
+
+		@SuppressWarnings("unchecked")
+		private List<Class<? extends Throwable>> retriable = new ArrayList() {
+			{
+				add(UnknownHostException.class);
+				add(ConnectException.class);
+				add(SocketTimeoutException.class);
+			}
+		};
+
+		@SuppressWarnings("unchecked")
+		private List<Class<? extends Throwable>> circuitRelated = new ArrayList() {
+			{
+				add(UnknownHostException.class);
+				add(SocketException.class);
+				add(SocketTimeoutException.class);
+			}
+		};
+
+		CustomRetryHandler(IClientConfig config) {
+			super(config);
+		}
+
+		@Override
+		protected List<Class<? extends Throwable>> getRetriableExceptions() {
+			return retriable;
+		}
+
+		@Override
+		protected List<Class<? extends Throwable>> getCircuitRelatedExceptions() {
+			return circuitRelated;
+		}
+
+	}
+}

spring-cloud-netflix-dependencies/pom.xml

@@ -5,11 +5,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.3.2.RELEASE</version>
+		<version>1.3.1.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-netflix-dependencies</artifactId>
-	<version>1.3.1.RELEASE</version>
+	<version>1.3.1.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>1.3.1.RELEASE</version>
+		<version>1.3.1.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>1.3.1.RELEASE</version>
+		<version>1.3.1.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-netflix-eureka-server</artifactId>

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

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

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

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

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

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

spring-cloud-netflix-sidecar/pom.xml

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

spring-cloud-netflix-spectator/pom.xml

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

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

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>1.3.1.RELEASE</version>
+		<version>1.3.1.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>1.3.1.RELEASE</version>
+		<version>1.3.1.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-netflix-turbine</artifactId>

spring-cloud-starter-archaius/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>1.3.1.RELEASE</version>
+		<version>1.3.1.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-starter-archaius</artifactId>

spring-cloud-starter-atlas/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>1.3.1.RELEASE</version>
+		<version>1.3.1.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-starter-atlas</artifactId>

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

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

spring-cloud-starter-eureka/pom.xml

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

spring-cloud-starter-feign/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>1.3.1.RELEASE</version>
+		<version>1.3.1.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-starter-feign</artifactId>

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

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>1.3.1.RELEASE</version>
+		<version>1.3.1.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-starter-hystrix-dashboard</artifactId>

spring-cloud-starter-hystrix/pom.xml

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

spring-cloud-starter-ribbon/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>1.3.1.RELEASE</version>
+		<version>1.3.1.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-starter-ribbon</artifactId>

spring-cloud-starter-spectator/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>1.3.1.RELEASE</version>
+		<version>1.3.1.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-starter-spectator</artifactId>

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

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

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

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

spring-cloud-starter-turbine/pom.xml

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

spring-cloud-starter-zuul/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>1.3.1.RELEASE</version>
+		<version>1.3.1.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-starter-zuul</artifactId>