From a749308a3c0cc8dc1effab059b7f9f9bd073a19d Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 10 Sep 2015 13:01:56 -0600 Subject: [PATCH 1/6] Update SNAPSHOT to MILESTONE --- docs/pom.xml | 4 +- pom.xml | 42 +++++++++---------- spring-cloud-netflix-core/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 4 +- spring-cloud-netflix-hystrix-amqp/pom.xml | 2 +- .../pom.xml | 4 +- spring-cloud-netflix-sidecar/pom.xml | 2 +- spring-cloud-netflix-turbine-amqp/pom.xml | 2 +- spring-cloud-netflix-turbine/pom.xml | 2 +- spring-cloud-starter-eureka-server/pom.xml | 2 +- spring-cloud-starter-eureka/pom.xml | 2 +- spring-cloud-starter-feign/pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-starter-hystrix/pom.xml | 2 +- spring-cloud-starter-ribbon/pom.xml | 2 +- spring-cloud-starter-turbine-amqp/pom.xml | 2 +- spring-cloud-starter-turbine/pom.xml | 2 +- spring-cloud-starter-zuul/pom.xml | 2 +- 18 files changed, 41 insertions(+), 41 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 555c228f32..0e3de2d0bc 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,13 +5,13 @@ org.springframework.cloud spring-cloud-build - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 spring-cloud-netflix-docs pom Spring Cloud Netflix Docs - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 Spring Cloud Docs spring-cloud-netflix diff --git a/pom.xml b/pom.xml index 3496558628..01e4fad37d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ org.springframework.cloud spring-cloud-build - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 pom Spring Cloud Netflix Spring Cloud Netflix @@ -21,8 +21,8 @@ netflix - 1.1.0.BUILD-SNAPSHOT - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 + 1.1.0.M1 ${basedir} 0.6.5 1.2.0 @@ -83,87 +83,87 @@ org.springframework.cloud spring-cloud-starter-eureka - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 org.springframework.cloud spring-cloud-starter-eureka-server - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 org.springframework.cloud spring-cloud-starter-feign - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 org.springframework.cloud spring-cloud-starter-hystrix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 org.springframework.cloud spring-cloud-starter-hystrix-dashboard - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 org.springframework.cloud spring-cloud-starter-ribbon - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 org.springframework.cloud spring-cloud-starter-turbine - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 org.springframework.cloud spring-cloud-starter-turbine-amqp - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 org.springframework.cloud spring-cloud-starter-zuul - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 org.springframework.cloud spring-cloud-netflix-core - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 org.springframework.cloud spring-cloud-netflix-eureka-server - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 org.springframework.cloud spring-cloud-netflix-hystrix-dashboard - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 org.springframework.cloud spring-cloud-netflix-hystrix-amqp - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 org.springframework.cloud spring-cloud-netflix-sidecar - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 org.springframework.cloud spring-cloud-netflix-turbine - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 org.springframework.cloud spring-cloud-netflix-turbine-amqp - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 org.springframework.cloud spring-cloud-netflix-zuul-server - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 com.netflix.archaius diff --git a/spring-cloud-netflix-core/pom.xml b/spring-cloud-netflix-core/pom.xml index 2f60a32bb8..1c14429001 100644 --- a/spring-cloud-netflix-core/pom.xml +++ b/spring-cloud-netflix-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-netflix-core diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index 2d6925eb37..0381128390 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-netflix-eureka-server @@ -13,7 +13,7 @@ http://projects.spring.io/spring-cloud/ ${basedir}/.. - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 1.7.6 diff --git a/spring-cloud-netflix-hystrix-amqp/pom.xml b/spring-cloud-netflix-hystrix-amqp/pom.xml index 3fc9fcf013..48cc60ec91 100644 --- a/spring-cloud-netflix-hystrix-amqp/pom.xml +++ b/spring-cloud-netflix-hystrix-amqp/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-netflix-hystrix-amqp diff --git a/spring-cloud-netflix-hystrix-dashboard/pom.xml b/spring-cloud-netflix-hystrix-dashboard/pom.xml index 7ba0cf19a8..529409204a 100644 --- a/spring-cloud-netflix-hystrix-dashboard/pom.xml +++ b/spring-cloud-netflix-hystrix-dashboard/pom.xml @@ -8,12 +8,12 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. ${basedir}/.. - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 diff --git a/spring-cloud-netflix-sidecar/pom.xml b/spring-cloud-netflix-sidecar/pom.xml index a03b3d1365..f89009bc64 100644 --- a/spring-cloud-netflix-sidecar/pom.xml +++ b/spring-cloud-netflix-sidecar/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-netflix-sidecar diff --git a/spring-cloud-netflix-turbine-amqp/pom.xml b/spring-cloud-netflix-turbine-amqp/pom.xml index 2d9724c52b..715d994289 100644 --- a/spring-cloud-netflix-turbine-amqp/pom.xml +++ b/spring-cloud-netflix-turbine-amqp/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-netflix-turbine-amqp diff --git a/spring-cloud-netflix-turbine/pom.xml b/spring-cloud-netflix-turbine/pom.xml index 3d3b84ba57..db0e5ea3aa 100644 --- a/spring-cloud-netflix-turbine/pom.xml +++ b/spring-cloud-netflix-turbine/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-netflix-turbine diff --git a/spring-cloud-starter-eureka-server/pom.xml b/spring-cloud-starter-eureka-server/pom.xml index bb650d396f..68ac6132cb 100644 --- a/spring-cloud-starter-eureka-server/pom.xml +++ b/spring-cloud-starter-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-starter-eureka-server diff --git a/spring-cloud-starter-eureka/pom.xml b/spring-cloud-starter-eureka/pom.xml index 25f86ccdee..845cffd4aa 100644 --- a/spring-cloud-starter-eureka/pom.xml +++ b/spring-cloud-starter-eureka/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-starter-eureka diff --git a/spring-cloud-starter-feign/pom.xml b/spring-cloud-starter-feign/pom.xml index e99d66434e..85f01c3a44 100644 --- a/spring-cloud-starter-feign/pom.xml +++ b/spring-cloud-starter-feign/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-starter-feign diff --git a/spring-cloud-starter-hystrix-dashboard/pom.xml b/spring-cloud-starter-hystrix-dashboard/pom.xml index 557594ba7e..87c50a2bf0 100644 --- a/spring-cloud-starter-hystrix-dashboard/pom.xml +++ b/spring-cloud-starter-hystrix-dashboard/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-starter-hystrix-dashboard diff --git a/spring-cloud-starter-hystrix/pom.xml b/spring-cloud-starter-hystrix/pom.xml index ad30d4e3c5..d381701897 100644 --- a/spring-cloud-starter-hystrix/pom.xml +++ b/spring-cloud-starter-hystrix/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-starter-hystrix diff --git a/spring-cloud-starter-ribbon/pom.xml b/spring-cloud-starter-ribbon/pom.xml index e984ca677b..a79998a3c0 100644 --- a/spring-cloud-starter-ribbon/pom.xml +++ b/spring-cloud-starter-ribbon/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-starter-ribbon diff --git a/spring-cloud-starter-turbine-amqp/pom.xml b/spring-cloud-starter-turbine-amqp/pom.xml index 12a30ec33e..c20857e097 100644 --- a/spring-cloud-starter-turbine-amqp/pom.xml +++ b/spring-cloud-starter-turbine-amqp/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-starter-turbine-amqp diff --git a/spring-cloud-starter-turbine/pom.xml b/spring-cloud-starter-turbine/pom.xml index fa17b95ff6..a31851a73c 100644 --- a/spring-cloud-starter-turbine/pom.xml +++ b/spring-cloud-starter-turbine/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-starter-turbine diff --git a/spring-cloud-starter-zuul/pom.xml b/spring-cloud-starter-zuul/pom.xml index a99c1892c1..be77d54a1b 100644 --- a/spring-cloud-starter-zuul/pom.xml +++ b/spring-cloud-starter-zuul/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-starter-zuul From 6c5515219c5ec11edaf03e827efd4a8e297ee14a Mon Sep 17 00:00:00 2001 From: Micheal Swiggs Date: Mon, 5 Oct 2015 15:37:20 +0100 Subject: [PATCH 2/6] Enables hystrix monitoring of multiple services on a single physical server. --- spring-cloud-netflix-turbine/pom.xml | 3 ++- .../cloud/netflix/turbine/EurekaInstanceDiscovery.java | 10 ++++++++-- .../cloud/netflix/turbine/TurbineProperties.java | 2 ++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/spring-cloud-netflix-turbine/pom.xml b/spring-cloud-netflix-turbine/pom.xml index db0e5ea3aa..3abb28a80f 100644 --- a/spring-cloud-netflix-turbine/pom.xml +++ b/spring-cloud-netflix-turbine/pom.xml @@ -8,7 +8,8 @@ 1.1.0.M1 .. - spring-cloud-netflix-turbine + spring-cloud-netflix-turbine + 1.1.0.M1-fixes jar Spring Cloud Netflix Turbine http://projects.spring.io/spring-cloud/ diff --git a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/EurekaInstanceDiscovery.java b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/EurekaInstanceDiscovery.java index c854ea33a3..e9514f5c50 100644 --- a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/EurekaInstanceDiscovery.java +++ b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/EurekaInstanceDiscovery.java @@ -61,12 +61,14 @@ public class EurekaInstanceDiscovery implements InstanceDiscovery { private final EurekaClient eurekaClient; private final Expression clusterNameExpression; + private final boolean combineHostPort; public EurekaInstanceDiscovery(TurbineProperties turbineProperties, EurekaClient eurekaClient) { this.eurekaClient = eurekaClient; SpelExpressionParser parser = new SpelExpressionParser(); this.clusterNameExpression = parser.parseExpression(turbineProperties .getClusterNameExpression()); + this.combineHostPort = turbineProperties.isCombineHostPort(); } /** @@ -142,10 +144,12 @@ private List getInstancesForApp(String appName) throws Exception { */ protected Instance marshallInstanceInfo(InstanceInfo instanceInfo) { String hostname = instanceInfo.getHostName(); + String port = String.valueOf(instanceInfo.getPort()); String cluster = getClusterName(instanceInfo); Boolean status = parseInstanceStatus(instanceInfo.getStatus()); if (hostname != null && cluster != null && status != null) { - Instance instance = new Instance(hostname, cluster, status); + String hostPart = combineHostPort ? hostname+":"+port+"/" : hostname; + Instance instance = new Instance(hostPart, cluster, status); Map metadata = instanceInfo.getMetadata(); if (metadata != null) { instance.getAttributes().putAll(metadata); @@ -154,7 +158,9 @@ protected Instance marshallInstanceInfo(InstanceInfo instanceInfo) { if (asgName != null) { instance.getAttributes().put("asg", asgName); } - instance.getAttributes().put("port", String.valueOf(instanceInfo.getPort())); + if (!combineHostPort) { + instance.getAttributes().put("port", String.valueOf(instanceInfo.getPort())); + } DataCenterInfo dcInfo = instanceInfo.getDataCenterInfo(); if (dcInfo != null && dcInfo.getName().equals(DataCenterInfo.Name.Amazon)) { AmazonInfo amznInfo = (AmazonInfo) dcInfo; diff --git a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineProperties.java b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineProperties.java index c53eac1800..86e5cdbc4f 100644 --- a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineProperties.java +++ b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineProperties.java @@ -29,4 +29,6 @@ public class TurbineProperties { private String clusterNameExpression = "appName"; + private boolean combineHostPort = false; + } From 570b9f104f464ce973c1a02fca77f9f48a622a3f Mon Sep 17 00:00:00 2001 From: Micheal Swiggs Date: Mon, 5 Oct 2015 15:58:52 +0100 Subject: [PATCH 3/6] Changes versions --- docs/pom.xml | 4 +- pom.xml | 42 +++++++++---------- spring-cloud-netflix-core/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 4 +- spring-cloud-netflix-hystrix-amqp/pom.xml | 2 +- .../pom.xml | 4 +- spring-cloud-netflix-sidecar/pom.xml | 2 +- spring-cloud-netflix-turbine-amqp/pom.xml | 2 +- spring-cloud-netflix-turbine/pom.xml | 4 +- spring-cloud-starter-eureka-server/pom.xml | 2 +- spring-cloud-starter-eureka/pom.xml | 2 +- spring-cloud-starter-feign/pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-starter-hystrix/pom.xml | 2 +- spring-cloud-starter-ribbon/pom.xml | 2 +- spring-cloud-starter-turbine-amqp/pom.xml | 2 +- spring-cloud-starter-turbine/pom.xml | 2 +- spring-cloud-starter-zuul/pom.xml | 2 +- 18 files changed, 42 insertions(+), 42 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 0e3de2d0bc..555c228f32 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,13 +5,13 @@ org.springframework.cloud spring-cloud-build - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT spring-cloud-netflix-docs pom Spring Cloud Netflix Docs - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT Spring Cloud Docs spring-cloud-netflix diff --git a/pom.xml b/pom.xml index 01e4fad37d..3496558628 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ org.springframework.cloud spring-cloud-build - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT spring-cloud-netflix - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT pom Spring Cloud Netflix Spring Cloud Netflix @@ -21,8 +21,8 @@ netflix - 1.1.0.M1 - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT + 1.1.0.BUILD-SNAPSHOT ${basedir} 0.6.5 1.2.0 @@ -83,87 +83,87 @@ org.springframework.cloud spring-cloud-starter-eureka - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter-eureka-server - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter-feign - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter-hystrix - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter-hystrix-dashboard - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter-ribbon - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter-turbine - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter-turbine-amqp - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter-zuul - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-netflix-core - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-netflix-eureka-server - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-netflix-hystrix-dashboard - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-netflix-hystrix-amqp - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-netflix-sidecar - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-netflix-turbine - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-netflix-turbine-amqp - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-netflix-zuul-server - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT com.netflix.archaius diff --git a/spring-cloud-netflix-core/pom.xml b/spring-cloud-netflix-core/pom.xml index 1c14429001..2f60a32bb8 100644 --- a/spring-cloud-netflix-core/pom.xml +++ b/spring-cloud-netflix-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT .. spring-cloud-netflix-core diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index 0381128390..2d6925eb37 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT .. spring-cloud-netflix-eureka-server @@ -13,7 +13,7 @@ http://projects.spring.io/spring-cloud/ ${basedir}/.. - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT 1.7.6 diff --git a/spring-cloud-netflix-hystrix-amqp/pom.xml b/spring-cloud-netflix-hystrix-amqp/pom.xml index 48cc60ec91..3fc9fcf013 100644 --- a/spring-cloud-netflix-hystrix-amqp/pom.xml +++ b/spring-cloud-netflix-hystrix-amqp/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT .. spring-cloud-netflix-hystrix-amqp diff --git a/spring-cloud-netflix-hystrix-dashboard/pom.xml b/spring-cloud-netflix-hystrix-dashboard/pom.xml index 529409204a..7ba0cf19a8 100644 --- a/spring-cloud-netflix-hystrix-dashboard/pom.xml +++ b/spring-cloud-netflix-hystrix-dashboard/pom.xml @@ -8,12 +8,12 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT .. ${basedir}/.. - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT diff --git a/spring-cloud-netflix-sidecar/pom.xml b/spring-cloud-netflix-sidecar/pom.xml index f89009bc64..a03b3d1365 100644 --- a/spring-cloud-netflix-sidecar/pom.xml +++ b/spring-cloud-netflix-sidecar/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT .. spring-cloud-netflix-sidecar diff --git a/spring-cloud-netflix-turbine-amqp/pom.xml b/spring-cloud-netflix-turbine-amqp/pom.xml index 715d994289..2d9724c52b 100644 --- a/spring-cloud-netflix-turbine-amqp/pom.xml +++ b/spring-cloud-netflix-turbine-amqp/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT .. spring-cloud-netflix-turbine-amqp diff --git a/spring-cloud-netflix-turbine/pom.xml b/spring-cloud-netflix-turbine/pom.xml index 3abb28a80f..df765fe68e 100644 --- a/spring-cloud-netflix-turbine/pom.xml +++ b/spring-cloud-netflix-turbine/pom.xml @@ -5,11 +5,11 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT .. spring-cloud-netflix-turbine - 1.1.0.M1-fixes + 1.1.0.BUILD-SNAPSHOT jar Spring Cloud Netflix Turbine http://projects.spring.io/spring-cloud/ diff --git a/spring-cloud-starter-eureka-server/pom.xml b/spring-cloud-starter-eureka-server/pom.xml index 68ac6132cb..bb650d396f 100644 --- a/spring-cloud-starter-eureka-server/pom.xml +++ b/spring-cloud-starter-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT .. spring-cloud-starter-eureka-server diff --git a/spring-cloud-starter-eureka/pom.xml b/spring-cloud-starter-eureka/pom.xml index 845cffd4aa..25f86ccdee 100644 --- a/spring-cloud-starter-eureka/pom.xml +++ b/spring-cloud-starter-eureka/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT .. spring-cloud-starter-eureka diff --git a/spring-cloud-starter-feign/pom.xml b/spring-cloud-starter-feign/pom.xml index 85f01c3a44..e99d66434e 100644 --- a/spring-cloud-starter-feign/pom.xml +++ b/spring-cloud-starter-feign/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT .. spring-cloud-starter-feign diff --git a/spring-cloud-starter-hystrix-dashboard/pom.xml b/spring-cloud-starter-hystrix-dashboard/pom.xml index 87c50a2bf0..557594ba7e 100644 --- a/spring-cloud-starter-hystrix-dashboard/pom.xml +++ b/spring-cloud-starter-hystrix-dashboard/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT .. spring-cloud-starter-hystrix-dashboard diff --git a/spring-cloud-starter-hystrix/pom.xml b/spring-cloud-starter-hystrix/pom.xml index d381701897..ad30d4e3c5 100644 --- a/spring-cloud-starter-hystrix/pom.xml +++ b/spring-cloud-starter-hystrix/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT .. spring-cloud-starter-hystrix diff --git a/spring-cloud-starter-ribbon/pom.xml b/spring-cloud-starter-ribbon/pom.xml index a79998a3c0..e984ca677b 100644 --- a/spring-cloud-starter-ribbon/pom.xml +++ b/spring-cloud-starter-ribbon/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT .. spring-cloud-starter-ribbon diff --git a/spring-cloud-starter-turbine-amqp/pom.xml b/spring-cloud-starter-turbine-amqp/pom.xml index c20857e097..12a30ec33e 100644 --- a/spring-cloud-starter-turbine-amqp/pom.xml +++ b/spring-cloud-starter-turbine-amqp/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT .. spring-cloud-starter-turbine-amqp diff --git a/spring-cloud-starter-turbine/pom.xml b/spring-cloud-starter-turbine/pom.xml index a31851a73c..fa17b95ff6 100644 --- a/spring-cloud-starter-turbine/pom.xml +++ b/spring-cloud-starter-turbine/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT .. spring-cloud-starter-turbine diff --git a/spring-cloud-starter-zuul/pom.xml b/spring-cloud-starter-zuul/pom.xml index be77d54a1b..a99c1892c1 100644 --- a/spring-cloud-starter-zuul/pom.xml +++ b/spring-cloud-starter-zuul/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.M1 + 1.1.0.BUILD-SNAPSHOT .. spring-cloud-starter-zuul From 58b901746c3d7e4bd731d8d85bdd82780621ec5a Mon Sep 17 00:00:00 2001 From: Micheal Swiggs Date: Mon, 5 Oct 2015 16:00:36 +0100 Subject: [PATCH 4/6] Cleanup. --- spring-cloud-netflix-turbine/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-cloud-netflix-turbine/pom.xml b/spring-cloud-netflix-turbine/pom.xml index df765fe68e..3d3b84ba57 100644 --- a/spring-cloud-netflix-turbine/pom.xml +++ b/spring-cloud-netflix-turbine/pom.xml @@ -8,8 +8,7 @@ 1.1.0.BUILD-SNAPSHOT .. - spring-cloud-netflix-turbine - 1.1.0.BUILD-SNAPSHOT + spring-cloud-netflix-turbine jar Spring Cloud Netflix Turbine http://projects.spring.io/spring-cloud/ From c8b9745ee78b5cfb2487362811a2cb0b73846686 Mon Sep 17 00:00:00 2001 From: Micheal Swiggs Date: Mon, 5 Oct 2015 16:02:36 +0100 Subject: [PATCH 5/6] Removes unnecessary variable call. --- .../cloud/netflix/turbine/EurekaInstanceDiscovery.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/EurekaInstanceDiscovery.java b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/EurekaInstanceDiscovery.java index e9514f5c50..ec474878b0 100644 --- a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/EurekaInstanceDiscovery.java +++ b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/EurekaInstanceDiscovery.java @@ -159,7 +159,7 @@ protected Instance marshallInstanceInfo(InstanceInfo instanceInfo) { instance.getAttributes().put("asg", asgName); } if (!combineHostPort) { - instance.getAttributes().put("port", String.valueOf(instanceInfo.getPort())); + instance.getAttributes().put("port", port); } DataCenterInfo dcInfo = instanceInfo.getDataCenterInfo(); if (dcInfo != null && dcInfo.getName().equals(DataCenterInfo.Name.Amazon)) { From 82d41ee978607665d3b81c703b8b7994b8554757 Mon Sep 17 00:00:00 2001 From: Micheal Swiggs Date: Mon, 5 Oct 2015 17:13:59 +0100 Subject: [PATCH 6/6] Converts spaces to tabs. --- .../netflix/turbine/EurekaInstanceDiscovery.java | 14 +++++++------- .../cloud/netflix/turbine/TurbineProperties.java | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/EurekaInstanceDiscovery.java b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/EurekaInstanceDiscovery.java index ec474878b0..d26d2d6dc0 100644 --- a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/EurekaInstanceDiscovery.java +++ b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/EurekaInstanceDiscovery.java @@ -61,14 +61,14 @@ public class EurekaInstanceDiscovery implements InstanceDiscovery { private final EurekaClient eurekaClient; private final Expression clusterNameExpression; - private final boolean combineHostPort; + private final boolean combineHostPort; public EurekaInstanceDiscovery(TurbineProperties turbineProperties, EurekaClient eurekaClient) { this.eurekaClient = eurekaClient; SpelExpressionParser parser = new SpelExpressionParser(); this.clusterNameExpression = parser.parseExpression(turbineProperties .getClusterNameExpression()); - this.combineHostPort = turbineProperties.isCombineHostPort(); + this.combineHostPort = turbineProperties.isCombineHostPort(); } /** @@ -144,12 +144,12 @@ private List getInstancesForApp(String appName) throws Exception { */ protected Instance marshallInstanceInfo(InstanceInfo instanceInfo) { String hostname = instanceInfo.getHostName(); - String port = String.valueOf(instanceInfo.getPort()); + String port = String.valueOf(instanceInfo.getPort()); String cluster = getClusterName(instanceInfo); Boolean status = parseInstanceStatus(instanceInfo.getStatus()); if (hostname != null && cluster != null && status != null) { - String hostPart = combineHostPort ? hostname+":"+port+"/" : hostname; - Instance instance = new Instance(hostPart, cluster, status); + String hostPart = combineHostPort ? hostname+":"+port+"/" : hostname; + Instance instance = new Instance(hostPart, cluster, status); Map metadata = instanceInfo.getMetadata(); if (metadata != null) { instance.getAttributes().putAll(metadata); @@ -159,8 +159,8 @@ protected Instance marshallInstanceInfo(InstanceInfo instanceInfo) { instance.getAttributes().put("asg", asgName); } if (!combineHostPort) { - instance.getAttributes().put("port", port); - } + instance.getAttributes().put("port", port); + } DataCenterInfo dcInfo = instanceInfo.getDataCenterInfo(); if (dcInfo != null && dcInfo.getName().equals(DataCenterInfo.Name.Amazon)) { AmazonInfo amznInfo = (AmazonInfo) dcInfo; diff --git a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineProperties.java b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineProperties.java index 86e5cdbc4f..93b638cba4 100644 --- a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineProperties.java +++ b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineProperties.java @@ -29,6 +29,6 @@ public class TurbineProperties { private String clusterNameExpression = "appName"; - private boolean combineHostPort = false; + private boolean combineHostPort = false; }