From 9c27508cf9d200f67271bb557b2c8005cb39b835 Mon Sep 17 00:00:00 2001 From: DOHA Date: Fri, 9 Dec 2016 00:16:17 +0200 Subject: [PATCH] upgrade dependencies --- spring-cloud/pom.xml | 14 +++++++++++-- .../spring-cloud-bootstrap/config/pom.xml | 10 +++++++--- .../spring-cloud-bootstrap/discovery/pom.xml | 14 +++++++++---- .../spring-cloud-bootstrap/gateway/pom.xml | 14 +++++++++---- .../spring-cloud-bootstrap/resource/pom.xml | 13 ++++++++---- .../spring-cloud-config/client/pom.xml | 7 ++++++- spring-cloud/spring-cloud-config/pom.xml | 7 ++++--- .../spring-cloud-config/server/pom.xml | 8 +++++++- spring-cloud/spring-cloud-eureka/pom.xml | 6 ++++-- .../spring-cloud-eureka-client/pom.xml | 12 ++++++++--- .../spring-cloud-eureka-feign-client/pom.xml | 15 ++++++++++---- .../spring-cloud-eureka-server/pom.xml | 9 +++++++-- .../feign-rest-consumer/pom.xml | 20 ++++++++++++------- spring-cloud/spring-cloud-hystrix/pom.xml | 6 ++++-- .../rest-consumer/pom.xml | 18 +++++++++++------ .../rest-producer/pom.xml | 6 +++++- .../spring-cloud-ribbon-client/pom.xml | 7 ++++--- 17 files changed, 134 insertions(+), 52 deletions(-) diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml index 455a5b876b..299115634e 100644 --- a/spring-cloud/pom.xml +++ b/spring-cloud/pom.xml @@ -26,6 +26,16 @@ UTF-8 + 1.2.2.RELEASE + Brixton.SR7 + 1.2.2.RELEASE + 1.2.2.RELEASE + 1.2.3.RELEASE + 1.2.3.RELEASE + 1.2.3.RELEASE + 1.4.2.RELEASE + 3.6.0 + 1.4.2.RELEASE @@ -34,7 +44,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + ${maven-compiler-plugin.version} 1.8 1.8 @@ -43,7 +53,7 @@ org.springframework.boot spring-boot-maven-plugin - 1.4.0.RELEASE + ${spring-boot-maven-plugin.version} diff --git a/spring-cloud/spring-cloud-bootstrap/config/pom.xml b/spring-cloud/spring-cloud-bootstrap/config/pom.xml index bcb40ac062..24d054a87b 100644 --- a/spring-cloud/spring-cloud-bootstrap/config/pom.xml +++ b/spring-cloud/spring-cloud-bootstrap/config/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE @@ -39,7 +39,7 @@ org.springframework.cloud spring-cloud-dependencies - Brixton.RELEASE + ${spring-cloud-dependencies.version} pom import @@ -55,7 +55,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 + ${maven-compiler-plugin.version} 1.8 1.8 @@ -64,4 +64,8 @@ + + Brixton.SR7 + 3.6.0 + \ No newline at end of file diff --git a/spring-cloud/spring-cloud-bootstrap/discovery/pom.xml b/spring-cloud/spring-cloud-bootstrap/discovery/pom.xml index f3cb3be2af..6d5d2cfe0b 100644 --- a/spring-cloud/spring-cloud-bootstrap/discovery/pom.xml +++ b/spring-cloud/spring-cloud-bootstrap/discovery/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE @@ -36,7 +36,7 @@ org.springframework.session spring-session - 1.2.1.RELEASE + ${spring-session.version} org.springframework.boot @@ -49,7 +49,7 @@ org.springframework.cloud spring-cloud-dependencies - Brixton.RELEASE + ${spring-cloud-dependencies.version} pom import @@ -65,7 +65,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 + ${maven-compiler-plugin.version} 1.8 1.8 @@ -73,4 +73,10 @@ + + + 1.2.2.RELEASE + Brixton.SR7 + 3.6.0 + \ No newline at end of file diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/pom.xml b/spring-cloud/spring-cloud-bootstrap/gateway/pom.xml index add551ff95..fb075e1e2c 100644 --- a/spring-cloud/spring-cloud-bootstrap/gateway/pom.xml +++ b/spring-cloud/spring-cloud-bootstrap/gateway/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE @@ -35,7 +35,7 @@ org.springframework.session spring-session - 1.2.1.RELEASE + ${spring-session.version} org.springframework.boot @@ -54,7 +54,7 @@ org.springframework.cloud spring-cloud-dependencies - Brixton.RELEASE + ${spring-cloud-dependencies.version} pom import @@ -70,7 +70,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 + ${maven-compiler-plugin.version} 1.8 1.8 @@ -78,4 +78,10 @@ + + + 1.2.2.RELEASE + Brixton.SR7 + 3.6.0 + \ No newline at end of file diff --git a/spring-cloud/spring-cloud-bootstrap/resource/pom.xml b/spring-cloud/spring-cloud-bootstrap/resource/pom.xml index 8940ca71da..b1ea652be4 100644 --- a/spring-cloud/spring-cloud-bootstrap/resource/pom.xml +++ b/spring-cloud/spring-cloud-bootstrap/resource/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE @@ -35,7 +35,7 @@ org.springframework.session spring-session - 1.2.1.RELEASE + ${spring-session.version} org.springframework.boot @@ -54,7 +54,7 @@ org.springframework.cloud spring-cloud-dependencies - Brixton.RELEASE + ${spring-cloud-dependencies.version} pom import @@ -70,7 +70,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 + ${maven-compiler-plugin.version} 1.8 1.8 @@ -78,4 +78,9 @@ + + 1.2.2.RELEASE + Brixton.SR7 + 3.6.0 + \ No newline at end of file diff --git a/spring-cloud/spring-cloud-config/client/pom.xml b/spring-cloud/spring-cloud-config/client/pom.xml index 2c4b748e8a..24da043515 100644 --- a/spring-cloud/spring-cloud-config/client/pom.xml +++ b/spring-cloud/spring-cloud-config/client/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-starter-config - 1.2.0.RELEASE + ${spring-cloud-starter-config.version} org.springframework.boot @@ -38,4 +38,9 @@ + + + 1.2.2.RELEASE + 1.4.2.RELEASE + diff --git a/spring-cloud/spring-cloud-config/pom.xml b/spring-cloud/spring-cloud-config/pom.xml index 7d9fd97ee4..d25037a49f 100644 --- a/spring-cloud/spring-cloud-config/pom.xml +++ b/spring-cloud/spring-cloud-config/pom.xml @@ -16,7 +16,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.1.RELEASE + 1.4.2.RELEASE @@ -25,7 +25,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR1 + ${spring-cloud-dependencies.version} pom import @@ -52,7 +52,8 @@ UTF-8 UTF-8 1.8 - 1.4.1.RELEASE + 1.4.2.RELEASE 2.19.1 + Brixton.SR7 diff --git a/spring-cloud/spring-cloud-config/server/pom.xml b/spring-cloud/spring-cloud-config/server/pom.xml index 33fac435b1..fff6b0f3ee 100644 --- a/spring-cloud/spring-cloud-config/server/pom.xml +++ b/spring-cloud/spring-cloud-config/server/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-config-server - 1.2.0.RELEASE + ${spring-cloud-config-server.version} org.springframework.boot @@ -44,4 +44,10 @@ + + + 1.2.2.RELEASE + 1.4.2.RELEASE + + diff --git a/spring-cloud/spring-cloud-eureka/pom.xml b/spring-cloud/spring-cloud-eureka/pom.xml index f02bf7ad9c..2c3b4032af 100644 --- a/spring-cloud/spring-cloud-eureka/pom.xml +++ b/spring-cloud/spring-cloud-eureka/pom.xml @@ -25,6 +25,8 @@ UTF-8 + 3.6.0 + 1.4.2.RELEASE @@ -33,7 +35,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + ${maven-compiler-plugin.version} 1.8 1.8 @@ -42,7 +44,7 @@ org.springframework.boot spring-boot-maven-plugin - 1.4.0.RELEASE + ${spring-boot-maven-plugin.version} diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml index 720b49ddc2..a56c732e40 100644 --- a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml +++ b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml @@ -21,12 +21,12 @@ org.springframework.cloud spring-cloud-starter-eureka - 1.1.5.RELEASE + ${spring-cloud-starter-eureka.version} org.springframework.boot spring-boot-starter-web - 1.4.0.RELEASE + ${spring-boot-starter-web.version} @@ -35,7 +35,7 @@ org.springframework.cloud spring-cloud-starter-parent - Brixton.SR4 + ${spring-cloud-dependencies.version} pom import @@ -54,4 +54,10 @@ + + + Brixton.SR7 + 1.2.3.RELEASE + 1.4.2.RELEASE + diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml index 9e639c666a..cb3c6fc289 100644 --- a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml +++ b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml @@ -26,17 +26,17 @@ org.springframework.cloud spring-cloud-starter-feign - 1.1.5.RELEASE + ${spring-cloud-starter-feign.version} org.springframework.boot spring-boot-starter-web - 1.4.0.RELEASE + ${spring-boot-starter-web.version} org.springframework.boot spring-boot-starter-thymeleaf - 1.4.0.RELEASE + ${spring-boot-starter-web.version} @@ -45,7 +45,7 @@ org.springframework.cloud spring-cloud-starter-parent - Brixton.SR4 + ${spring-cloud-dependencies.version} pom import @@ -64,4 +64,11 @@ + + + Brixton.SR7 + 1.2.3.RELEASE + 1.2.3.RELEASE + 1.4.2.RELEASE + diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml index f4d655f708..a728712ead 100644 --- a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml +++ b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml @@ -21,7 +21,7 @@ org.springframework.cloud spring-cloud-starter-eureka-server - 1.1.5.RELEASE + ${spring-cloud-starter-eureka.version} @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-starter-parent - Brixton.SR4 + ${spring-cloud-dependencies.version} pom import @@ -49,4 +49,9 @@ + + + Brixton.SR7 + 1.2.3.RELEASE + diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/pom.xml b/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/pom.xml index 8209dc8c67..9c8d88ae8e 100644 --- a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/pom.xml +++ b/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/pom.xml @@ -25,32 +25,32 @@ org.springframework.cloud spring-cloud-starter-hystrix - 1.1.5.RELEASE + ${spring-cloud-starter-hystrix.version} org.springframework.cloud spring-cloud-starter-hystrix-dashboard - 1.1.5.RELEASE + ${spring-cloud-starter-hystrix.version} org.springframework.cloud spring-cloud-starter-feign - 1.1.5.RELEASE + ${spring-cloud-starter-feign.version} org.springframework.boot spring-boot-starter-web - 1.4.0.RELEASE + ${spring-boot-starter-web.version} org.springframework.boot spring-boot-starter-thymeleaf - 1.4.0.RELEASE + ${spring-boot-starter-web.version} org.springframework.boot spring-boot-starter-actuator - 1.4.0.RELEASE + ${spring-boot-starter-web.version} @@ -59,7 +59,7 @@ org.springframework.cloud spring-cloud-starter-parent - Brixton.SR4 + ${spring-cloud-dependencies.version} pom import @@ -78,4 +78,10 @@ + + + 1.2.3.RELEASE + 1.2.3.RELEASE + 1.4.2.RELEASE + diff --git a/spring-cloud/spring-cloud-hystrix/pom.xml b/spring-cloud/spring-cloud-hystrix/pom.xml index b992ce3846..67f50e3a91 100644 --- a/spring-cloud/spring-cloud-hystrix/pom.xml +++ b/spring-cloud/spring-cloud-hystrix/pom.xml @@ -24,6 +24,8 @@ UTF-8 + 3.6.0 + 1.4.2.RELEASE @@ -32,7 +34,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + ${maven-compiler-plugin.version} 1.8 1.8 @@ -41,7 +43,7 @@ org.springframework.boot spring-boot-maven-plugin - 1.4.0.RELEASE + ${spring-boot-maven-plugin.version} diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/pom.xml b/spring-cloud/spring-cloud-hystrix/rest-consumer/pom.xml index 649ca88eb3..02c009510e 100644 --- a/spring-cloud/spring-cloud-hystrix/rest-consumer/pom.xml +++ b/spring-cloud/spring-cloud-hystrix/rest-consumer/pom.xml @@ -20,27 +20,27 @@ org.springframework.cloud spring-cloud-starter-hystrix - 1.1.5.RELEASE + ${spring-cloud-starter-hystrix.version} org.springframework.cloud spring-cloud-starter-hystrix-dashboard - 1.1.5.RELEASE + ${spring-cloud-starter-hystrix.version} org.springframework.boot spring-boot-starter-web - 1.4.0.RELEASE + ${spring-boot-starter-web.version} org.springframework.boot spring-boot-starter-thymeleaf - 1.4.0.RELEASE + ${spring-boot-starter-web.version} org.springframework.boot spring-boot-starter-actuator - 1.4.0.RELEASE + ${spring-boot-starter-web.version} @@ -49,7 +49,7 @@ org.springframework.cloud spring-cloud-starter-parent - Brixton.SR4 + ${spring-cloud-dependencies.version} pom import @@ -68,4 +68,10 @@ + + + Brixton.SR7 + 1.2.3.RELEASE + 1.4.2.RELEASE + diff --git a/spring-cloud/spring-cloud-hystrix/rest-producer/pom.xml b/spring-cloud/spring-cloud-hystrix/rest-producer/pom.xml index 726d18d2c3..85d5a4a11e 100644 --- a/spring-cloud/spring-cloud-hystrix/rest-producer/pom.xml +++ b/spring-cloud/spring-cloud-hystrix/rest-producer/pom.xml @@ -20,7 +20,7 @@ org.springframework.boot spring-boot-starter-web - 1.4.0.RELEASE + ${spring-boot-starter-web.version} @@ -36,4 +36,8 @@ + + + Brixton.SR7 + diff --git a/spring-cloud/spring-cloud-ribbon-client/pom.xml b/spring-cloud/spring-cloud-ribbon-client/pom.xml index c597c5ab8e..d4862fc4e8 100644 --- a/spring-cloud/spring-cloud-ribbon-client/pom.xml +++ b/spring-cloud/spring-cloud-ribbon-client/pom.xml @@ -11,14 +11,15 @@ org.springframework.boot spring-boot-starter-parent - 1.4.1.RELEASE + 1.4.2.RELEASE UTF-8 1.8 - + Brixton.SR7 + @@ -42,7 +43,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR1 + ${spring-cloud-dependencies.version} pom import