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/08/17 07:30:20 UTC
[camel] 13/15: Upgrade apache any23 and regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b9d0b23e03294d8a986ad1dfcc2629bc4961da35
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Aug 17 07:31:54 2021 +0200
Upgrade apache any23 and regen
---
camel-dependencies/pom.xml | 6 +++---
.../org/apache/camel/catalog/components/graphql.json | 2 ++
.../org/apache/camel/catalog/docs/content-enricher.adoc | 2 +-
.../org/apache/camel/catalog/docs/message-translator.adoc | 2 +-
.../org/apache/camel/catalog/docs/polling-consumer.adoc | 1 -
.../resources/org/apache/camel/catalog/docs/rollback-eip.adoc | 10 ----------
.../org/apache/camel/catalog/docs/transactional-client.adoc | 11 ++++-------
.../resources/org/apache/camel/catalog/docs/wireTap-eip.adoc | 1 -
parent/pom.xml | 6 +++---
9 files changed, 14 insertions(+), 27 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 371850e..173f210 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -36,7 +36,7 @@
<activemq-artemis-version>2.17.0</activemq-artemis-version>
<activemq-version>5.16.2</activemq-version>
<ahc-version>2.12.3</ahc-version>
- <apache-any23-version>2.3</apache-any23-version>
+ <apache-any23-version>2.4</apache-any23-version>
<apache-drill-version>1.19.0</apache-drill-version>
<apache-gora-version>0.9</apache-gora-version>
<apacheds-version>2.0.0.AM26</apacheds-version>
@@ -467,8 +467,8 @@
<quartz-version>2.3.2</quartz-version>
<quickfixj-version>2.3.0</quickfixj-version>
<rabbitmq-amqp-client-version>5.12.0</rabbitmq-amqp-client-version>
- <rdf4j-model-version>2.4.4</rdf4j-model-version>
- <rdf4j-rio-version>2.4.4</rdf4j-rio-version>
+ <rdf4j-model-version>3.7.2</rdf4j-model-version>
+ <rdf4j-rio-version>3.7.2</rdf4j-rio-version>
<reactive-streams-version>1.0.3</reactive-streams-version>
<reactor-netty-version>1.0.2</reactor-netty-version>
<reactor-version>3.4.5</reactor-version>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/graphql.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/graphql.json
index d02a6fa..89b6011 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/graphql.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/graphql.json
@@ -32,7 +32,9 @@
"proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The proxy host in the format hostname:port." },
"query": { "kind": "parameter", "displayName": "Query", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The query text." },
"queryFile": { "kind": "parameter", "displayName": "Query File", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The query file name located in the classpath." },
+ "queryHeader": { "kind": "parameter", "displayName": "Query Header", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The name of a header containing the GraphQL query." },
"variables": { "kind": "parameter", "displayName": "Variables", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.util.json.JsonObject", "deprecated": false, "autowired": false, "secret": false, "description": "The JsonObject instance containing the operation variables." },
+ "variablesHeader": { "kind": "parameter", "displayName": "Variables Header", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The name of a header containing a JsonObject instance containing the operation variables." },
"accessToken": { "kind": "parameter", "displayName": "Access Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The access token sent in the Authorization header." },
"jwtAuthorizationType": { "kind": "parameter", "displayName": "Jwt Authorization Type", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Bearer", "description": "The JWT Authorization type. Default is Bearer." },
"password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The password for Basic authentication." },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-enricher.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-enricher.adoc
index 4468a91..a257f19 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-enricher.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-enricher.adoc
@@ -14,7 +14,7 @@ image::eip/DataEnricher.gif[image]
[[ContentEnricher-ContentenrichmentusingaMessageTranslatororaProcessor]]
== Content enrichment using a Message Translator or a Processor
-You can use xref:latest@manual:ROOT:templating.adoc[Templating] to consume a message from
+You can consume a message from
one destination, transform it with something like
xref:components::velocity-component.adoc[Velocity] or xref:components::xquery-component.adoc[XQuery], and then send
it on to another destination. For example using InOnly (one way
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/message-translator.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/message-translator.adoc
index 4974569..7dcf17a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/message-translator.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/message-translator.adoc
@@ -52,7 +52,7 @@ invoke a bean
</route>
----
-You can also use xref:latest@manual:ROOT:templating.adoc[Templating] to consume a message
+You can also consume a message
from one destination, transform it with something like
xref:components::velocity-component.adoc[Velocity] or xref:components::xquery-component.adoc[XQuery] and then send
it on to another destination. For example using InOnly (one way
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/polling-consumer.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/polling-consumer.adoc
index ba3dadd..5602085 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/polling-consumer.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/polling-consumer.adoc
@@ -424,5 +424,4 @@ defined in the xref:latest@manual:ROOT:registry.adoc[Registry] with the bean id
from("file://inbox/?pollStrategy=#myPoll").to("activemq:queue:inbox")
----
-xref:latest@manual:ROOT:using-this-pattern.adoc[Using This Pattern]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/rollback-eip.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/rollback-eip.adoc
index dd54a8a..4eb660f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/rollback-eip.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/rollback-eip.adoc
@@ -186,16 +186,6 @@ then we configure our routes. Notice that all we have to do is mark the
route as transacted using the *transacted*
tag.https://github.com/apache/camel/blob/main/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.xml[TransactionMinimalConfigurationTest.xml]
-Transaction error handler
-
-When a route is marked as transacted using *transacted* Camel will
-automatic use the
-xref:latest@manual:ROOT:transactionerrorhandler.adoc[TransactionErrorHandler] as
-xref:latest@manual:ROOT:error-handler.adoc[Error Handler]. It supports basically the same
-feature set as the xref:latest@manual:ROOT:defaulterrorhandler.adoc[DefaultErrorHandler],
-so you can for instance use xref:latest@manual:ROOT:exception-clause.adoc[Exception Clause]
-as well.
-
== Integration Testing with Spring
An Integration Test here means a test runner class annotated
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/transactional-client.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/transactional-client.adoc
index e66dcdb..f36bd43 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/transactional-client.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/transactional-client.adoc
@@ -288,13 +288,10 @@ route as transacted using the *transacted* tag.
=== Transaction error handler
When a route is marked as transacted using *transacted* Camel will
-automatic use the
-xref:latest@manual:ROOT:transactionerrorhandler.adoc[TransactionErrorHandler]
-as xref:latest@manual:ROOT:error-handler.adoc[Error Handler].
-It supports basically the same feature set as the
-xref:latest@manual:ROOT:defaulterrorhandler.adoc[DefaultErrorHandler],
-so you can for instance use
-xref:latest@manual:ROOT:exception-clause.adoc[Exception Clause]
+automatic use `TransactionErrorHandler` as the
+xref:latest@manual:ROOT:error-handler.adoc[Error Handler]. This error handler supports basically the same
+feature set as the xref:latest@manual:ROOT:defaulterrorhandler.adoc[DefaultErrorHandler],
+so you can for instance use xref:latest@manual:ROOT:exception-clause.adoc[Exception Clause]
as well.
[[TransactionalClient-IntegrationTestingwithSpring]]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/wireTap-eip.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/wireTap-eip.adoc
index de9b7ac..2c87f2c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/wireTap-eip.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/wireTap-eip.adoc
@@ -202,4 +202,3 @@ The following example sends a new message which has
See details at xref:multicast-eip.adoc[Multicast]
-xref:latest@manual:ROOT:using-this-pattern.adoc[Using This Pattern]
diff --git a/parent/pom.xml b/parent/pom.xml
index 156fb84..07578e9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -52,7 +52,7 @@
<activemq-artemis-version>2.17.0</activemq-artemis-version>
<ahc-version>2.12.3</ahc-version>
<apacheds-version>2.0.0.AM26</apacheds-version>
- <apache-any23-version>2.3</apache-any23-version>
+ <apache-any23-version>2.4</apache-any23-version>
<apache-drill-version>1.19.0</apache-drill-version>
<apache-gora-version>0.9</apache-gora-version>
<arangodb-java-version>6.12.3</arangodb-java-version>
@@ -453,8 +453,8 @@
<quartz-version>2.3.2</quartz-version>
<quickfixj-version>2.3.0</quickfixj-version>
<rabbitmq-amqp-client-version>5.12.0</rabbitmq-amqp-client-version>
- <rdf4j-rio-version>2.4.4</rdf4j-rio-version>
- <rdf4j-model-version>2.4.4</rdf4j-model-version>
+ <rdf4j-rio-version>3.7.2</rdf4j-rio-version>
+ <rdf4j-model-version>3.7.2</rdf4j-model-version>
<reactive-streams-version>1.0.3</reactive-streams-version>
<reactor-version>3.4.5</reactor-version>
<reactor-netty-version>1.0.2</reactor-netty-version>