From c4accf36bdcfbd676f85bd767fdaf25115c38dda Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 22 Nov 2019 14:23:02 +0000 Subject: [PATCH] Going back to snapshots --- README.adoc | 73 +------------------ docs/pom.xml | 2 +- pom.xml | 6 +- spring-cloud-starter-stream-rabbit/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-stream-binder-rabbit/pom.xml | 2 +- 7 files changed, 12 insertions(+), 77 deletions(-) diff --git a/README.adoc b/README.adoc index c2b490119..ed83ff48a 100644 --- a/README.adoc +++ b/README.adoc @@ -87,7 +87,7 @@ You can exclude the class by using the `@SpringBootApplication` annotation. Starting with version 2.0, the `RabbitMessageChannelBinder` sets the `RabbitTemplate.userPublisherConnection` property to `true` so that the non-transactional producers avoid deadlocks on consumers, which can happen if cached connections are blocked because of a https://www.rabbitmq.com/memory.html[memory alarm] on the broker. -NOTE: Currently, a `multiplex` consumer (a single consumer listening to multiple queues) is only supported for message-driven conssumers; polled consumers can only retrieve messages from a single queue. +NOTE: Currently, a `multiplex` consumer (a single consumer listening to multiple queues) is only supported for message-driven consumers; polled consumers can only retrieve messages from a single queue. == Configuration Options @@ -159,14 +159,9 @@ Whether to automatically declare the DLQ and bind it to the binder DLX. Default: `false`. bindingRoutingKey:: The routing key with which to bind the queue to the exchange (if `bindQueue` is `true`). -Can be multiple keys - see `bindingRoutingKeyDelimiter`. -For partitioned destinations, `-` is appended to each key. +For partitioned destinations, `-` is appended. + Default: `#`. -bindingRoutingKeyDelimiter:: -When this is not null, 'bindingRoutingKey' is considered to be a list of keys delimited by this value; often a comma is used. -+ -Default: `null`. bindQueue:: Whether to declare the queue and bind it to the destination exchange. Set it to `false` if you have set up your own infrastructure and have previously created and bound the queue. @@ -256,18 +251,6 @@ dlqOverflowBehavior:: Action to take when `dlqMaxLength` or `dlqMaxLengthBytes` is exceeded; currently `drop-head` or `reject-publish` but refer to the RabbitMQ documentation. + Default: `none` -dlqQuorum.deliveryLimit:: -When `quorum.enabled=true`, set a delivery limit after which the message is dropped or dead-lettered. -+ -Default: none - broker default will apply. -dlqQuorum.enabled:: -When true, create a quorum dead letter queue instead of a classic queue. -+ -Default: false -dlqQuorum.initialQuorumSize:: -When `quorum.enabled=true`, set the initial quorum size. -+ -Default: none - broker default will apply. dlqTtl:: Default time to live to apply to the dead letter queue when declared (in milliseconds). + @@ -374,18 +357,6 @@ Otherwise the queue name is `destination.group`. This is useful, for example, when using Spring Cloud Stream to consume from an existing RabbitMQ queue. + Default: false. -quorum.deliveryLimit:: -When `quorum.enabled=true`, set a delivery limit after which the message is dropped or dead-lettered. -+ -Default: none - broker default will apply. -quorum.enabled:: -When true, create a quorum queue instead of a classic queue. -+ -Default: false -quorum.initialQuorumSize:: -When `quorum.enabled=true`, set the initial quorum size. -+ -Default: none - broker default will apply. recoveryInterval:: The interval between connection recovery attempts, in milliseconds. + @@ -469,16 +440,10 @@ The batch timeout when batching is enabled. Default: `5000`. bindingRoutingKey:: The routing key with which to bind the queue to the exchange (if `bindQueue` is `true`). -Can be multiple keys - see `bindingRoutingKeyDelimiter`. -For partitioned destinations, `-n` is appended to each key. +Only applies to non-partitioned destinations. Only applies if `requiredGroups` are provided and then only to those groups. + Default: `#`. -bindingRoutingKeyDelimiter:: -When this is not null, 'bindingRoutingKey' is considered to be a list of keys delimited by this value; often a comma is used. -Only applies if `requiredGroups` are provided and then only to those groups. -+ -Default: `null`. bindQueue:: Whether to declare the queue and bind it to the destination exchange. Set it to `false` if you have set up your own infrastructure and have previously created and bound the queue. @@ -586,21 +551,6 @@ Maximum priority of messages in the dead letter queue (0-255) Applies only when `requiredGroups` are provided and then only to those groups. + Default: `none` -dlqQuorum.deliveryLimit:: -When `quorum.enabled=true`, set a delivery limit after which the message is dropped or dead-lettered. -Applies only when `requiredGroups` are provided and then only to those groups. -+ -Default: none - broker default will apply. -dlqQuorum.enabled:: -When true, create a quorum dead letter queue instead of a classic queue. -Applies only when `requiredGroups` are provided and then only to those groups. -+ -Default: false -dlqQuorum.initialQuorumSize:: -When `quorum.enabled=true`, set the initial quorum size. -Applies only when `requiredGroups` are provided and then only to those groups. -+ -Default: none - broker default will apply. dlqTtl:: Default time (in milliseconds) to live to apply to the dead letter queue when declared. Applies only when `requiredGroups` are provided and then only to those groups. @@ -666,21 +616,6 @@ This is useful, for example, when using Spring Cloud Stream to consume from an e Applies only when `requiredGroups` are provided and then only to those groups. + Default: false. -quorum.deliveryLimit:: -When `quorum.enabled=true`, set a delivery limit after which the message is dropped or dead-lettered. -Applies only when `requiredGroups` are provided and then only to those groups. -+ -Default: none - broker default will apply. -quorum.enabled:: -When true, create a quorum queue instead of a classic queue. -Applies only when `requiredGroups` are provided and then only to those groups. -+ -Default: false -quorum.initialQuorumSize:: -When `quorum.enabled=true`, set the initial quorum size. -Applies only when `requiredGroups` are provided and then only to those groups. -+ -Default: none - broker default will apply. routingKeyExpression:: A SpEL expression to determine the routing key to use when publishing messages. For a fixed routing key, use a literal expression, such as `routingKeyExpression='my.routingKey'` in a properties file or `routingKeyExpression: '''my.routingKey'''` in a YAML file. @@ -965,4 +900,4 @@ added after the original pull request but before a merge. if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). -// ====================================================================================== \ No newline at end of file +// ====================================================================================== diff --git a/docs/pom.xml b/docs/pom.xml index b095115b6..09e06b1ae 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-stream-binder-rabbit-parent - 3.0.0.RELEASE + 3.0.0.BUILD-SNAPSHOT pom spring-cloud-stream-binder-rabbit-docs diff --git a/pom.xml b/pom.xml index c67f59d8e..6c0e414a5 100644 --- a/pom.xml +++ b/pom.xml @@ -2,16 +2,16 @@ 4.0.0 spring-cloud-stream-binder-rabbit-parent - 3.0.0.RELEASE + 3.0.0.BUILD-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 2.2.0.RELEASE + 2.2.0.BUILD-SNAPSHOT - 3.0.0.RELEASE + 3.0.0.BUILD-SNAPSHOT 1.8 true true diff --git a/spring-cloud-starter-stream-rabbit/pom.xml b/spring-cloud-starter-stream-rabbit/pom.xml index 4771cc37a..70405d4aa 100644 --- a/spring-cloud-starter-stream-rabbit/pom.xml +++ b/spring-cloud-starter-stream-rabbit/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-stream-binder-rabbit-parent - 3.0.0.RELEASE + 3.0.0.BUILD-SNAPSHOT spring-cloud-starter-stream-rabbit Spring Cloud Starter Stream Rabbit diff --git a/spring-cloud-stream-binder-rabbit-core/pom.xml b/spring-cloud-stream-binder-rabbit-core/pom.xml index 0c2cee431..0d7a17ce9 100644 --- a/spring-cloud-stream-binder-rabbit-core/pom.xml +++ b/spring-cloud-stream-binder-rabbit-core/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-binder-rabbit-parent - 3.0.0.RELEASE + 3.0.0.BUILD-SNAPSHOT diff --git a/spring-cloud-stream-binder-rabbit-test-support/pom.xml b/spring-cloud-stream-binder-rabbit-test-support/pom.xml index 52b1db89b..bae3a583f 100644 --- a/spring-cloud-stream-binder-rabbit-test-support/pom.xml +++ b/spring-cloud-stream-binder-rabbit-test-support/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-stream-binder-rabbit-parent - 3.0.0.RELEASE + 3.0.0.BUILD-SNAPSHOT spring-cloud-stream-binder-rabbit-test-support Rabbit related test classes diff --git a/spring-cloud-stream-binder-rabbit/pom.xml b/spring-cloud-stream-binder-rabbit/pom.xml index 01d662433..df8f4dd8a 100644 --- a/spring-cloud-stream-binder-rabbit/pom.xml +++ b/spring-cloud-stream-binder-rabbit/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-binder-rabbit-parent - 3.0.0.RELEASE + 3.0.0.BUILD-SNAPSHOT