From c297177dd83fc7993b9bcbf8aed6958794c10f10 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 14 Jun 2022 19:14:52 +0000 Subject: [PATCH 01/11] Bumping versions --- pom.xml | 4 ++-- .../ConsulConfigServerBootstrapper.java | 2 +- .../ConsulConfigServerBootstrapperTests.java | 24 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 66b83efe..89d61664 100644 --- a/pom.xml +++ b/pom.xml @@ -20,12 +20,12 @@ - 3.1.2 + 3.1.3-SNAPSHOT 3.1.4-SNAPSHOT 3.1.4-SNAPSHOT 1.0.3.RELEASE 3.1.4-SNAPSHOT - 3.2.4 + 3.2.5-SNAPSHOT 1.15.1 diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java index e8062b03..30a35d5d 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java @@ -101,7 +101,7 @@ public class ConsulConfigServerBootstrapper implements BootstrapRegistryInitiali private boolean isDiscoveryEnabled(Binder binder) { return binder.bind(ConfigClientProperties.CONFIG_DISCOVERY_ENABLED, Boolean.class).orElse(false) && binder.bind(ConditionalOnConsulDiscoveryEnabled.PROPERTY, Boolean.class).orElse(true) - && binder.bind("spring.cloud.discovery.enabled", Boolean.class).orElse(true); + && binder.bind("spring.cloud.discovery.enabled", Boolean.class).orElse(true); } } diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java index 3c1a7b2d..dc1d61e9 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java @@ -70,15 +70,15 @@ public class ConsulConfigServerBootstrapperTests { @Test public void springCloudDiscoveryClientNotEnabledProvidesEmptyList() { new SpringApplicationBuilder(TestConfig.class) - .properties("--server.port=0", "spring.cloud.service-registry.auto-registration.enabled=false", - "spring.cloud.config.discovery.enabled=true", "spring.cloud.discovery.enabled=false") - .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> { - ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext() - .get(ConfigServerInstanceProvider.Function.class); - assertThat(providerFn.apply("id")) - .as("ConfigServerInstanceProvider.Function should return empty list") - .isEqualTo(Collections.EMPTY_LIST); - })).run().close(); + .properties("--server.port=0", "spring.cloud.service-registry.auto-registration.enabled=false", + "spring.cloud.config.discovery.enabled=true", "spring.cloud.discovery.enabled=false") + .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> { + ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext() + .get(ConfigServerInstanceProvider.Function.class); + assertThat(providerFn.apply("id")) + .as("ConfigServerInstanceProvider.Function should return empty list") + .isEqualTo(Collections.EMPTY_LIST); + })).run().close(); } @Test @@ -96,9 +96,9 @@ public class ConsulConfigServerBootstrapperTests { ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext() .get(ConfigServerInstanceProvider.Function.class); assertThatThrownBy(() -> providerFn.apply("id")).isInstanceOf(TransportException.class) - .hasMessageContaining("org.apache.http.conn.HttpHostConnectException: Connect to localhost:8500") - .as("Should have tried to reach out to Consul to get config server instance") - .isNotNull(); + .hasMessageContaining( + "org.apache.http.conn.HttpHostConnectException: Connect to localhost:8500") + .as("Should have tried to reach out to Consul to get config server instance").isNotNull(); })).run(); ConsulDiscoveryClient discoveryClient = context.getBean(ConsulDiscoveryClient.class); assertThat(discoveryClient == bootstrapDiscoveryClient.get()).isTrue(); From c85439afe64ce383f86d5016626b53d9a8385612 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 30 Jun 2022 19:14:27 +0000 Subject: [PATCH 02/11] Bumping versions --- docs/src/main/asciidoc/_configprops.adoc | 80 ++++++++++++------------ 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 2e310279..1e74f811 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -2,77 +2,77 @@ |Name | Default | Description |spring.cloud.consul.config.acl-token | | -|spring.cloud.consul.config.data-key | `data` | If format is Format.PROPERTIES or Format.YAML then the following field is used as key to look up consul for configuration. -|spring.cloud.consul.config.default-context | `application` | -|spring.cloud.consul.config.enabled | `true` | -|spring.cloud.consul.config.fail-fast | `true` | Throw exceptions during config lookup if true, otherwise, log warnings. +|spring.cloud.consul.config.data-key | `+++data+++` | If format is Format.PROPERTIES or Format.YAML then the following field is used as key to look up consul for configuration. +|spring.cloud.consul.config.default-context | `+++application+++` | +|spring.cloud.consul.config.enabled | `+++true+++` | +|spring.cloud.consul.config.fail-fast | `+++true+++` | Throw exceptions during config lookup if true, otherwise, log warnings. |spring.cloud.consul.config.format | | |spring.cloud.consul.config.name | | Alternative to spring.application.name to use in looking up values in consul KV. |spring.cloud.consul.config.prefix | | |spring.cloud.consul.config.prefixes | | -|spring.cloud.consul.config.profile-separator | `,` | -|spring.cloud.consul.config.watch.delay | `1000` | The value of the fixed delay for the watch in millis. Defaults to 1000. -|spring.cloud.consul.config.watch.enabled | `true` | If the watch is enabled. Defaults to true. -|spring.cloud.consul.config.watch.wait-time | `55` | The number of seconds to wait (or block) for watch query, defaults to 55. Needs to be less than default ConsulClient (defaults to 60). To increase ConsulClient timeout create a ConsulClient bean with a custom ConsulRawClient with a custom HttpClient. +|spring.cloud.consul.config.profile-separator | `+++,+++` | +|spring.cloud.consul.config.watch.delay | `+++1000+++` | The value of the fixed delay for the watch in millis. Defaults to 1000. +|spring.cloud.consul.config.watch.enabled | `+++true+++` | If the watch is enabled. Defaults to true. +|spring.cloud.consul.config.watch.wait-time | `+++55+++` | The number of seconds to wait (or block) for watch query, defaults to 55. Needs to be less than default ConsulClient (defaults to 60). To increase ConsulClient timeout create a ConsulClient bean with a custom ConsulRawClient with a custom HttpClient. |spring.cloud.consul.discovery.acl-token | | -|spring.cloud.consul.discovery.catalog-services-watch-delay | `1000` | The delay between calls to watch consul catalog in millis, default is 1000. -|spring.cloud.consul.discovery.catalog-services-watch-timeout | `2` | The number of seconds to block while watching consul catalog, default is 2. +|spring.cloud.consul.discovery.catalog-services-watch-delay | `+++1000+++` | The delay between calls to watch consul catalog in millis, default is 1000. +|spring.cloud.consul.discovery.catalog-services-watch-timeout | `+++2+++` | The number of seconds to block while watching consul catalog, default is 2. |spring.cloud.consul.discovery.consistency-mode | | Consistency mode for health service request. |spring.cloud.consul.discovery.datacenters | | Map of serviceId's -> datacenter to query for in server list. This allows looking up services in another datacenters. |spring.cloud.consul.discovery.default-query-tag | | Tag to query for in service list if one is not listed in serverListQueryTags. Multiple tags can be specified with a comma separated value. -|spring.cloud.consul.discovery.default-zone-metadata-name | `zone` | Service instance zone comes from metadata. This allows changing the metadata tag name. -|spring.cloud.consul.discovery.deregister | `true` | Disable automatic de-registration of service in consul. +|spring.cloud.consul.discovery.default-zone-metadata-name | `+++zone+++` | Service instance zone comes from metadata. This allows changing the metadata tag name. +|spring.cloud.consul.discovery.deregister | `+++true+++` | Disable automatic de-registration of service in consul. |spring.cloud.consul.discovery.enable-tag-override | | Enable tag override for the registered service. -|spring.cloud.consul.discovery.enabled | `true` | Is service discovery enabled? -|spring.cloud.consul.discovery.fail-fast | `true` | Throw exceptions during service registration if true, otherwise, log warnings (defaults to true). +|spring.cloud.consul.discovery.enabled | `+++true+++` | Is service discovery enabled? +|spring.cloud.consul.discovery.fail-fast | `+++true+++` | Throw exceptions during service registration if true, otherwise, log warnings (defaults to true). |spring.cloud.consul.discovery.health-check-critical-timeout | | Timeout to deregister services critical for longer than timeout (e.g. 30m). Requires consul version 7.x or higher. |spring.cloud.consul.discovery.health-check-headers | | Headers to be applied to the Health Check calls. -|spring.cloud.consul.discovery.health-check-interval | `10s` | How often to perform the health check (e.g. 10s), defaults to 10s. -|spring.cloud.consul.discovery.health-check-path | `/actuator/health` | Alternate server path to invoke for health checking. +|spring.cloud.consul.discovery.health-check-interval | `+++10s+++` | How often to perform the health check (e.g. 10s), defaults to 10s. +|spring.cloud.consul.discovery.health-check-path | `+++/actuator/health+++` | Alternate server path to invoke for health checking. |spring.cloud.consul.discovery.health-check-timeout | | Timeout for health check (e.g. 10s). |spring.cloud.consul.discovery.health-check-tls-skip-verify | | Skips certificate verification during service checks if true, otherwise runs certificate verification. |spring.cloud.consul.discovery.health-check-url | | Custom health check url to override default. -|spring.cloud.consul.discovery.heartbeat.enabled | `false` | +|spring.cloud.consul.discovery.heartbeat.enabled | `+++false+++` | |spring.cloud.consul.discovery.heartbeat.interval-ratio | | -|spring.cloud.consul.discovery.heartbeat.reregister-service-on-failure | `false` | -|spring.cloud.consul.discovery.heartbeat.ttl | `30s` | +|spring.cloud.consul.discovery.heartbeat.reregister-service-on-failure | `+++false+++` | +|spring.cloud.consul.discovery.heartbeat.ttl | `+++30s+++` | |spring.cloud.consul.discovery.hostname | | Hostname to use when accessing server. -|spring.cloud.consul.discovery.include-hostname-in-instance-id | `false` | Whether hostname is included into the default instance id when registering service. +|spring.cloud.consul.discovery.include-hostname-in-instance-id | `+++false+++` | Whether hostname is included into the default instance id when registering service. |spring.cloud.consul.discovery.instance-group | | Service instance group. |spring.cloud.consul.discovery.instance-id | | Unique service instance id. |spring.cloud.consul.discovery.instance-zone | | Service instance zone. |spring.cloud.consul.discovery.ip-address | | IP address to use when accessing service (must also set preferIpAddress to use). -|spring.cloud.consul.discovery.lifecycle.enabled | `true` | +|spring.cloud.consul.discovery.lifecycle.enabled | `+++true+++` | |spring.cloud.consul.discovery.management-enable-tag-override | | Enable tag override for the registered management service. |spring.cloud.consul.discovery.management-metadata | | Metadata to use when registering management service. |spring.cloud.consul.discovery.management-port | | Port to register the management service under (defaults to management port). -|spring.cloud.consul.discovery.management-suffix | `management` | Suffix to use when registering management service. +|spring.cloud.consul.discovery.management-suffix | `+++management+++` | Suffix to use when registering management service. |spring.cloud.consul.discovery.management-tags | | Tags to use when registering management service. |spring.cloud.consul.discovery.metadata | | Metadata to use when registering service. -|spring.cloud.consul.discovery.order | `0` | Order of the discovery client used by `CompositeDiscoveryClient` for sorting available clients. +|spring.cloud.consul.discovery.order | `+++0+++` | Order of the discovery client used by `CompositeDiscoveryClient` for sorting available clients. |spring.cloud.consul.discovery.port | | Port to register the service under (defaults to listening port). -|spring.cloud.consul.discovery.prefer-agent-address | `false` | Source of how we will determine the address to use. -|spring.cloud.consul.discovery.prefer-ip-address | `false` | Use ip address rather than hostname during registration. -|spring.cloud.consul.discovery.query-passing | `false` | Add the 'passing` parameter to /v1/health/service/serviceName. This pushes health check passing to the server. -|spring.cloud.consul.discovery.register | `true` | Register as a service in consul. -|spring.cloud.consul.discovery.register-health-check | `true` | Register health check in consul. Useful during development of a service. -|spring.cloud.consul.discovery.scheme | `http` | Whether to register an http or https service. +|spring.cloud.consul.discovery.prefer-agent-address | `+++false+++` | Source of how we will determine the address to use. +|spring.cloud.consul.discovery.prefer-ip-address | `+++false+++` | Use ip address rather than hostname during registration. +|spring.cloud.consul.discovery.query-passing | `+++false+++` | Add the 'passing` parameter to /v1/health/service/serviceName. This pushes health check passing to the server. +|spring.cloud.consul.discovery.register | `+++true+++` | Register as a service in consul. +|spring.cloud.consul.discovery.register-health-check | `+++true+++` | Register health check in consul. Useful during development of a service. +|spring.cloud.consul.discovery.scheme | `+++http+++` | Whether to register an http or https service. |spring.cloud.consul.discovery.server-list-query-tags | | Map of serviceId's -> tag to query for in server list. This allows filtering services by one more tags. Multiple tags can be specified with a comma separated value. |spring.cloud.consul.discovery.service-name | | Service name. |spring.cloud.consul.discovery.tags | | Tags to use when registering service. -|spring.cloud.consul.enabled | `true` | Is spring cloud consul enabled. -|spring.cloud.consul.host | `localhost` | Consul agent hostname. Defaults to 'localhost'. +|spring.cloud.consul.enabled | `+++true+++` | Is spring cloud consul enabled. +|spring.cloud.consul.host | `+++localhost+++` | Consul agent hostname. Defaults to 'localhost'. |spring.cloud.consul.path | | Custom path if consul is under non-root. -|spring.cloud.consul.port | `8500` | Consul agent port. Defaults to '8500'. -|spring.cloud.consul.retry.enabled | `true` | If consul retry is enabled. -|spring.cloud.consul.retry.initial-interval | `1000` | Initial retry interval in milliseconds. -|spring.cloud.consul.retry.max-attempts | `6` | Maximum number of attempts. -|spring.cloud.consul.retry.max-interval | `2000` | Maximum interval for backoff. -|spring.cloud.consul.retry.multiplier | `1.1` | Multiplier for next interval. -|spring.cloud.consul.ribbon.enabled | `true` | Enables Consul and Ribbon integration. +|spring.cloud.consul.port | `+++8500+++` | Consul agent port. Defaults to '8500'. +|spring.cloud.consul.retry.enabled | `+++true+++` | If consul retry is enabled. +|spring.cloud.consul.retry.initial-interval | `+++1000+++` | Initial retry interval in milliseconds. +|spring.cloud.consul.retry.max-attempts | `+++6+++` | Maximum number of attempts. +|spring.cloud.consul.retry.max-interval | `+++2000+++` | Maximum interval for backoff. +|spring.cloud.consul.retry.multiplier | `+++1.1+++` | Multiplier for next interval. +|spring.cloud.consul.ribbon.enabled | `+++true+++` | Enables Consul and Ribbon integration. |spring.cloud.consul.scheme | | Consul agent scheme (HTTP/HTTPS). If there is no scheme in address - client will use HTTP. -|spring.cloud.consul.service-registry.auto-registration.enabled | `true` | Enables Consul Service Registry Auto-registration. -|spring.cloud.consul.service-registry.enabled | `true` | Enables Consul Service Registry functionality. +|spring.cloud.consul.service-registry.auto-registration.enabled | `+++true+++` | Enables Consul Service Registry Auto-registration. +|spring.cloud.consul.service-registry.enabled | `+++true+++` | Enables Consul Service Registry functionality. |spring.cloud.consul.tls.certificate-password | | Password to open the certificate. |spring.cloud.consul.tls.certificate-path | | File path to the certificate. |spring.cloud.consul.tls.key-store-instance-type | | Type of key framework to use. From 4cf3b644bdb26207de8e763c81befc097e9d6cf5 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 2 Sep 2022 23:48:31 +0000 Subject: [PATCH 03/11] Update SNAPSHOT to 3.1.2 --- 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-integration-tests/pom.xml | 2 +- .../spring-cloud-consul-bootstrap-tests/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-consul-configdata-tests/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 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index aabd90ae..70b68b1d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-consul-docs jar diff --git a/pom.xml b/pom.xml index 89d61664..3f875458 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2-SNAPSHOT + 3.1.2 pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 3.1.4-SNAPSHOT + 3.1.4 - 3.1.3-SNAPSHOT - 3.1.4-SNAPSHOT - 3.1.4-SNAPSHOT + 3.1.2 + 3.1.4 + 3.1.4 1.0.3.RELEASE - 3.1.4-SNAPSHOT - 3.2.5-SNAPSHOT + 3.1.4 + 3.2.5 1.15.1 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index d8a4e47e..8a9ae7f3 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 - 3.1.2-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 76170122..95a6f3ea 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 - 3.1.2-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 04df1395..3ec4f69d 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 - 3.1.2-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 2590ba64..e97bca2c 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.4 spring-cloud-consul-dependencies - 3.1.2-SNAPSHOT + 3.1.2 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 aa3f232f..654fcb25 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 - 3.1.2-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-consul-integration-tests/pom.xml b/spring-cloud-consul-integration-tests/pom.xml index 460c6ca9..146bc0aa 100644 --- a/spring-cloud-consul-integration-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-consul-integration-tests diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml index 7aafbc10..46964daa 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.2-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml index 4464b2f8..be39348c 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.2-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml index 4d4ee21a..7828fd61 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.2-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 3787b7ef..e09abb92 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index 28ca0af4..bb0cf941 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index 9e103842..9f642b48 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index f181ff5e..40881250 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 - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 41de209e..bf04b468 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-starter-consul From 71f34146ee178f2786a80bf43c8bbbc74660cfd7 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 2 Sep 2022 23:50:17 +0000 Subject: [PATCH 04/11] 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-integration-tests/pom.xml | 2 +- .../spring-cloud-consul-bootstrap-tests/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-consul-configdata-tests/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 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 70b68b1d..aabd90ae 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-consul-docs jar diff --git a/pom.xml b/pom.xml index 3f875458..89d61664 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2 + 3.1.2-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 3.1.4 + 3.1.4-SNAPSHOT - 3.1.2 - 3.1.4 - 3.1.4 + 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT + 3.1.4-SNAPSHOT 1.0.3.RELEASE - 3.1.4 - 3.2.5 + 3.1.4-SNAPSHOT + 3.2.5-SNAPSHOT 1.15.1 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index 8a9ae7f3..d8a4e47e 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 - 3.1.2 + 3.1.2-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 95a6f3ea..76170122 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 - 3.1.2 + 3.1.2-SNAPSHOT .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 3ec4f69d..04df1395 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 - 3.1.2 + 3.1.2-SNAPSHOT .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index e97bca2c..2590ba64 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.4 + 3.1.4-SNAPSHOT spring-cloud-consul-dependencies - 3.1.2 + 3.1.2-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 654fcb25..aa3f232f 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 - 3.1.2 + 3.1.2-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/pom.xml b/spring-cloud-consul-integration-tests/pom.xml index 146bc0aa..460c6ca9 100644 --- a/spring-cloud-consul-integration-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-consul-integration-tests diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml index 46964daa..7aafbc10 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.2 + 3.1.2-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml index be39348c..4464b2f8 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.2 + 3.1.2-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml index 7828fd61..4d4ee21a 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.2 + 3.1.2-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index e09abb92..3787b7ef 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2 + 3.1.2-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 bb0cf941..28ca0af4 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2 + 3.1.2-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 9f642b48..9e103842 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2 + 3.1.2-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 40881250..f181ff5e 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 - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index bf04b468..41de209e 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-starter-consul From 924aa9c14d57bc150bfb50d5025f68a2c250ac46 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 2 Sep 2022 23:50:17 +0000 Subject: [PATCH 05/11] Bumping versions to 3.1.3-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 12 ++++++------ 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-integration-tests/pom.xml | 2 +- .../spring-cloud-consul-bootstrap-tests/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-consul-configdata-tests/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 +- 16 files changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index aabd90ae..89919c4c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-consul-docs jar diff --git a/pom.xml b/pom.xml index 89d61664..2bae4754 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT 3.1.3-SNAPSHOT - 3.1.4-SNAPSHOT - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT + 3.1.5-SNAPSHOT 1.0.3.RELEASE - 3.1.4-SNAPSHOT - 3.2.5-SNAPSHOT + 3.1.5-SNAPSHOT + 3.2.6-SNAPSHOT 1.15.1 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index d8a4e47e..877b4885 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 76170122..91175051 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 04df1395..9366f4e3 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 2590ba64..50b4d058 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT spring-cloud-consul-dependencies - 3.1.2-SNAPSHOT + 3.1.3-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 aa3f232f..a322d146 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/pom.xml b/spring-cloud-consul-integration-tests/pom.xml index 460c6ca9..5007883e 100644 --- a/spring-cloud-consul-integration-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-consul-integration-tests diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml index 7aafbc10..591b41de 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml index 4464b2f8..84134ab6 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml index 4d4ee21a..6e04d037 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 3787b7ef..f1a7a242 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2-SNAPSHOT + 3.1.3-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 28ca0af4..975d3371 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2-SNAPSHOT + 3.1.3-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 9e103842..d2b3c975 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2-SNAPSHOT + 3.1.3-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 f181ff5e..7f1e2f22 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 41de209e..089ba623 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-starter-consul From 9427a6797431a22fb805223dd4ab26d9dde88634 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 6 Sep 2022 20:24:43 +0000 Subject: [PATCH 06/11] Update SNAPSHOT to 3.1.2 --- 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-integration-tests/pom.xml | 2 +- .../spring-cloud-consul-bootstrap-tests/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-consul-configdata-tests/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 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 89919c4c..70b68b1d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.2 spring-cloud-consul-docs jar diff --git a/pom.xml b/pom.xml index 2bae4754..3f875458 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.2 pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 3.1.5-SNAPSHOT + 3.1.4 - 3.1.3-SNAPSHOT - 3.1.5-SNAPSHOT - 3.1.5-SNAPSHOT + 3.1.2 + 3.1.4 + 3.1.4 1.0.3.RELEASE - 3.1.5-SNAPSHOT - 3.2.6-SNAPSHOT + 3.1.4 + 3.2.5 1.15.1 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index 877b4885..8a9ae7f3 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 - 3.1.3-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 91175051..95a6f3ea 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 - 3.1.3-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 9366f4e3..3ec4f69d 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 - 3.1.3-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 50b4d058..e97bca2c 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.5-SNAPSHOT + 3.1.4 spring-cloud-consul-dependencies - 3.1.3-SNAPSHOT + 3.1.2 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 a322d146..654fcb25 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 - 3.1.3-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-consul-integration-tests/pom.xml b/spring-cloud-consul-integration-tests/pom.xml index 5007883e..146bc0aa 100644 --- a/spring-cloud-consul-integration-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.2 .. spring-cloud-consul-integration-tests diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml index 591b41de..46964daa 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.3-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml index 84134ab6..be39348c 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.3-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml index 6e04d037..7828fd61 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.3-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index f1a7a242..e09abb92 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.2 .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index 975d3371..bb0cf941 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.2 .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index d2b3c975..9f642b48 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.2 .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index 7f1e2f22..40881250 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 - 3.1.3-SNAPSHOT + 3.1.2 .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 089ba623..bf04b468 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.2 .. spring-cloud-starter-consul From cf54ed6afbb117da6211c08164a4808d8c775c30 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 6 Sep 2022 20:26:29 +0000 Subject: [PATCH 07/11] 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-integration-tests/pom.xml | 2 +- .../spring-cloud-consul-bootstrap-tests/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-consul-configdata-tests/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 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 70b68b1d..89919c4c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2 + 3.1.3-SNAPSHOT spring-cloud-consul-docs jar diff --git a/pom.xml b/pom.xml index 3f875458..2bae4754 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2 + 3.1.3-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 3.1.4 + 3.1.5-SNAPSHOT - 3.1.2 - 3.1.4 - 3.1.4 + 3.1.3-SNAPSHOT + 3.1.5-SNAPSHOT + 3.1.5-SNAPSHOT 1.0.3.RELEASE - 3.1.4 - 3.2.5 + 3.1.5-SNAPSHOT + 3.2.6-SNAPSHOT 1.15.1 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index 8a9ae7f3..877b4885 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 - 3.1.2 + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 95a6f3ea..91175051 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 - 3.1.2 + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 3ec4f69d..9366f4e3 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 - 3.1.2 + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index e97bca2c..50b4d058 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.4 + 3.1.5-SNAPSHOT spring-cloud-consul-dependencies - 3.1.2 + 3.1.3-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 654fcb25..a322d146 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 - 3.1.2 + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/pom.xml b/spring-cloud-consul-integration-tests/pom.xml index 146bc0aa..5007883e 100644 --- a/spring-cloud-consul-integration-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2 + 3.1.3-SNAPSHOT .. spring-cloud-consul-integration-tests diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml index 46964daa..591b41de 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.2 + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml index be39348c..84134ab6 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.2 + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml index 7828fd61..6e04d037 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.2 + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index e09abb92..f1a7a242 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2 + 3.1.3-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 bb0cf941..975d3371 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2 + 3.1.3-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 9f642b48..d2b3c975 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2 + 3.1.3-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 40881250..7f1e2f22 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 - 3.1.2 + 3.1.3-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index bf04b468..089ba623 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.2 + 3.1.3-SNAPSHOT .. spring-cloud-starter-consul From 9aa90dfaa6b6af06d7e27497a07d1540d6823616 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 6 Sep 2022 20:26:29 +0000 Subject: [PATCH 08/11] Bumping versions to 3.1.3-SNAPSHOT after release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2bae4754..078b5132 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ - 3.1.3-SNAPSHOT + 3.1.2 3.1.5-SNAPSHOT 3.1.5-SNAPSHOT 1.0.3.RELEASE From 1fc517cc7aceb539d81f4d4e3d765d90fd8fd7d0 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 28 Nov 2022 19:14:34 +0000 Subject: [PATCH 09/11] Bumping versions --- pom.xml | 12 ++++++------ spring-cloud-consul-dependencies/pom.xml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 078b5132..186c3aec 100644 --- a/pom.xml +++ b/pom.xml @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 3.1.5-SNAPSHOT + 3.1.6-SNAPSHOT - 3.1.2 - 3.1.5-SNAPSHOT - 3.1.5-SNAPSHOT + 3.1.3-SNAPSHOT + 3.1.6-SNAPSHOT + 3.1.6-SNAPSHOT 1.0.3.RELEASE - 3.1.5-SNAPSHOT - 3.2.6-SNAPSHOT + 3.1.6-SNAPSHOT + 3.2.7-SNAPSHOT 1.15.1 diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 50b4d058..c6d1592a 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -6,7 +6,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.5-SNAPSHOT + 3.1.6-SNAPSHOT spring-cloud-consul-dependencies From 3868846d13879ea1e1cc1cf477eeceb3e5a8b05f Mon Sep 17 00:00:00 2001 From: buildmaster Date: Sat, 25 Feb 2023 19:09:51 +0000 Subject: [PATCH 10/11] Bumping versions --- pom.xml | 10 +++++----- spring-cloud-consul-dependencies/pom.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 186c3aec..8c998e67 100644 --- a/pom.xml +++ b/pom.xml @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 3.1.6-SNAPSHOT + 3.1.7-SNAPSHOT 3.1.3-SNAPSHOT - 3.1.6-SNAPSHOT - 3.1.6-SNAPSHOT + 3.1.7-SNAPSHOT + 3.1.7-SNAPSHOT 1.0.3.RELEASE - 3.1.6-SNAPSHOT - 3.2.7-SNAPSHOT + 3.1.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.15.1 diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index c6d1592a..9f723a38 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -6,7 +6,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.6-SNAPSHOT + 3.1.7-SNAPSHOT spring-cloud-consul-dependencies From 5e0346c91e0ca05c53e7ce753b789d9539b1963d Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 8 Mar 2023 15:53:46 -0500 Subject: [PATCH 11/11] If consul token is not set, default to CONSUL_TOKEN env var This matches the behaviour of ConsulPropertySourceLocator which depends on ConsulConfigProperties that uses `@Value` which is not recognized in ConfigData. Fixes gh-738 --- pom.xml | 2 +- .../ConsulConfigDataLocationResolver.java | 7 +++++- ...ConsulConfigDataLocationResolverTests.java | 25 +++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8c998e67..31540bda 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 1.0.3.RELEASE 3.1.7-SNAPSHOT 3.2.8-SNAPSHOT - 1.15.1 + 1.17.6 diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java index 2bba719e..df8ede7d 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java @@ -212,9 +212,14 @@ public class ConsulConfigDataLocationResolver implements ConfigDataLocationResol .bind(ConsulConfigProperties.PREFIX, Bindable.of(ConsulConfigProperties.class), bindHandler) .orElseGet(ConsulConfigProperties::new); - if (StringUtils.isEmpty(properties.getName())) { + if (!StringUtils.hasText(properties.getName())) { properties.setName(binder.bind("spring.application.name", String.class).orElse("application")); } + + if (!StringUtils.hasText(properties.getAclToken())) { + properties.setAclToken(binder.bind("spring.cloud.consul.token", String.class) + .orElse(binder.bind("consul.token", String.class).orElse(null))); + } return properties; } diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolverTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolverTests.java index 7af3760c..cee033a4 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolverTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolverTests.java @@ -22,6 +22,8 @@ import java.util.stream.Collectors; import org.apache.commons.logging.LogFactory; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import org.springframework.boot.BootstrapRegistry.InstanceSupplier; import org.springframework.boot.DefaultBootstrapContext; @@ -30,6 +32,7 @@ import org.springframework.boot.context.config.ConfigDataLocationResolverContext import org.springframework.boot.context.config.Profiles; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.cloud.consul.ConsulProperties; +import org.springframework.core.env.SystemEnvironmentPropertySource; import org.springframework.mock.env.MockEnvironment; import org.springframework.web.util.UriComponents; import org.springframework.web.util.UriComponentsBuilder; @@ -81,6 +84,28 @@ public class ConsulConfigDataLocationResolverTests { assertThat(properties.getPort()).isEqualTo(8502); } + @ParameterizedTest + @ValueSource(strings = { "consul.token", "CONSUL_TOKEN", "spring.cloud.consul.token", "SPRING_CLOUD_CONSUL_TOKEN", + "spring.cloud.consul.config.acl-token" }) + public void testLoadConfigProperties(String property) { + MockEnvironment mockEnvironment = new MockEnvironment(); + String tokenValue = "mytoken"; + if (property.contains("_")) { + SystemEnvironmentPropertySource envPS = new SystemEnvironmentPropertySource("mocksysenv", + Collections.singletonMap(property, tokenValue)); + mockEnvironment.getPropertySources().addLast(envPS); + } + else { + mockEnvironment.setProperty(property, tokenValue); + } + Binder binder = Binder.get(mockEnvironment); + ConfigDataLocationResolverContext resolverContext = mock(ConfigDataLocationResolverContext.class); + when(resolverContext.getBinder()).thenReturn(binder); + when(resolverContext.getBootstrapContext()).thenReturn(new DefaultBootstrapContext()); + ConsulConfigProperties properties = createResolver().loadConfigProperties(resolverContext); + assertThat(properties.getAclToken()).isEqualTo(tokenValue); + } + private List toContexts(List locations) { return locations.stream().map(ConsulConfigDataResource::getContext).collect(Collectors.toList()); }