Going back to snapshots

2020-05-28 17:59:50 +00:00
parent 099a30b265
commit ed5440ba12
15 changed files with 21 additions and 34 deletions
--- 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
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>2.2.3.RELEASE</version>
+		<version>2.2.3.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-consul-docs</artifactId>
 	<packaging>pom</packaging>
--- 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.
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@

 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-consul</artifactId>
-	<version>2.2.3.RELEASE</version>
+	<version>2.2.3.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Consul</name>
 	<description>Spring Cloud Consul</description>
@@ -14,20 +14,20 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.0.BUILD-SNAPSHOT</version>
 		<relativePath/>
 		<!-- lookup parent from repository -->
 	</parent>

 	<properties>
 		<joda-time.version>2.10.5</joda-time.version>
-		<spring-cloud-bus.version>2.2.2.RELEASE</spring-cloud-bus.version>
-		<spring-cloud-commons.version>2.2.3.RELEASE</spring-cloud-commons.version>
-		<spring-cloud-config.version>2.2.3.RELEASE</spring-cloud-config.version>
-		<spring-cloud-netflix.version>2.2.3.RELEASE</spring-cloud-netflix.version>
+		<spring-cloud-bus.version>2.2.2.BUILD-SNAPSHOT</spring-cloud-bus.version>
+		<spring-cloud-commons.version>2.2.3.BUILD-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-config.version>2.2.3.BUILD-SNAPSHOT</spring-cloud-config.version>
+		<spring-cloud-netflix.version>2.2.3.BUILD-SNAPSHOT</spring-cloud-netflix.version>
 		<spring-cloud-deployer.version>1.0.3.RELEASE</spring-cloud-deployer.version>
-		<spring-cloud-openfeign.version>2.2.3.RELEASE</spring-cloud-openfeign.version>
-		<spring-cloud-stream.version>Horsham.SR5</spring-cloud-stream.version>
+		<spring-cloud-openfeign.version>2.2.3.BUILD-SNAPSHOT</spring-cloud-openfeign.version>
+		<spring-cloud-stream.version>Horsham.SR3</spring-cloud-stream.version>
 	</properties>

 	<scm>
--- a/spring-cloud-consul-binder/pom.xml
+++ b/spring-cloud-consul-binder/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>2.2.3.RELEASE</version>
+		<version>2.2.3.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-consul-config/pom.xml
+++ b/spring-cloud-consul-config/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>2.2.3.RELEASE</version>
+		<version>2.2.3.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-consul-core/pom.xml
+++ b/spring-cloud-consul-core/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>2.2.3.RELEASE</version>
+		<version>2.2.3.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-consul-dependencies/pom.xml
+++ b/spring-cloud-consul-dependencies/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.0.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-consul-dependencies</artifactId>
-	<version>2.2.3.RELEASE</version>
+	<version>2.2.3.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-consul-dependencies</name>
 	<description>Spring Cloud Consul Dependencies</description>
--- a/spring-cloud-consul-discovery/pom.xml
+++ b/spring-cloud-consul-discovery/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>2.2.3.RELEASE</version>
+		<version>2.2.3.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-consul-sample/pom.xml
+++ b/spring-cloud-consul-sample/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>2.2.3.RELEASE</version>
+		<version>2.2.3.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-starter-consul-all/pom.xml
+++ b/spring-cloud-starter-consul-all/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>2.2.3.RELEASE</version>
+		<version>2.2.3.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-consul-all</artifactId>
--- a/spring-cloud-starter-consul-bus/pom.xml
+++ b/spring-cloud-starter-consul-bus/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>2.2.3.RELEASE</version>
+		<version>2.2.3.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-consul-bus</artifactId>
--- a/spring-cloud-starter-consul-config/pom.xml
+++ b/spring-cloud-starter-consul-config/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>2.2.3.RELEASE</version>
+		<version>2.2.3.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-consul-config</artifactId>
--- a/spring-cloud-starter-consul-discovery/pom.xml
+++ b/spring-cloud-starter-consul-discovery/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>2.2.3.RELEASE</version>
+		<version>2.2.3.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-consul-discovery</artifactId>
--- a/spring-cloud-starter-consul/pom.xml
+++ b/spring-cloud-starter-consul/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>2.2.3.RELEASE</version>
+		<version>2.2.3.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-consul</artifactId>