Updating Hystrix Versions (#886)

OpenFeign · Feb 1, 2019 · db44bfe · db44bfe
1 parent bdb4613
commit db44bfe
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/hystrix/pom.xml b/hystrix/pom.xml
@@ -31,6 +31,22 @@
     <main.basedir>${project.basedir}/..</main.basedir>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.netflix.archaius</groupId>
+        <artifactId>archaius-core</artifactId>
+        <version>0.7.6</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.netflix.hystrix</groupId>
+        <artifactId>hystrix-core</artifactId>
+        <version>1.5.18</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -40,13 +56,11 @@
     <dependency>
       <groupId>com.netflix.archaius</groupId>
       <artifactId>archaius-core</artifactId>
-      <version>0.6.6</version>
     </dependency>
 
     <dependency>
       <groupId>com.netflix.hystrix</groupId>
       <artifactId>hystrix-core</artifactId>
-      <version>1.4.26</version>
     </dependency>
 
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -69,6 +69,7 @@
     <okhttp3.version>3.6.0</okhttp3.version>
     <gson.version>2.5</gson.version>
     <slf4j.version>1.7.13</slf4j.version>
+    <bouncy.version>1.60</bouncy.version>
 
     <junit.version>4.12</junit.version>
     <jackson.version>2.9.8</jackson.version>
@@ -275,6 +276,12 @@
         <version>${okhttp3.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcprov-jdk15on</artifactId>
+        <version>${bouncy.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>