SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

align versions to latest releases of Spring Boot 1.3.x (1.3.7) and current Brixton release of Spring Cloud

Browse Source
This commit is contained in:
Christian Posta
2016-08-16 09:53:03 -07:00
committed by Ioannis Canellos
parent 4e9147b309
commit de067f0ee2
3 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
pom.xml
View File

@@ -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>

6
spring-cloud-kubernetes-archaius/pom.xml
View File

@@ -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>

10
spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/TestApplication.groovy
View File

@@ -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();
}
}