Merge pull request #468 from 4finance/upgrade-spring

Upgrade Spring & Hystrix
4finance · Jul 7, 2015 · 1b0995d · 1b0995d
2 parents 59f9a9f + 730c6b5
commit 1b0995d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        springBootVersion = '1.2.4.RELEASE'
+        springBootVersion = '1.2.5.RELEASE'
     }
     repositories {
         mavenLocal()
@@ -80,7 +80,7 @@ allprojects {
                         details.useTarget("org.codehaus.groovy:groovy-all:${details.requested.version}")
                     }
                     if (details.requested.group == 'org.springframework.boot') { details.useVersion springBootVersion }
-                    if (details.requested.group == 'org.springframework') { details.useVersion "4.1.6.RELEASE" }
+                    if (details.requested.group == 'org.springframework') { details.useVersion '4.1.7.RELEASE' }
                     if (details.requested.group == 'org.aspectj') { details.useVersion '1.8.6' }
                 }
             }

diff --git a/micro-infra-spring-base/build.gradle b/micro-infra-spring-base/build.gradle
@@ -3,7 +3,7 @@ description = 'Microservice base infrastructure registered in Spring'
 ext {
     metricsVersion = '3.1.2'
     jacksonMapper = '1.9.13'
-    hystrixVersion = '1.4.11'
+    hystrixVersion = '1.4.12'
 }
 
 sourceSets.main.java.srcDirs = []
@@ -34,7 +34,7 @@ dependencies {
     testCompile 'org.hamcrest:hamcrest-library:1.3'
     testCompile 'org.hibernate:hibernate-validator:5.1.3.Final'
     testCompile 'com.jayway.jsonpath:json-path-assert:2.0.0'
-    testCompile 'com.github.stefanbirkner:system-rules:1.11.0'
+    testCompile 'com.github.stefanbirkner:system-rules:1.12.0'
     testCompile project(':micro-infra-spring-test')
     testCompile 'org.codehaus.gpars:gpars:1.2.1'
 }