Merge branch '2.1.x'

This commit is contained in:
Spencer Gibb
2019-09-04 15:54:32 -04:00

View File

@@ -16,7 +16,7 @@
<properties>
<archaius.version>0.7.6</archaius.version>
<concurrency-limits.version>0.1.12</concurrency-limits.version>
<eureka.version>1.9.12</eureka.version>
<eureka.version>1.9.13</eureka.version>
<hystrix.version>1.5.18</hystrix.version>
<ribbon.version>2.3.0</ribbon.version>
<servo.version>0.12.21</servo.version>
@@ -181,6 +181,10 @@
<artifactId>eureka-client</artifactId>
<version>${eureka.version}</version>
<exclusions>
<exclusion>
<groupId>com.github.vlsi.compactmap</groupId>
<artifactId>compactmap</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>