This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.7.x by this push:
new 559bfa8 CAMEL-16785: camel 3.7.x - Dependency upgrades
559bfa8 is described below
commit 559bfa8535ac5d0e0da25512585d3d8d4801773d
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Jul 5 09:57:13 2021 +0200
CAMEL-16785: camel 3.7.x - Dependency upgrades
---
camel-dependencies/pom.xml | 32 +++++++++++-----------
.../apache/camel/catalog/components/rabbitmq.json | 4 ++-
parent/pom.xml | 32 +++++++++++-----------
3 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index beba9fd..2c2a0bf 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -34,7 +34,7 @@
<properties>
<abdera-version>1.1.3</abdera-version>
<activemq-artemis-version>2.16.0</activemq-artemis-version>
- <activemq-version>5.16.0</activemq-version>
+ <activemq-version>5.16.2</activemq-version>
<aether-version>1.0.2.v20150114</aether-version>
<ahc-version>2.12.1</ahc-version>
<android-annotations-version>4.1.1.4</android-annotations-version>
@@ -154,8 +154,8 @@
<corda-version>4.6</corda-version>
<couchbase-client-version>3.1.0</couchbase-client-version>
<curator-version>4.3.0</curator-version>
- <cxf-codegen-plugin-version>3.4.2</cxf-codegen-plugin-version>
- <cxf-version>3.4.2</cxf-version>
+ <cxf-codegen-plugin-version>3.4.4</cxf-codegen-plugin-version>
+ <cxf-version>3.4.4</cxf-version>
<cxf-version-range>[3.3,4.0)</cxf-version-range>
<cxf-xjc-plugin-version>3.3.1</cxf-xjc-plugin-version>
<cxf-xjc-utils-version>3.3.1</cxf-xjc-utils-version>
@@ -328,7 +328,7 @@
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
<jetty-version>${jetty9-version}</jetty-version>
- <jetty9-version>9.4.36.v20210114</jetty9-version>
+ <jetty9-version>9.4.42.v20210604</jetty9-version>
<jgit-version>5.9.0.202009080501-r</jgit-version>
<jgroups-raft-leveldbjni-version>1.8</jgroups-raft-leveldbjni-version>
<jgroups-raft-mapdb-version>1.0.8</jgroups-raft-mapdb-version>
@@ -340,7 +340,7 @@
<jmh-version>1.25.2</jmh-version>
<jnats-version>2.8.0</jnats-version>
<jodatime2-bundle-version>2.10.6</jodatime2-bundle-version>
- <johnzon-version>1.2.8</johnzon-version>
+ <johnzon-version>1.2.13</johnzon-version>
<jolokia-version>1.6.2</jolokia-version>
<jolt-version>0.1.1</jolt-version>
<jool-version>0.9.12</jool-version>
@@ -369,7 +369,7 @@
<jython-standalone-version>2.5.3</jython-standalone-version>
<jython-version>2.5.3</jython-version>
<jzlib-version>1.1.3</jzlib-version>
- <kafka-version>2.6.0</kafka-version>
+ <kafka-version>2.6.2</kafka-version>
<kie-version>7.46.0.Final</kie-version>
<kubernetes-client-version>4.13.0</kubernetes-client-version>
<kubernetes-model-version>4.13.0</kubernetes-model-version>
@@ -410,8 +410,8 @@
<maven-shade-plugin-version>3.2.1</maven-shade-plugin-version>
<maven-surefire-report-plugin-version>3.0.0-M4</maven-surefire-report-plugin-version>
<maven-war-plugin-version>3.2.3</maven-war-plugin-version>
- <metrics-version>4.1.12.1</metrics-version>
- <micrometer-version>1.6.1</micrometer-version>
+ <metrics-version>4.1.24</metrics-version>
+ <micrometer-version>1.6.8</micrometer-version>
<microprofile-config-version>1.4</microprofile-config-version>
<microprofile-fault-tolerance-version>2.1</microprofile-fault-tolerance-version>
<microprofile-health-version>2.2</microprofile-health-version>
@@ -437,7 +437,7 @@
<nessus-ipfs-version>1.0.0.Beta4</nessus-ipfs-version>
<nessus-weka-version>1.0.1</nessus-weka-version>
<netty-reactive-streams-version>2.0.4</netty-reactive-streams-version>
- <netty-version>4.1.60.Final</netty-version>
+ <netty-version>4.1.65.Final</netty-version>
<netty3-version>3.10.6.Final</netty3-version>
<networknt-json-schema-validator-version>1.0.45</networknt-json-schema-validator-version>
<nimbus-jose-jwt>8.9</nimbus-jose-jwt>
@@ -491,7 +491,7 @@
<robotframework-version>3.2.2</robotframework-version>
<rome-version>1.15.0</rome-version>
<rxjava-version>1.3.8</rxjava-version>
- <rxjava2-version>2.2.20</rxjava2-version>
+ <rxjava2-version>2.2.21</rxjava2-version>
<saxon-version>9.9.1-7</saxon-version>
<scala-datasonnet-version>2.13.3</scala-datasonnet-version>
<scala-version>2.11.7</scala-version>
@@ -519,15 +519,15 @@
<sourcecheckExcludesComma></sourcecheckExcludesComma>
<spark-version>2.4.6</spark-version>
<splunk-version>1.6.5.0_1</splunk-version>
- <spring-batch-version>4.3.1</spring-batch-version>
+ <spring-batch-version>4.3.3</spring-batch-version>
<spring-data-redis-version>2.3.0.RELEASE</spring-data-redis-version>
- <spring-integration-version>5.4.3</spring-integration-version>
- <spring-ldap-version>2.3.3.RELEASE</spring-ldap-version>
- <spring-security-version>5.4.2</spring-security-version>
+ <spring-integration-version>5.4.8</spring-integration-version>
+ <spring-ldap-version>2.3.4.RELEASE</spring-ldap-version>
+ <spring-security-version>5.4.7</spring-security-version>
<spring-version>${spring5-version}</spring-version>
<spring-version-range>[5,6)</spring-version-range>
<spring-ws-version>3.0.10.RELEASE</spring-ws-version>
- <spring5-version>5.3.6</spring5-version>
+ <spring5-version>5.3.8</spring5-version>
<sql-maven-plugin-version>1.5</sql-maven-plugin-version>
<squareup-okhttp-version>3.14.7</squareup-okhttp-version>
<squareup-okio-version>1.17.2</squareup-okio-version>
@@ -545,7 +545,7 @@
<trimStackTrace>false</trimStackTrace>
<twilio-version>7.55.3</twilio-version>
<twitter4j-version>4.0.7</twitter4j-version>
- <undertow-version>2.2.0.Final</undertow-version>
+ <undertow-version>2.2.8.Final</undertow-version>
<univocity-parsers-version>2.9.0</univocity-parsers-version>
<validation-api-version>2.0.1.Final</validation-api-version>
<vavr-version>0.10.2</vavr-version>
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rabbitmq.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rabbitmq.json
index 2c945e1..b071691 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rabbitmq.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rabbitmq.json
@@ -11,7 +11,7 @@
"supportLevel": "Stable",
"groupId": "org.apache.camel",
"artifactId": "camel-rabbitmq",
- "version": "3.7.0-SNAPSHOT",
+ "version": "3.7.5-SNAPSHOT",
"scheme": "rabbitmq",
"extendsScheme": "",
"syntax": "rabbitmq:exchangeName",
@@ -46,6 +46,7 @@
"prefetchEnabled": { "kind": "property", "displayName": "Prefetch
Enabled", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Enables the quality of
service on the RabbitMQConsumer side. You need to specify the option of
prefetchSize, prefetchCount, prefetchGlobal at the same time" },
"prefetchGlobal": { "kind": "property", "displayName": "Prefetch Global",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "description": "If the settings should be applied
to the entire channel rather than each consumer You need to specify the option
of prefetchSize, prefetchCount, prefetchGlobal at the same time" },
"prefetchSize": { "kind": "property", "displayName": "Prefetch Size",
"group": "consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"description": "The maximum amount of content (measured in octets) that the
server will deliver, 0 if unlimited. You need to specify the option of
prefetchSize, prefetchCount, prefetchGlobal at the same time" },
+ "recoverFromDeclareException": { "kind": "property", "displayName":
"Recover From Declare Exception", "group": "consumer", "label": "consumer",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Decides whether an exception during declaration of exchanges or
queues is recoverable or not. If the option is false, camel will throw an
exception when starting the consumer, which will [...]
"threadPoolSize": { "kind": "property", "displayName": "Thread Pool Size",
"group": "consumer (advanced)", "label": "consumer,advanced", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 10, "description": "The consumer uses a
Thread Pool Executor with a fixed number of threads. This setting allows you to
set that number of threads." },
"additionalHeaders": { "kind": "property", "displayName": "Additional
Headers", "group": "producer", "label": "producer", "required": false, "type":
"object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>",
"deprecated": false, "autowired": false, "secret": false, "description": "Map
of additional headers. These headers will be set only when the
'allowCustomHeaders' is set to true" },
"additionalProperties": { "kind": "property", "displayName": "Additional
Properties", "group": "producer", "label": "producer", "required": false,
"type": "object", "javaType": "java.util.Map<java.lang.String,
java.lang.Object>", "deprecated": false, "autowired": false, "secret": false,
"description": "Map of additional properties. These are standard RabbitMQ
properties as defined in com.rabbitmq.client.AMQP.BasicProperties The map keys
should be from org.apache.camel.component.rabbi [...]
@@ -111,6 +112,7 @@
"prefetchEnabled": { "kind": "parameter", "displayName": "Prefetch
Enabled", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Enables the quality of
service on the RabbitMQConsumer side. You need to specify the option of
prefetchSize, prefetchCount, prefetchGlobal at the same time" },
"prefetchGlobal": { "kind": "parameter", "displayName": "Prefetch Global",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "description": "If the settings should be applied
to the entire channel rather than each consumer You need to specify the option
of prefetchSize, prefetchCount, prefetchGlobal at the same time" },
"prefetchSize": { "kind": "parameter", "displayName": "Prefetch Size",
"group": "consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"description": "The maximum amount of content (measured in octets) that the
server will deliver, 0 if unlimited. You need to specify the option of
prefetchSize, prefetchCount, prefetchGlobal at the same time" },
+ "recoverFromDeclareException": { "kind": "parameter", "displayName":
"Recover From Declare Exception", "group": "consumer", "label": "consumer",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Decides whether an exception during declaration of exchanges or
queues is recoverable or not. If the option is false, camel will throw an
exception when starting the consumer, which will [...]
"reQueue": { "kind": "parameter", "displayName": "Re Queue", "group":
"consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "description": "This is used by the consumer to
control rejection of the message. When the consumer is complete processing the
exchange, and if the exchange failed, then the consumer is going to reject the
message from the RabbitMQ broker. If [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "autowired": false, "secret": false, "description": "To
let the consumer use a custom ExceptionHandler. Notice if the option
bridgeErrorHandler is enabled then this option is not in use. By default the
con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut",
"InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the exchange pattern when the consumer creates an
exchange." },
diff --git a/parent/pom.xml b/parent/pom.xml
index 875002d..1d99134 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -42,7 +42,7 @@
<!-- dependency versions -->
<abdera-version>1.1.3</abdera-version>
<!-- Note that activemq dependency is only used for testing! -->
- <activemq-version>5.16.0</activemq-version>
+ <activemq-version>5.16.2</activemq-version>
<activemq-artemis-version>2.16.0</activemq-artemis-version>
<aether-version>1.0.2.v20150114</aether-version>
<ahc-version>2.12.1</ahc-version>
@@ -137,9 +137,9 @@
<corda-version>4.6</corda-version>
<couchbase-client-version>3.1.0</couchbase-client-version>
<curator-version>4.3.0</curator-version>
- <cxf-version>3.4.2</cxf-version>
+ <cxf-version>3.4.4</cxf-version>
<cxf-version-range>[3.3,4.0)</cxf-version-range>
- <cxf-codegen-plugin-version>3.4.2</cxf-codegen-plugin-version>
+ <cxf-codegen-plugin-version>3.4.4</cxf-codegen-plugin-version>
<!-- cxf-xjc is not released as often -->
<cxf-xjc-plugin-version>3.3.1</cxf-xjc-plugin-version>
<cxf-xjc-utils-version>3.3.1</cxf-xjc-utils-version>
@@ -308,7 +308,7 @@
<jedis-client-version>3.3.0</jedis-client-version>
<jersey-version>2.28</jersey-version>
<jetcd-version>0.5.4</jetcd-version>
- <jetty9-version>9.4.36.v20210114</jetty9-version>
+ <jetty9-version>9.4.42.v20210604</jetty9-version>
<jetty-version>${jetty9-version}</jetty-version>
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
@@ -330,7 +330,7 @@
<jool-version>0.9.12</jool-version>
<jooq-version>3.14.4</jooq-version>
<joor-version>0.9.13</joor-version>
- <johnzon-version>1.2.8</johnzon-version>
+ <johnzon-version>1.2.13</johnzon-version>
<jose4j-version>0.6.4</jose4j-version>
<jsendnsca-version>2.1.1</jsendnsca-version>
<jslt-version>0.1.10</jslt-version>
@@ -352,7 +352,7 @@
<jython-version>2.5.3</jython-version>
<jython-standalone-version>2.5.3</jython-standalone-version>
<jzlib-version>1.1.3</jzlib-version>
- <kafka-version>2.6.0</kafka-version>
+ <kafka-version>2.6.2</kafka-version>
<kie-version>7.46.0.Final</kie-version>
<kubernetes-client-version>4.13.0</kubernetes-client-version>
<kubernetes-model-version>4.13.0</kubernetes-model-version>
@@ -396,8 +396,8 @@
<maven-shade-plugin-version>3.2.1</maven-shade-plugin-version>
<maven-surefire-report-plugin-version>3.0.0-M4</maven-surefire-report-plugin-version>
<maven-war-plugin-version>3.2.3</maven-war-plugin-version>
- <metrics-version>4.1.12.1</metrics-version>
- <micrometer-version>1.6.1</micrometer-version>
+ <metrics-version>4.1.24</metrics-version>
+ <micrometer-version>1.6.8</micrometer-version>
<microprofile-config-version>1.4</microprofile-config-version>
<microprofile-metrics-version>2.3</microprofile-metrics-version>
<microprofile-health-version>2.2</microprofile-health-version>
@@ -424,7 +424,7 @@
<nsq-client-version>1.0.0.RC4</nsq-client-version>
<neoscada-version>0.4.0</neoscada-version>
<netty3-version>3.10.6.Final</netty3-version>
- <netty-version>4.1.60.Final</netty-version>
+ <netty-version>4.1.65.Final</netty-version>
<netty-reactive-streams-version>2.0.4</netty-reactive-streams-version>
<networknt-json-schema-validator-version>1.0.45</networknt-json-schema-validator-version>
<nimbus-jose-jwt>8.9</nimbus-jose-jwt>
@@ -479,7 +479,7 @@
<robotframework-version>3.2.2</robotframework-version>
<rome-version>1.15.0</rome-version>
<rxjava-version>1.3.8</rxjava-version>
- <rxjava2-version>2.2.20</rxjava2-version>
+ <rxjava2-version>2.2.21</rxjava2-version>
<saxon-version>9.9.1-7</saxon-version>
<scala-version>2.11.7</scala-version>
<scala-datasonnet-version>2.13.3</scala-datasonnet-version>
@@ -506,14 +506,14 @@
<solr-version-range>[8,9)</solr-version-range>
<spark-version>2.4.6</spark-version>
<splunk-version>1.6.5.0_1</splunk-version>
- <spring-batch-version>4.3.1</spring-batch-version>
+ <spring-batch-version>4.3.3</spring-batch-version>
<spring-data-redis-version>2.3.0.RELEASE</spring-data-redis-version>
- <spring-integration-version>5.4.3</spring-integration-version>
- <spring-ldap-version>2.3.3.RELEASE</spring-ldap-version>
+ <spring-integration-version>5.4.8</spring-integration-version>
+ <spring-ldap-version>2.3.4.RELEASE</spring-ldap-version>
<spring-version-range>[5,6)</spring-version-range>
<spring-version>${spring5-version}</spring-version>
- <spring5-version>5.3.6</spring5-version>
- <spring-security-version>5.4.2</spring-security-version>
+ <spring5-version>5.3.8</spring5-version>
+ <spring-security-version>5.4.7</spring-security-version>
<spring-ws-version>3.0.10.RELEASE</spring-ws-version>
<sql-maven-plugin-version>1.5</sql-maven-plugin-version>
<squareup-okhttp-version>3.14.7</squareup-okhttp-version>
@@ -532,7 +532,7 @@
<tika-version>1.25</tika-version>
<twilio-version>7.55.3</twilio-version>
<twitter4j-version>4.0.7</twitter4j-version>
- <undertow-version>2.2.0.Final</undertow-version>
+ <undertow-version>2.2.8.Final</undertow-version>
<univocity-parsers-version>2.9.0</univocity-parsers-version>
<validation-api-version>2.0.1.Final</validation-api-version>
<vavr-version>0.10.2</vavr-version>
