Browse Source

upgrade to netflix eureka to 1.1.147

fixes gh-180
pull/6/head
Spencer Gibb 10 years ago
parent
commit
32a9033661
  1. 14
      pom.xml
  2. 6
      spring-cloud-netflix-core/pom.xml
  3. 4
      spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBean.java
  4. 9
      spring-cloud-netflix-eureka-server/pom.xml

14
pom.xml

@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
<properties>
<main.basedir>${basedir}</main.basedir>
<archaius.version>0.6.3</archaius.version>
<eureka.version>1.1.145</eureka.version>
<eureka.version>1.1.147</eureka.version>
<feign.version>7.1.0</feign.version>
<hystrix.version>1.4.0-RC6</hystrix.version>
<ribbon.version>2.0-RC13</ribbon.version>
@ -153,6 +153,18 @@ @@ -153,6 +153,18 @@
</exclusion>
</exclusions>
</dependency>
<!-- Eureka core dep that is now optional -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.2</version>
</dependency>
<!-- Eureka server dep that is now optional -->
<dependency>
<groupId>com.netflix.blitz4j</groupId>
<artifactId>blitz4j</artifactId>
<version>1.34</version>
</dependency>
<dependency>
<groupId>com.netflix.feign</groupId>
<artifactId>feign-core</artifactId>

6
spring-cloud-netflix-core/pom.xml

@ -54,6 +54,12 @@ @@ -54,6 +54,12 @@
<artifactId>eureka-core</artifactId>
<optional>true</optional>
</dependency>
<!-- Eureka core deps that are now optional -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>net.java.dev.rome</groupId>
<artifactId>rome</artifactId>

4
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBean.java

@ -115,6 +115,10 @@ public class EurekaClientConfigBean implements EurekaClientConfig { @@ -115,6 +115,10 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
private boolean fetchRegistry = true;
private String dollarReplacement = "_-";
private String escapeCharReplacement = "__";
@Override
public boolean shouldGZipContent() {
return this.gZipContent;

9
spring-cloud-netflix-eureka-server/pom.xml

@ -70,6 +70,15 @@ @@ -70,6 +70,15 @@
<groupId>com.netflix.eureka</groupId>
<artifactId>eureka-core</artifactId>
</dependency>
<!-- Eureka deps that are now optional in eureka -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
<dependency>
<groupId>com.netflix.blitz4j</groupId>
<artifactId>blitz4j</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>

Loading…
Cancel
Save