From 46b844c2d5212e9ed6b4099a5a9f8a3e1c3c6fb6 Mon Sep 17 00:00:00 2001 From: "Davis, Kevin" Date: Wed, 30 Jan 2019 08:20:14 -0500 Subject: [PATCH] Updating Hystrix Versions --- hystrix/pom.xml | 18 ++++++++++++++++-- pom.xml | 7 +++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/hystrix/pom.xml b/hystrix/pom.xml index ae7c2db16c..c9f58de674 100644 --- a/hystrix/pom.xml +++ b/hystrix/pom.xml @@ -31,6 +31,22 @@ ${project.basedir}/.. + + + + com.netflix.archaius + archaius-core + 0.7.6 + + + + com.netflix.hystrix + hystrix-core + 1.5.18 + + + + ${project.groupId} @@ -40,13 +56,11 @@ com.netflix.archaius archaius-core - 0.6.6 com.netflix.hystrix hystrix-core - 1.4.26 diff --git a/pom.xml b/pom.xml index f9664f2960..10be87f449 100644 --- a/pom.xml +++ b/pom.xml @@ -69,6 +69,7 @@ 3.6.0 2.5 1.7.13 + 1.60 4.12 2.9.8 @@ -275,6 +276,12 @@ ${okhttp3.version} + + org.bouncycastle + bcprov-jdk15on + ${bouncy.version} + + com.fasterxml.jackson.core jackson-databind