You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/03/17 07:44:51 UTC
[camel-spring-boot] branch master updated: CAMEL-16362:
camel-spring-boot - BOM generator JAR alignments error
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 757dbe1 CAMEL-16362: camel-spring-boot - BOM generator JAR alignments error
757dbe1 is described below
commit 757dbe1c9841bb08f6d08366dd1a836764001d6e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Mar 17 08:44:35 2021 +0100
CAMEL-16362: camel-spring-boot - BOM generator JAR alignments error
---
.../springboot/catalog/components/splunk.json | 1 +
.../ROOT/pages/spring-rabbitmq-starter.adoc | 7 +-
.../pom.xml | 6 +
tooling/camel-spring-boot-dependencies/pom.xml | 185 +++++++++++++++++++++
4 files changed, 198 insertions(+), 1 deletion(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/splunk.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/splunk.json
index 7e46223..57a9635 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/splunk.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/splunk.json
@@ -53,6 +53,7 @@
"raw": { "kind": "parameter", "displayName": "Raw", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.splunk.SplunkConfiguration", "configurationField": "configuration", "description": "Should the payload be inserted raw" },
"source": { "kind": "parameter", "displayName": "Source", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.splunk.SplunkConfiguration", "configurationField": "configuration", "description": "Splunk source argument" },
"sourceType": { "kind": "parameter", "displayName": "Source Type", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.splunk.SplunkConfiguration", "configurationField": "configuration", "description": "Splunk sourcetype argument" },
+ "tcpReceiverLocalPort": { "kind": "parameter", "displayName": "Tcp Receiver Local Port", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.splunk.SplunkConfiguration", "configurationField": "configuration", "description": "Splunk tcp receiver port defined locally on splunk server. (For example if splunk port 9997 is [...]
"tcpReceiverPort": { "kind": "parameter", "displayName": "Tcp Receiver Port", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.splunk.SplunkConfiguration", "configurationField": "configuration", "description": "Splunk tcp receiver port" },
"backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
"backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
diff --git a/docs/modules/ROOT/pages/spring-rabbitmq-starter.adoc b/docs/modules/ROOT/pages/spring-rabbitmq-starter.adoc
index 89d4cb6..223e1ae 100644
--- a/docs/modules/ROOT/pages/spring-rabbitmq-starter.adoc
+++ b/docs/modules/ROOT/pages/spring-rabbitmq-starter.adoc
@@ -17,7 +17,7 @@ When using spring-rabbitmq with Spring Boot make sure to use the following Maven
----
-The component supports 24 options, which are listed below.
+The component supports 29 options, which are listed below.
@@ -42,10 +42,15 @@ The component supports 24 options, which are listed below.
| *camel.component.spring-rabbitmq.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is proc [...]
| *camel.component.spring-rabbitmq.listener-container-factory* | To use a custom factory for creating and configuring ListenerContainer to be used by the consumer for receiving messages. The option is a org.apache.camel.component.springrabbit.ListenerContainerFactory type. | | ListenerContainerFactory
| *camel.component.spring-rabbitmq.max-concurrent-consumers* | The maximum number of consumers (available only with SMLC) | | Integer
+| *camel.component.spring-rabbitmq.maximum-retry-attempts* | How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message | 5 | Integer
| *camel.component.spring-rabbitmq.message-converter* | To use a custom MessageConverter so you can be in control how to map to/from a org.springframework.amqp.core.Message. The option is a org.springframework.amqp.support.converter.MessageConverter type. | | MessageConverter
| *camel.component.spring-rabbitmq.message-listener-container-type* | The type of the MessageListenerContainer | DMLC | String
| *camel.component.spring-rabbitmq.message-properties-converter* | To use a custom MessagePropertiesConverter so you can be in control how to map to/from a org.springframework.amqp.core.MessageProperties. The option is a org.apache.camel.component.springrabbit.MessagePropertiesConverter type. | | MessagePropertiesConverter
| *camel.component.spring-rabbitmq.prefetch-count* | Tell the broker how many messages to send to each consumer in a single request. Often this can be set quite high to improve throughput. | 250 | Integer
+| *camel.component.spring-rabbitmq.reject-and-dont-requeue* | Whether a Rabbitmq consumer should reject the message without requeuing. This enables failed messages to be sent to a Dead Letter Exchange/Queue, if the broker is so configured. | true | Boolean
+| *camel.component.spring-rabbitmq.reply-timeout* | Specify the timeout in milliseconds to be used when waiting for a reply message when doing request/reply messaging. The default value is 5 seconds. A negative value indicates an indefinite timeout. The option is a long type. | 5000 | Long
+| *camel.component.spring-rabbitmq.retry* | Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use. The option is a org.springframework.retry.interceptor.RetryOperationsInterceptor type. | | RetryOperationsInterceptor
+| *camel.component.spring-rabbitmq.retry-delay* | Delay in msec a Rabbitmq consumer will wait before redelivering a message that Camel failed to process | 1000 | Integer
| *camel.component.spring-rabbitmq.shutdown-timeout* | The time to wait for workers in milliseconds after the container is stopped. If any workers are active when the shutdown signal comes they will be allowed to finish processing as long as they can finish within this timeout. The option is a long type. | 5000 | Long
| *camel.component.spring-rabbitmq.test-connection-on-startup* | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | Boolean
|===
diff --git a/tooling/camel-spring-boot-dependencies-generator/pom.xml b/tooling/camel-spring-boot-dependencies-generator/pom.xml
index 943cf3a..10df82a 100644
--- a/tooling/camel-spring-boot-dependencies-generator/pom.xml
+++ b/tooling/camel-spring-boot-dependencies-generator/pom.xml
@@ -189,6 +189,12 @@
<exclude>io.netty*:*</exclude>
<exclude>org.scala-lang:*</exclude>
<exclude>org.apache.lucene:*</exclude>
+ <exclude>io.projectreactor*:*</exclude>
+ <exclude>org.reactivestreams*:*</exclude>
+ <exclude>io.dropwizard.metrics*:*</exclude>
+ <exclude>com.nimbusds:oauth2-oidc-sdk</exclude>
+ <exclude>com.squareup.okhttp3:okhttp</exclude>
+ <exclude>io.micrometer:micrometer-core</exclude>
<!-- Kafka -->
<exclude>org.apache.kafka:*</exclude>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index 90d0515..357432c 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -76,6 +76,156 @@
<version>1.2.75</version>
</dependency>
<dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-ai-formrecognizer</artifactId>
+ <version>3.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-ai-textanalytics</artifactId>
+ <version>5.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-core</artifactId>
+ <version>1.12.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-core-amqp</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-core-http-netty</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-core-http-okhttp</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-core-management</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-core-serializer-json-gson</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-core-serializer-json-jackson</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-core-test</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-core-tracing-opentelemetry</artifactId>
+ <version>1.0.0-beta.6</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-cosmos</artifactId>
+ <version>4.11.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-data-appconfiguration</artifactId>
+ <version>1.1.8</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-digitaltwins-core</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-identity</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-messaging-eventhubs</artifactId>
+ <version>5.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
+ <version>1.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-messaging-servicebus</artifactId>
+ <version>7.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-search-documents</artifactId>
+ <version>11.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-security-keyvault-certificates</artifactId>
+ <version>4.1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-security-keyvault-keys</artifactId>
+ <version>4.2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-security-keyvault-secrets</artifactId>
+ <version>4.2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-storage-blob</artifactId>
+ <version>12.10.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-storage-blob-batch</artifactId>
+ <version>12.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-storage-blob-cryptography</artifactId>
+ <version>12.10.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-storage-common</artifactId>
+ <version>12.10.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-storage-file-datalake</artifactId>
+ <version>12.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-storage-file-share</artifactId>
+ <version>12.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-storage-internal-avro</artifactId>
+ <version>12.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-storage-queue</artifactId>
+ <version>12.8.0</version>
+ </dependency>
+ <dependency>
<groupId>com.cloudbees.thirdparty</groupId>
<artifactId>zendesk-java-client</artifactId>
<version>0.14.0</version>
@@ -101,6 +251,21 @@
<version>3.4.2</version>
</dependency>
<dependency>
+ <groupId>com.microsoft.azure</groupId>
+ <artifactId>msal4j</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.microsoft.azure</groupId>
+ <artifactId>msal4j-persistence-extension</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.microsoft.azure</groupId>
+ <artifactId>qpid-proton-j-extensions</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0</version>
@@ -191,6 +356,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna-platform</artifactId>
+ <version>5.6.0</version>
+ </dependency>
+ <dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
<version>9.9.1-7</version>
@@ -3054,6 +3224,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-kotlin-dsl</artifactId>
+ <version>3.9.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-kubernetes</artifactId>
<version>3.9.0-SNAPSHOT</version>
</dependency>
@@ -4288,6 +4463,11 @@
<version>2.7.0</version>
</dependency>
<dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>proton-j</artifactId>
+ <version>0.33.4</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
<version>1.2.14</version>
@@ -4369,6 +4549,11 @@
<version>5.0.6</version>
</dependency>
<dependency>
+ <groupId>org.linguafranca.pwdb</groupId>
+ <artifactId>KeePassJava2</artifactId>
+ <version>2.1.4</version>
+ </dependency>
+ <dependency>
<groupId>org.mozilla</groupId>
<artifactId>rhino</artifactId>
<version>1.7.7.1</version>