From de067f0ee2a009ee30709776991d1ebcb1da411d Mon Sep 17 00:00:00 2001
From: Christian Posta <christian.posta@gmail.com>
Date: Tue, 16 Aug 2016 09:53:03 -0700
Subject: [PATCH] align versions to latest releases of Spring Boot 1.3.x
 (1.3.7) and current Brixton release of Spring Cloud

---
 pom.xml                                       | 60 +++++++------------
 spring-cloud-kubernetes-archaius/pom.xml      |  6 ++
 .../ribbon/test/TestApplication.groovy        | 10 +++-
 3 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/pom.xml b/pom.xml
index fbd1d742..0d294e3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,8 +81,9 @@
         <lombok.version>1.16.8</lombok.version>
         <servlet-api.version>2.5</servlet-api.version>
         <spock-spring.version>1.0-groovy-2.3</spock-spring.version>
-        <spring-boot.version>1.3.3.RELEASE</spring-boot.version>
-        <spring-cloud.version>1.0.4.RELEASE</spring-cloud.version>
+        <spring-boot.version>1.3.7.RELEASE</spring-boot.version>
+        <spring-cloud.version>Brixton.SR4</spring-cloud.version>
+        <!--<spring-cloud.version>1.1.1.RELEASE</spring-cloud.version>-->
         <spring-cloud-sleuth.version>1.0.0.RC1</spring-cloud-sleuth.version>
         <spring-cloud-netflix.version>1.0.7.RELEASE</spring-cloud-netflix.version>
         <spring.version>4.2.5.RELEASE</spring.version>
@@ -120,6 +121,24 @@
                 <scope>import</scope>
             </dependency>
 
+            <!-- Spring Boot-->
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!-- Spring Cloud -->
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <!-- Own dependencies -->
             <dependency>
                 <groupId>io.fabric8</groupId>
@@ -157,43 +176,8 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-netflix-dependencies</artifactId>
-                <version>${spring-cloud-netflix.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
 
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-sleuth-dependencies</artifactId>
-                <version>${spring-cloud-sleuth.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-actuator</artifactId>
-                <version>${spring-boot.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-autoconfigure</artifactId>
-                <version>${spring-boot.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-commons</artifactId>
-                <version>${spring-cloud.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-context</artifactId>
-                <version>${spring-cloud.version}</version>
-            </dependency>
+            <!-- 3rd Party -->
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-web</artifactId>
diff --git a/spring-cloud-kubernetes-archaius/pom.xml b/spring-cloud-kubernetes-archaius/pom.xml
index da1f47b9..492168a0 100644
--- a/spring-cloud-kubernetes-archaius/pom.xml
+++ b/spring-cloud-kubernetes-archaius/pom.xml
@@ -61,6 +61,12 @@
             <optional>true</optional>
         </dependency>
 
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <optional>true</optional>
+      </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
diff --git a/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/TestApplication.groovy b/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/TestApplication.groovy
index 8cf486f1..99a9a1ab 100644
--- a/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/TestApplication.groovy
+++ b/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/TestApplication.groovy
@@ -16,9 +16,11 @@
  */
 
 package io.fabric8.spring.cloud.kubernetes.ribbon.test
-
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.cloud.client.loadbalancer.LoadBalanced
+import org.springframework.context.annotation.Bean
+import org.springframework.web.client.RestTemplate
 
 @SpringBootApplication
 class TestApplication {
@@ -26,4 +28,10 @@ class TestApplication {
     def main(String[] args) {
         SpringApplication.run(TestApplication.class, args);
     }
+
+    @LoadBalanced
+    @Bean
+    def RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
 }
\ No newline at end of file