This is an automated email from the ASF dual-hosted git repository. dmvolod pushed a commit to branch camel-2.22.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0aa9ff04594917b034181f3f97c7f4cdee305e9e Author: Dmitry Volodin <[email protected]> AuthorDate: Tue Jul 24 13:08:44 2018 +0300 Regen --- components/readme.adoc | 2 +- .../rabbitmq/springboot/RabbitMQComponentConfiguration.java | 9 --------- .../service/springboot/ServiceComponentConfiguration.java | 4 ++-- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/components/readme.adoc b/components/readme.adoc index e2470a0..176ba70 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -726,7 +726,7 @@ Number of Components: 297 in 203 JAR artifacts (20 deprecated) `seda:name` | 1.1 | The seda component provides asynchronous call to another endpoint from any CamelContext in the same JVM. | link:camel-service/src/main/docs/service-component.adoc[Service] (camel-service) + -`service:serviceName:delegateUri` | 2.22 | Represents an endpoint which only becomes active when the CamelClusterView has the leadership. +`service:serviceName:delegateUri` | 2.22 | Represents an endpoint which is registered to a Service Registry such as Consul, Etcd. | link:camel-servicenow/camel-servicenow-component/src/main/docs/servicenow-component.adoc[ServiceNow] (camel-servicenow) + `servicenow:instanceName` | 2.18 | The servicenow component is used to integrate Camel with ServiceNow cloud services. diff --git a/platforms/spring-boot/components-starter/camel-rabbitmq-starter/src/main/java/org/apache/camel/component/rabbitmq/springboot/RabbitMQComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-rabbitmq-starter/src/main/java/org/apache/camel/component/rabbitmq/springboot/RabbitMQComponentConfiguration.java index a20a915..f1459e5 100644 --- a/platforms/spring-boot/components-starter/camel-rabbitmq-starter/src/main/java/org/apache/camel/component/rabbitmq/springboot/RabbitMQComponentConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-rabbitmq-starter/src/main/java/org/apache/camel/component/rabbitmq/springboot/RabbitMQComponentConfiguration.java @@ -37,16 +37,7 @@ public class RabbitMQComponentConfiguration ComponentConfigurationPropertiesCommon { /** -<<<<<<< HEAD - * The hostname of the running rabbitmq instance or cluster. -======= - * Whether to enable auto configuration of the rabbitmq component. This is - * enabled by default. - */ - private Boolean enabled; - /** * The hostname of the running RabbitMQ instance or cluster. ->>>>>>> fddedbc44de... CAMEL-12654: RabbitMQ Headers - Headers with null value are skipped */ private String hostname; /** diff --git a/platforms/spring-boot/components-starter/camel-service-starter/src/main/java/org/apache/camel/component/service/springboot/ServiceComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-service-starter/src/main/java/org/apache/camel/component/service/springboot/ServiceComponentConfiguration.java index 87f9814..bac347f 100644 --- a/platforms/spring-boot/components-starter/camel-service-starter/src/main/java/org/apache/camel/component/service/springboot/ServiceComponentConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-service-starter/src/main/java/org/apache/camel/component/service/springboot/ServiceComponentConfiguration.java @@ -24,8 +24,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; /** - * Represents an endpoint which only becomes active when the CamelClusterView - * has the leadership. + * Represents an endpoint which is registered to a Service Registry such as + * Consul, Etcd. * * Generated by camel-package-maven-plugin - do not edit this file! */
