From 7a21240a82515f284f46fc2040d6731746e8ad9e Mon Sep 17 00:00:00 2001 From: rkettelerij Date: Thu, 24 Aug 2017 16:49:49 +0200 Subject: [PATCH 1/6] Add support to specify datacenter in ribbon serverlist --- .../main/asciidoc/spring-cloud-consul.adoc | 35 +++++++++++++++++-- .../discovery/ConsulDiscoveryProperties.java | 8 ++++- .../consul/discovery/ConsulServerList.java | 14 ++++++-- .../ConsulDiscoveryPropertiesTests.java | 15 +++++++- .../ConsulLifecycleCustomizedPropsTests.java | 12 +++---- 5 files changed, 72 insertions(+), 12 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-consul.adoc b/docs/src/main/asciidoc/spring-cloud-consul.adoc index 30832ea1..bc92b699 100644 --- a/docs/src/main/asciidoc/spring-cloud-consul.adoc +++ b/docs/src/main/asciidoc/spring-cloud-consul.adoc @@ -121,8 +121,39 @@ spring: With this metadata, and multiple service instances deployed on localhost, the random value will kick in there to make the instance unique. In Cloudfoundry the `vcap.application.instance_id` will be populated automatically in a Spring Boot application, so the random value will not be needed. -=== Using the DiscoveryClient -Spring Cloud has support for https://github.com/spring-cloud/spring-cloud-netflix/blob/master/docs/src/main/asciidoc/spring-cloud-netflix.adoc#spring-cloud-feign[Feign] (a REST client builder) and also https://github.com/spring-cloud/spring-cloud-netflix/blob/master/docs/src/main/asciidoc/spring-cloud-netflix.adoc#spring-cloud-ribbon[Spring `RestTemplate`] using the logical service names instead of physical URLs. +=== Looking up services + +==== Using Ribbon + +Spring Cloud has support for https://github.com/spring-cloud/spring-cloud-netflix/blob/master/docs/src/main/asciidoc/spring-cloud-netflix.adoc#spring-cloud-feign[Feign] (a REST client builder) and also https://github.com/spring-cloud/spring-cloud-netflix/blob/master/docs/src/main/asciidoc/spring-cloud-netflix.adoc#spring-cloud-ribbon[Spring `RestTemplate`] +for looking up services using the logical service names/ids instead of physical URLs. Both Feign and the discovery-aware RestTemplate utilize http://cloud.spring.io/spring-cloud-netflix/single/spring-cloud-netflix.html#spring-cloud-ribbon[Ribbon] for client-side load balancing. + +If you want to access service STORES using the RestTemplate simply declare: + +---- +@LoadBalanced +@Bean +public RestTemplate loadbalancedRestTemplate() { + new RestTemplate(); +} +---- + +and use it like this (notice how we use the STORES service name/id from Consul instead of a fully qualified domainname): + +---- +@Autowired +RestTemplate restTemplate; + +public String getFirstProduct() { + return this.restTemplate.getForObject("https://STORES/products/1", String.class); +} +---- + +If you have Consul clusters in multiple datacenters and you want to access a service in another datacenter a service name/id alone is not enough. In that case +you use property `spring.cloud.consul.discovery.datacenters.STORES=dc-west` where `STORES` is the service name/id and `dc-west` is the datacenter +where the STORES service lives. + +==== Using the DiscoveryClient You can also use the `org.springframework.cloud.client.discovery.DiscoveryClient` which provides a simple API for discovery clients that is not specific to Netflix, e.g. diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java index 46ca3917..7041a329 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java @@ -37,6 +37,7 @@ import lombok.Setter; * @author Spencer Gibb * @author Donnabell Dmello * @author Venil Noronha + * @author Richard Kettelerij */ @ConfigurationProperties("spring.cloud.consul.discovery") @Data @@ -132,6 +133,12 @@ public class ConsulDiscoveryProperties { */ private Map serverListQueryTags = new HashMap<>(); + /** + * Map of serviceId's -> datacenter to query for in server list. + * This allows looking up services in another datacenters. + */ + private Map datacenters = new HashMap<>(); + /** Tag to query for in service list if one is not listed in serverListQueryTags. */ private String defaultQueryTag; @@ -169,7 +176,6 @@ public class ConsulDiscoveryProperties { } /** - * * @param serviceId The service who's filtering tag is being looked up * @return The tag the given service id should be filtered by, or null. */ diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulServerList.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulServerList.java index 6bf4259c..21653bf7 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulServerList.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulServerList.java @@ -29,6 +29,7 @@ import com.netflix.loadbalancer.AbstractServerList; /** * @author Spencer Gibb + * @author Richard Kettelerij */ public class ConsulServerList extends AbstractServerList { @@ -103,11 +104,16 @@ public class ConsulServerList extends AbstractServerList { } /** - * This method will create teh {@link QueryParams} to use when retrieving the - * services from Consul. By default {@link QueryParams#DEFAULT} is used. + * This method will create the {@link QueryParams} to use when retrieving the + * services from Consul. By default {@link QueryParams#DEFAULT} is used. In case + * a datacenter is specified for the current serviceId {@link QueryParams#datacenter} is set. * @return an instance of {@link QueryParams} */ protected QueryParams createQueryParamsForClientRequest() { + String datacenter = getDatacenter(); + if (datacenter != null) { + return new QueryParams(datacenter); + } return QueryParams.DEFAULT; } @@ -115,6 +121,10 @@ public class ConsulServerList extends AbstractServerList { return this.properties.getQueryTagForService(this.serviceId); } + protected String getDatacenter() { + return this.properties.getDatacenters().get(this.serviceId); + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("ConsulServerList{"); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryPropertiesTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryPropertiesTests.java index ec3ae170..466b3692 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryPropertiesTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryPropertiesTests.java @@ -15,16 +15,19 @@ public class ConsulDiscoveryPropertiesTests { private static final String DEFAULT_TAG = "defaultTag"; private static final String MAP_TAG = "mapTag"; + private static final String MAP_DC = "mapDc"; private static final String SERVICE_NAME_IN_MAP = "serviceNameInMap"; private static final String SERVICE_NAME_NOT_IN_MAP = "serviceNameNotInMap"; private ConsulDiscoveryProperties properties; private Map serverListQueryTags = Collections.singletonMap(SERVICE_NAME_IN_MAP, MAP_TAG); + private Map datacenters = Collections.singletonMap(SERVICE_NAME_IN_MAP, MAP_DC); @Before public void setUp() throws Exception { properties = new ConsulDiscoveryProperties(new InetUtils(new InetUtilsProperties())); properties.setDefaultQueryTag(DEFAULT_TAG); properties.setServerListQueryTags(serverListQueryTags); + properties.setDatacenters(datacenters); } @Test @@ -43,4 +46,14 @@ public class ConsulDiscoveryPropertiesTests { public void testGetTagReturnsMapValueWhenInMap() throws Exception { assertEquals(MAP_TAG, properties.getQueryTagForService(SERVICE_NAME_IN_MAP)); } -} \ No newline at end of file + + @Test + public void testGetDcReturnsNullWhenNotInMap() throws Exception { + assertNull(properties.getDatacenters().get(SERVICE_NAME_NOT_IN_MAP)); + } + + @Test + public void testGetDcReturnsMapValueWhenInMap() throws Exception { + assertEquals(MAP_DC, properties.getDatacenters().get(SERVICE_NAME_IN_MAP)); + } +} diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedPropsTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedPropsTests.java index d184a983..eb854119 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedPropsTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedPropsTests.java @@ -51,8 +51,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen @Deprecated @RunWith(SpringRunner.class) @SpringBootTest(classes = TestPropsConfig.class, - properties = { "spring.application.name=myTestService-B", - "spring.cloud.consul.discovery.instanceId=myTestService1-B", + properties = { "spring.application.name=myTestService-Z", + "spring.cloud.consul.discovery.instanceId=myTestService1-Z", "spring.cloud.consul.discovery.port=4452", "spring.cloud.consul.discovery.hostname=myhost", "spring.cloud.consul.discovery.ipAddress=10.0.0.1", @@ -71,16 +71,16 @@ public class ConsulLifecycleCustomizedPropsTests { public void contextLoads() { Response> response = consul.getAgentServices(); Map services = response.getValue(); - Service service = services.get("myTestService1-B"); + Service service = services.get("myTestService1-Z"); assertThat("service was null", service, is(notNullValue())); assertThat("service port is discovery port", service.getPort(), equalTo(4452)); - assertThat("service id was wrong", "myTestService1-B", equalTo(service.getId())); - assertThat("service name was wrong", "myTestService-B", equalTo(service.getService())); + assertThat("service id was wrong", "myTestService1-Z", equalTo(service.getId())); + assertThat("service name was wrong", "myTestService-Z", equalTo(service.getService())); assertThat("property hostname was wrong", "myhost", equalTo(this.properties.getHostname())); assertThat("property ipAddress was wrong", "10.0.0.1", equalTo(this.properties.getIpAddress())); assertThat("service address was wrong", "myhost", equalTo(service.getAddress())); - Response> checkResponse = consul.getHealthChecksForService("myTestService-B", QueryParams.DEFAULT); + Response> checkResponse = consul.getHealthChecksForService("myTestService-Z", QueryParams.DEFAULT); List checks = checkResponse.getValue(); assertThat("checks was wrong size", checks, hasSize(0)); } From 8484572fd90d7cc8853553a6bafb5ffd533782e1 Mon Sep 17 00:00:00 2001 From: Jon Freedman Date: Tue, 24 Oct 2017 01:34:23 +0100 Subject: [PATCH 2/6] Allow deregister on shutdown to be disabled (#322) Fixes gh-321 --- .../discovery/ConsulDiscoveryProperties.java | 3 + .../ConsulAutoServiceRegistration.java | 4 +- ...utoServiceDeRegistrationDisabledTests.java | 89 +++++++++++++++++++ 3 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceDeRegistrationDisabledTests.java diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java index 7041a329..2aa00a58 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java @@ -151,6 +151,9 @@ public class ConsulDiscoveryProperties { /** Register as a service in consul. */ private boolean register = true; + /** Disable automatic de-registration of service in consul. */ + private boolean deregister = true; + /** Register health check in consul. Useful during development of a service. */ private boolean registerHealthCheck = true; diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistration.java index 72deb984..d9fdf988 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistration.java @@ -99,7 +99,7 @@ public class ConsulAutoServiceRegistration extends AbstractAutoServiceRegistrati @Override protected void deregister() { - if (!this.properties.isRegister()) { + if (!this.properties.isRegister() || !this.properties.isDeregister()) { return; } super.deregister(); @@ -107,7 +107,7 @@ public class ConsulAutoServiceRegistration extends AbstractAutoServiceRegistrati @Override protected void deregisterManagement() { - if (!this.properties.isRegister()) { + if (!this.properties.isRegister() || !this.properties.isDeregister()) { return; } super.deregisterManagement(); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceDeRegistrationDisabledTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceDeRegistrationDisabledTests.java new file mode 100644 index 00000000..bc86eecb --- /dev/null +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceDeRegistrationDisabledTests.java @@ -0,0 +1,89 @@ +/* + * Copyright 2013-2017 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.consul.serviceregistry; + +import com.ecwid.consul.v1.ConsulClient; +import com.ecwid.consul.v1.Response; +import com.ecwid.consul.v1.agent.model.Service; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.ImportAutoConfiguration; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; +import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; +import org.springframework.context.annotation.Configuration; +import org.springframework.test.context.junit4.SpringRunner; + +import java.util.Map; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; + +/** + * @author Jon Freedman + */ +@RunWith(SpringRunner.class) +@SpringBootTest(classes = ConsulAutoServiceRegistrationDisabledTests.TestConfig.class, + properties = {"spring.application.name=myTestNotDeRegisteredService", + "spring.cloud.consul.discovery.instanceId=myTestNotDeRegisteredService-D", + "spring.cloud.consul.discovery.deregister=false"}, + webEnvironment = RANDOM_PORT) +public class ConsulAutoServiceDeRegistrationDisabledTests { + @Autowired + private ConsulClient consul; + + @Autowired(required = false) + private ConsulAutoServiceRegistration autoServiceRegistration; + + @Autowired(required = false) + private ConsulDiscoveryProperties discoveryProperties; + + @Test + public void contextLoads() { + assertNotNull("ConsulAutoServiceRegistration was not created", autoServiceRegistration); + assertNotNull("ConsulDiscoveryProperties was not created", discoveryProperties); + + checkService(true); + autoServiceRegistration.deregister(); + checkService(true); + discoveryProperties.setDeregister(true); + autoServiceRegistration.deregister(); + checkService(false); + } + + private void checkService(final boolean expected) { + final Response> response = consul.getAgentServices(); + final Map services = response.getValue(); + final Service service = services.get("myTestNotDeRegisteredService-D"); + if (expected) { + assertNotNull("service was not registered", service); + } else { + assertNull("service was registered", service); + } + } + + @Configuration + @EnableAutoConfiguration + @ImportAutoConfiguration({AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, + ConsulAutoServiceRegistrationAutoConfiguration.class}) + public static class TestConfig { + } +} From b630465e3fe11a5a5baeedb7c566421139823f09 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 23 Oct 2017 20:45:13 -0400 Subject: [PATCH 3/6] Update to 1.3.0.BUILD-SNAPSHOT --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-consul-binder/pom.xml | 2 +- spring-cloud-consul-config/pom.xml | 2 +- spring-cloud-consul-core/pom.xml | 2 +- spring-cloud-consul-dependencies/pom.xml | 2 +- spring-cloud-consul-discovery/pom.xml | 2 +- spring-cloud-consul-sample/pom.xml | 2 +- spring-cloud-starter-consul-all/pom.xml | 2 +- spring-cloud-starter-consul-bus/pom.xml | 2 +- spring-cloud-starter-consul-config/pom.xml | 2 +- spring-cloud-starter-consul-discovery/pom.xml | 2 +- spring-cloud-starter-consul/pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 69624dd7..a9c6b4ef 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 1.2.2.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT spring-cloud-consul-docs pom diff --git a/pom.xml b/pom.xml index 3a17a212..8bc338d3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 1.2.2.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index 53c49d3b..a68c027f 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.2.2.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 555d2923..11db3453 100644 --- a/spring-cloud-consul-config/pom.xml +++ b/spring-cloud-consul-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.2.2.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index c3563be4..4d780406 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.2.2.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index f8f1d3b2..f7a847f5 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -9,7 +9,7 @@ spring-cloud-consul-dependencies - 1.2.2.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index b32c5dc6..7d199a03 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.2.2.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml index a7a820b6..7d69ac28 100644 --- a/spring-cloud-consul-sample/pom.xml +++ b/spring-cloud-consul-sample/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.2.2.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 7848cd2f..fdb69936 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.2.2.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index 3c2af8ab..71a58b7b 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.2.2.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index ea92a803..9bf8a5ca 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.2.2.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index 5ccda0a1..0ac383ae 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 1.2.2.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 878bde7f..68fb46e8 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.2.2.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT .. spring-cloud-starter-consul From b6cb560f9865b52de1e6fa9ff11183d2d60cb8fd Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 23 Oct 2017 20:52:52 -0400 Subject: [PATCH 4/6] Change deployer version to RELEASE --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8bc338d3..4d4dff0b 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 1.3.0.BUILD-SNAPSHOT 1.4.0.BUILD-SNAPSHOT 1.4.0.BUILD-SNAPSHOT - 1.0.3.BUILD-SNAPSHOT + 1.0.3.RELEASE Ditmars.BUILD-SNAPSHOT 2.3.1 4.5.2 From 9ca2b87470ae6930cc22d9347dd1ee3c234dd586 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 23 Oct 2017 21:01:26 -0400 Subject: [PATCH 5/6] Update SNAPSHOT to 1.3.0.RC1 --- docs/pom.xml | 2 +- pom.xml | 14 +++++++------- spring-cloud-consul-binder/pom.xml | 2 +- spring-cloud-consul-config/pom.xml | 2 +- spring-cloud-consul-core/pom.xml | 2 +- spring-cloud-consul-dependencies/pom.xml | 4 ++-- spring-cloud-consul-discovery/pom.xml | 2 +- spring-cloud-consul-sample/pom.xml | 2 +- spring-cloud-starter-consul-all/pom.xml | 2 +- spring-cloud-starter-consul-bus/pom.xml | 2 +- spring-cloud-starter-consul-config/pom.xml | 2 +- spring-cloud-starter-consul-discovery/pom.xml | 2 +- spring-cloud-starter-consul/pom.xml | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index a9c6b4ef..f1d9006c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.BUILD-SNAPSHOT + 1.3.0.RC1 spring-cloud-consul-docs pom diff --git a/pom.xml b/pom.xml index 4d4dff0b..96a7490d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.BUILD-SNAPSHOT + 1.3.0.RC1 pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 1.3.5.BUILD-SNAPSHOT + 1.3.5.RELEASE - 1.3.2.BUILD-SNAPSHOT - 1.3.0.BUILD-SNAPSHOT - 1.4.0.BUILD-SNAPSHOT - 1.4.0.BUILD-SNAPSHOT + 1.3.2.RC1 + 1.3.0.RC1 + 1.4.0.RC1 + 1.4.0.RC1 1.0.3.RELEASE - Ditmars.BUILD-SNAPSHOT + Ditmars.RELEASE 2.3.1 4.5.2 4.4.5 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index a68c027f..29da10ce 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.BUILD-SNAPSHOT + 1.3.0.RC1 .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 11db3453..9acf9b85 100644 --- a/spring-cloud-consul-config/pom.xml +++ b/spring-cloud-consul-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.BUILD-SNAPSHOT + 1.3.0.RC1 .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 4d780406..12b78d54 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.BUILD-SNAPSHOT + 1.3.0.RC1 .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index f7a847f5..dcde64df 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.5.BUILD-SNAPSHOT + 1.3.5.RELEASE spring-cloud-consul-dependencies - 1.3.0.BUILD-SNAPSHOT + 1.3.0.RC1 pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index 7d199a03..45d82403 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.BUILD-SNAPSHOT + 1.3.0.RC1 .. diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml index 7d69ac28..8e6d1fa8 100644 --- a/spring-cloud-consul-sample/pom.xml +++ b/spring-cloud-consul-sample/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.BUILD-SNAPSHOT + 1.3.0.RC1 .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index fdb69936..cc124e78 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.BUILD-SNAPSHOT + 1.3.0.RC1 .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index 71a58b7b..7c46e28b 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.BUILD-SNAPSHOT + 1.3.0.RC1 .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index 9bf8a5ca..37881d98 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.BUILD-SNAPSHOT + 1.3.0.RC1 .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index 0ac383ae..f18124b6 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.BUILD-SNAPSHOT + 1.3.0.RC1 .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 68fb46e8..72c4cfd5 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.BUILD-SNAPSHOT + 1.3.0.RC1 .. spring-cloud-starter-consul From a5251e831deb34d7ed57b55f388316109531f37e Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 23 Oct 2017 21:02:20 -0400 Subject: [PATCH 6/6] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 14 +++++++------- spring-cloud-consul-binder/pom.xml | 2 +- spring-cloud-consul-config/pom.xml | 2 +- spring-cloud-consul-core/pom.xml | 2 +- spring-cloud-consul-dependencies/pom.xml | 4 ++-- spring-cloud-consul-discovery/pom.xml | 2 +- spring-cloud-consul-sample/pom.xml | 2 +- spring-cloud-starter-consul-all/pom.xml | 2 +- spring-cloud-starter-consul-bus/pom.xml | 2 +- spring-cloud-starter-consul-config/pom.xml | 2 +- spring-cloud-starter-consul-discovery/pom.xml | 2 +- spring-cloud-starter-consul/pom.xml | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index f1d9006c..a9c6b4ef 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.RC1 + 1.3.0.BUILD-SNAPSHOT spring-cloud-consul-docs pom diff --git a/pom.xml b/pom.xml index 96a7490d..4d4dff0b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.RC1 + 1.3.0.BUILD-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 1.3.5.RELEASE + 1.3.5.BUILD-SNAPSHOT - 1.3.2.RC1 - 1.3.0.RC1 - 1.4.0.RC1 - 1.4.0.RC1 + 1.3.2.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT + 1.4.0.BUILD-SNAPSHOT + 1.4.0.BUILD-SNAPSHOT 1.0.3.RELEASE - Ditmars.RELEASE + Ditmars.BUILD-SNAPSHOT 2.3.1 4.5.2 4.4.5 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index 29da10ce..a68c027f 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.RC1 + 1.3.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 9acf9b85..11db3453 100644 --- a/spring-cloud-consul-config/pom.xml +++ b/spring-cloud-consul-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.RC1 + 1.3.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 12b78d54..4d780406 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.RC1 + 1.3.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index dcde64df..f7a847f5 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.5.RELEASE + 1.3.5.BUILD-SNAPSHOT spring-cloud-consul-dependencies - 1.3.0.RC1 + 1.3.0.BUILD-SNAPSHOT pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index 45d82403..7d199a03 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.RC1 + 1.3.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml index 8e6d1fa8..7d69ac28 100644 --- a/spring-cloud-consul-sample/pom.xml +++ b/spring-cloud-consul-sample/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.RC1 + 1.3.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index cc124e78..fdb69936 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.RC1 + 1.3.0.BUILD-SNAPSHOT .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index 7c46e28b..71a58b7b 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.RC1 + 1.3.0.BUILD-SNAPSHOT .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index 37881d98..9bf8a5ca 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.RC1 + 1.3.0.BUILD-SNAPSHOT .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index f18124b6..0ac383ae 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.RC1 + 1.3.0.BUILD-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 72c4cfd5..68fb46e8 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.3.0.RC1 + 1.3.0.BUILD-SNAPSHOT .. spring-cloud-starter-consul