From 58608e6101037251ea64b758a275262a8ba66ad9 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Wed, 24 Jun 2015 17:38:48 +0100
Subject: [PATCH] Update all integration tests to use Angel release train

---
 config-client-decrypt/pom.xml | 4 ++--
 config-client/pom.xml         | 4 ++--
 config-retry/pom.xml          | 4 ++--
 configserver-eureka/pom.xml   | 4 ++--
 eureka-first/pom.xml          | 4 ++--
 eureka-noweb/pom.xml          | 8 ++------
 feign-eureka/pom.xml          | 4 ++--
 feign/pom.xml                 | 4 ++--
 hystrix/pom.xml               | 4 ++--
 netflix-sidecar/pom.xml       | 5 ++---
 noweb/pom.xml                 | 4 ++--
 oauth2-ribbon/pom.xml         | 4 ++--
 ribbon-default-config/pom.xml | 6 +++---
 ribbon-eureka/pom.xml         | 4 ++--
 turbine/pom.xml               | 4 ++--
 zuul-config-discovery/pom.xml | 4 ++--
 zuul-proxy-eureka/pom.xml     | 4 ++--
 zuul-proxy/pom.xml            | 4 ++--
 zuul/pom.xml                  | 6 +++---
 19 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/config-client-decrypt/pom.xml b/config-client-decrypt/pom.xml
index 18d6915..176bb82 100644
--- a/config-client-decrypt/pom.xml
+++ b/config-client-decrypt/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-sample-config-client-decrypt</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>Angel.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-cloud-sample-config-client-decrypt</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>Angel.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/config-client/pom.xml b/config-client/pom.xml
index dedb82f..c09a07f 100644
--- a/config-client/pom.xml
+++ b/config-client/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-sample-config-client</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>Angel.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-cloud-sample-config-client</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>Angel.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/config-retry/pom.xml b/config-retry/pom.xml
index d94f1ef..99e6989 100644
--- a/config-retry/pom.xml
+++ b/config-retry/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-sample-config-retry</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>Angel.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-cloud-sample-config-retry</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>Angel.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/configserver-eureka/pom.xml b/configserver-eureka/pom.xml
index 70efc9f..2344f00 100644
--- a/configserver-eureka/pom.xml
+++ b/configserver-eureka/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-sample-configserver-eureka</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>Angel.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-cloud-sample-configserver-eureka</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>Angel.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/eureka-first/pom.xml b/eureka-first/pom.xml
index 6d8e1fb..32720d8 100644
--- a/eureka-first/pom.xml
+++ b/eureka-first/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-sample-eureka-first</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>Angel.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-cloud-sample-eureka-first</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>Angel.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/eureka-noweb/pom.xml b/eureka-noweb/pom.xml
index 0af9831..8bf43b6 100644
--- a/eureka-noweb/pom.xml
+++ b/eureka-noweb/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-sample-eureka-noweb</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>Angel.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-cloud-sample-eureka-noweb</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>Angel.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -36,10 +36,6 @@
 	</build>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-eureka</artifactId>
diff --git a/feign-eureka/pom.xml b/feign-eureka/pom.xml
index 8612a83..365f097 100644
--- a/feign-eureka/pom.xml
+++ b/feign-eureka/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-sample-feign-eureka</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>Angel.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-cloud-sample-feign-eureka</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>Angel.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/feign/pom.xml b/feign/pom.xml
index e20c9cf..49df24c 100644
--- a/feign/pom.xml
+++ b/feign/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-sample-feign</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>Angel.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-cloud-sample-feign</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>Angel.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/hystrix/pom.xml b/hystrix/pom.xml
index fe2aad5..95091d4 100644
--- a/hystrix/pom.xml
+++ b/hystrix/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-sample-hystrix</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>Angel.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-cloud-sample-hystrix</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>Angel.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/netflix-sidecar/pom.xml b/netflix-sidecar/pom.xml
index a8ae3ca..ebe8ee1 100644
--- a/netflix-sidecar/pom.xml
+++ b/netflix-sidecar/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-sample-netflix-sidecar</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>Angel.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-cloud-sample-netflix-sidecar</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>Angel.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -36,7 +36,6 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-netflix-sidecar</artifactId>
-			<version>1.0.3.BUILD-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/noweb/pom.xml b/noweb/pom.xml
index 2fad184..c13d5c2 100644
--- a/noweb/pom.xml
+++ b/noweb/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-sample-noweb</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>Angel.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-cloud-sample-noweb</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>Angel.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/oauth2-ribbon/pom.xml b/oauth2-ribbon/pom.xml
index 52ee41c..13cb6f9 100644
--- a/oauth2-ribbon/pom.xml
+++ b/oauth2-ribbon/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-sample-oauth2-ribbon</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>Angel.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-cloud-sample-oauth2-ribbon</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>Angel.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/ribbon-default-config/pom.xml b/ribbon-default-config/pom.xml
index 19a864f..bee4917 100644
--- a/ribbon-default-config/pom.xml
+++ b/ribbon-default-config/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.3.RELEASE</version>
+		<version>1.2.4.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-sample-ribbon-default-config</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>Angel.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<properties>
@@ -36,7 +36,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-starter-parent</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
+				<version>Angel.BUILD-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/ribbon-eureka/pom.xml b/ribbon-eureka/pom.xml
index 7f715dc..c895a72 100644
--- a/ribbon-eureka/pom.xml
+++ b/ribbon-eureka/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-sample-ribbon-eureka</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>Angel.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-cloud-sample-ribbon-eureka</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>Angel.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/turbine/pom.xml b/turbine/pom.xml
index 64045dc..4885e28 100644
--- a/turbine/pom.xml
+++ b/turbine/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-sample-turbine</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>Angel.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-cloud-sample-turbine</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>Angel.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/zuul-config-discovery/pom.xml b/zuul-config-discovery/pom.xml
index 9ce2b8b..138a91e 100755
--- a/zuul-config-discovery/pom.xml
+++ b/zuul-config-discovery/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-sample-zuul-config-discovery</artifactId>
-    <version>1.0.3.BUILD-SNAPSHOT</version>
+    <version>Angel.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>spring-cloud-sample-zuul-config-discovery</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>Angel.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
     <properties>
diff --git a/zuul-proxy-eureka/pom.xml b/zuul-proxy-eureka/pom.xml
index 2998ad1..90133e0 100644
--- a/zuul-proxy-eureka/pom.xml
+++ b/zuul-proxy-eureka/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-sample-zuul-proxy-eureka</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>Angel.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-cloud-sample-zuul-proxy-eureka</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>Angel.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/zuul-proxy/pom.xml b/zuul-proxy/pom.xml
index a65eac8..67c53d7 100644
--- a/zuul-proxy/pom.xml
+++ b/zuul-proxy/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-sample-zuul-proxy</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>Angel.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-cloud-sample-zuul-proxy</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>Angel.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/zuul/pom.xml b/zuul/pom.xml
index b66ef16..1ad11ce 100644
--- a/zuul/pom.xml
+++ b/zuul/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-sample-zuul</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>Angel.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-cloud-sample-zuul</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>Angel.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-parent</artifactId>
-			<version>1.0.3.BUILD-SNAPSHOT</version>
+			<version>Angel.BUILD-SNAPSHOT</version>
 			<type>pom</type>
 			<scope>import</scope>
 		</dependency>