diff --git a/build.gradle b/build.gradle index 5ee56d9360..9289d8642d 100644 --- a/build.gradle +++ b/build.gradle @@ -45,9 +45,9 @@ allprojects { servoVersion = '0.12.21' governatorVersion = '1.17.5' archaiusVersion = '0.7.6' - jacksonVersion = '2.10.5' - jacksonDatabindVersion = '2.10.5.1' + jacksonVersion = '2.11.4' woodstoxVersion = '5.2.1' + slf4jVersion = '1.7.36' // test deps jetty_version = '7.2.0.v20101020' diff --git a/eureka-client/build.gradle b/eureka-client/build.gradle index af9dfdceb7..13ce1373c6 100644 --- a/eureka-client/build.gradle +++ b/eureka-client/build.gradle @@ -23,7 +23,8 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}" - compile "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}" + compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" + compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}" // Eureka client uses JSON encoding by default compileOnly "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jacksonVersion}" diff --git a/eureka-core-jersey2/build.gradle b/eureka-core-jersey2/build.gradle index b33c59912c..208f85e36f 100644 --- a/eureka-core-jersey2/build.gradle +++ b/eureka-core-jersey2/build.gradle @@ -20,5 +20,5 @@ dependencies { testCompile "junit:junit:${junit_version}" testCompile "org.mock-server:mockserver-netty:${mockserverVersion}" testCompile "org.mockito:mockito-core:${mockitoVersion}" - testRuntime 'org.slf4j:slf4j-simple:1.7.10' + testRuntime "org.slf4j:slf4j-simple:${slf4jVersion}" } diff --git a/eureka-core/build.gradle b/eureka-core/build.gradle index 8fb3fe1e15..3128bb7987 100644 --- a/eureka-core/build.gradle +++ b/eureka-core/build.gradle @@ -20,5 +20,5 @@ dependencies { testCompile "org.mock-server:mockserver-netty:${mockserverVersion}" testCompile "com.jcraft:jzlib:1.1.3" // netty dependency testCompile "org.mockito:mockito-core:${mockitoVersion}" - testRuntime 'org.slf4j:slf4j-simple:1.7.10' + testRuntime "org.slf4j:slf4j-simple:${slf4jVersion}" } diff --git a/eureka-examples/build.gradle b/eureka-examples/build.gradle index ee0dca504a..65ccad8e33 100644 --- a/eureka-examples/build.gradle +++ b/eureka-examples/build.gradle @@ -5,7 +5,7 @@ dependencies { compile files('conf') compile "com.netflix.governator:governator:${governatorVersion}" - runtimeOnly 'org.slf4j:slf4j-simple:1.7.7' + runtimeOnly "org.slf4j:slf4j-simple:${slf4jVersion}" } startScripts.enabled = false diff --git a/eureka-server-governator/build.gradle b/eureka-server-governator/build.gradle index 66101bebbb..bc944d330e 100644 --- a/eureka-server-governator/build.gradle +++ b/eureka-server-governator/build.gradle @@ -9,7 +9,7 @@ dependencies { compile "com.sun.jersey:jersey-server:${jerseyVersion}" compile "com.sun.jersey:jersey-servlet:${jerseyVersion}" compile "com.sun.jersey.contribs:jersey-guice:${jerseyVersion}" - compile 'org.slf4j:slf4j-log4j12:1.6.1' + compile "org.slf4j:slf4j-log4j12:${slf4jVersion}" runtimeOnly 'org.codehaus.jettison:jettison:1.2' providedCompile "javax.servlet:servlet-api:${servletVersion}" diff --git a/eureka-server/build.gradle b/eureka-server/build.gradle index 7cf551ee41..4fa067c184 100644 --- a/eureka-server/build.gradle +++ b/eureka-server/build.gradle @@ -5,7 +5,7 @@ dependencies { compile project(':eureka-core') compile "com.sun.jersey:jersey-server:$jerseyVersion" compile "com.sun.jersey:jersey-servlet:$jerseyVersion" - compile 'org.slf4j:slf4j-log4j12:1.6.1' + compile "org.slf4j:slf4j-log4j12:${slf4jVersion}" compile 'org.glassfish.jaxb:jaxb-runtime:2.3.3' runtimeOnly 'xerces:xercesImpl:2.12.0'