This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch sandbox/camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit d3af2a456eeef1bb66fc09fb0e9f9b3c5cc4eb2a Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Mon Nov 12 13:33:57 2018 +0100 Regen --- camel-core/readme.adoc | 2 +- components/camel-aws/src/main/docs/aws-sqs-component.adoc | 3 ++- components/camel-jms/src/main/docs/jms-component.adoc | 1 - components/readme.adoc | 4 ++-- .../camel/component/nsq/springboot/NsqComponentAutoConfiguration.java | 4 ++-- .../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/camel-core/readme.adoc b/camel-core/readme.adoc index 35aaf17..409ba95 100644 --- a/camel-core/readme.adoc +++ b/camel-core/readme.adoc @@ -103,7 +103,7 @@ Data Formats // dataformats: START -Number of Data Formats: 4 in 34 JAR artifacts (0 deprecated) +Number of Data Formats: 4 in 35 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== diff --git a/components/camel-aws/src/main/docs/aws-sqs-component.adoc b/components/camel-aws/src/main/docs/aws-sqs-component.adoc index 970bb77..d5dc6e8 100644 --- a/components/camel-aws/src/main/docs/aws-sqs-component.adoc +++ b/components/camel-aws/src/main/docs/aws-sqs-component.adoc @@ -128,7 +128,7 @@ with the following path and query parameters: === Spring Boot Auto-Configuration -The component supports 30 options, which are listed below. +The component supports 31 options, which are listed below. @@ -142,6 +142,7 @@ The component supports 30 options, which are listed below. | *camel.component.aws-sqs.configuration.attribute-names* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | | String | *camel.component.aws-sqs.configuration.concurrent-consumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | Integer | *camel.component.aws-sqs.configuration.default-visibility-timeout* | The default visibility timeout (in seconds) | | Integer +| *camel.component.aws-sqs.configuration.delay-queue* | Define if you want to apply delaySeconds option to the queue or on single messages | false | Boolean | *camel.component.aws-sqs.configuration.delay-seconds* | Delay sending messages for a number of seconds. | | Integer | *camel.component.aws-sqs.configuration.delete-after-read* | Delete message from SQS after it has been read | true | Boolean | *camel.component.aws-sqs.configuration.delete-if-filtered* | Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage. | true | Boolean diff --git a/components/camel-jms/src/main/docs/jms-component.adoc b/components/camel-jms/src/main/docs/jms-component.adoc index a451d5e..afc4525 100644 --- a/components/camel-jms/src/main/docs/jms-component.adoc +++ b/components/camel-jms/src/main/docs/jms-component.adoc @@ -604,7 +604,6 @@ The component supports 171 options, which are listed below. | *camel.component.jms.username* | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *camel.component.jms.wait-for-provision-correlation-to-be-updated-counter* | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | Integer | *camel.component.jms.wait-for-provision-correlation-to-be-updated-thread-sleeping-time* | Interval in millis to sleep each time while waiting for provisional correlation id to be updated. | 100 | Long -| *camel.component.jms.configuration.transacted-in-out* | | | Boolean |=== // spring-boot-auto-configure options: END diff --git a/components/readme.adoc b/components/readme.adoc index 68397f7..b939492 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -2,7 +2,7 @@ Components ^^^^^^^^^^ // components: START -Number of Components: 280 in 185 JAR artifacts (0 deprecated) +Number of Components: 281 in 186 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -859,7 +859,7 @@ Data Formats ^^^^^^^^^^^^ // dataformats: START -Number of Data Formats: 43 in 34 JAR artifacts (0 deprecated) +Number of Data Formats: 45 in 35 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== diff --git a/platforms/spring-boot/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentAutoConfiguration.java index dbab909..881648e 100644 --- a/platforms/spring-boot/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentAutoConfiguration.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import javax.annotation.Generated; - import org.apache.camel.CamelContext; import org.apache.camel.component.nsq.NsqComponent; import org.apache.camel.spi.ComponentCustomizer; @@ -31,12 +30,13 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper; import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator; -import org.apache.camel.util.IntrospectionSupport; +import org.apache.camel.support.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationContext; diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index 15fc032..09fde21 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -3425,7 +3425,7 @@ <dependency> <groupId>org.knowm.xchange</groupId> <artifactId>xchange-core</artifactId> - <version>4.3.11</version> + <version>4.3.12</version> </dependency> <dependency> <groupId>org.mozilla</groupId>