diff --git a/README.adoc b/README.adoc index 26cbbf53..df459c27 100644 --- a/README.adoc +++ b/README.adoc @@ -111,11 +111,6 @@ https://eclipse.org[Eclipse] when working with the code. We use the https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better. -==== Activate the Spring Maven profile -Spring Cloud projects require the 'spring' Maven profile to be activated to resolve -the spring milestone and snapshot repositories. Use your preferred IDE to set this -profile to be active, or you may experience build errors. - ==== Importing into eclipse with m2eclipse We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with eclipse. If you don't already have m2eclipse installed it is available from the "eclipse diff --git a/docs/pom.xml b/docs/pom.xml index acbbabb4..9224fb13 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT spring-cloud-consul-docs pom diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 8f6cd748..57be0be4 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -21,7 +21,6 @@ |spring.cloud.consul.discovery.default-query-tag | | Tag to query for in service list if one is not listed in serverListQueryTags. |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.health-check-critical-timeout | | Timeout to deregister services critical for longer than timeout (e.g. 30m). Requires consul version 7.x or higher. @@ -42,12 +41,9 @@ |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.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-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.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. @@ -59,18 +55,14 @@ |spring.cloud.consul.discovery.server-list-query-tags | | Map of serviceId's -> tag to query for in server list. This allows filtering services by a single tag. |spring.cloud.consul.discovery.service-name | | Service name. |spring.cloud.consul.discovery.tags | | Tags to use when registering service. -|spring.cloud.consul.discovery.tags-as-metadata | true | Use tags as metadata, defaults to true. |spring.cloud.consul.enabled | true | Is spring cloud consul enabled. |spring.cloud.consul.host | localhost | Consul agent hostname. Defaults to 'localhost'. |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.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.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. diff --git a/pom.xml b/pom.xml index 70305497..258e81f1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -14,20 +14,20 @@ org.springframework.cloud spring-cloud-build - 2.3.0.RELEASE + 2.3.0.BUILD-SNAPSHOT 2.10.5 - 2.2.2.RELEASE - 2.2.3.RELEASE - 2.2.3.RELEASE - 2.2.3.RELEASE + 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT 1.0.3.RELEASE - 2.2.3.RELEASE - Horsham.SR5 + 2.2.3.BUILD-SNAPSHOT + Horsham.SR3 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index 6f4f8df7..73c8b645 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 - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index cbf7bee5..2b9fc167 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 - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 4c2a9c53..0fe15561 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 - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 637c693c..a20d0adc 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 - 2.3.0.RELEASE + 2.3.0.BUILD-SNAPSHOT spring-cloud-consul-dependencies - 2.2.3.RELEASE + 2.2.3.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 b6b99b44..f3fd6a93 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 - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml index d49ab4ea..b7fc3472 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 - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 3be47c49..5fbe40d4 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 - 2.2.3.RELEASE + 2.2.3.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 d117c58e..cdf8d54f 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 - 2.2.3.RELEASE + 2.2.3.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 0200ca82..1ec2a2d7 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 - 2.2.3.RELEASE + 2.2.3.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 e2a6af63..820f27b0 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 - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 0ed2f50f..701d4889 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 - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT .. spring-cloud-starter-consul