You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/05/20 05:37:19 UTC
[camel] branch main updated (95e79abd883 -> 490801029d0)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 95e79abd883 Camel-Infinispan Test-Infra: Upgrade Infinispan server to version 13.0.10.Final-2
new aaba1a6b0a1 Upgrade Tika to version 2.4.0
new 7de9e4a2b55 Sync deps and regen
new 490801029d0 Regen
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-dependencies/pom.xml | 2 +-
.../apache/camel/catalog/models/errorHandler.json | 24 ++++++++++++++++++----
parent/pom.xml | 2 +-
3 files changed, 22 insertions(+), 6 deletions(-)
[camel] 03/03: Regen
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 490801029d07498d6095da2d75defe3a053e1bb3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri May 20 07:36:59 2022 +0200
Regen
---
.../apache/camel/catalog/archetypes/archetype-catalog.xml | 14 +++++++-------
.../org/apache/camel/catalog/components/debezium-db2.json | 4 ++--
.../camel/catalog/components/google-secret-manager.json | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml
index 7f967d476ea..7fb5c32738f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml
@@ -4,43 +4,43 @@
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
<artifactId>camel-archetype-api-component</artifactId>
- <version>3.17.0-SNAPSHOT</version>
+ <version>3.18.0-SNAPSHOT</version>
<description>Creates a new Camel component that wraps one or more API proxies.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
<artifactId>camel-archetype-cdi</artifactId>
- <version>3.17.0-SNAPSHOT</version>
+ <version>3.18.0-SNAPSHOT</version>
<description>Creates a new Camel project using CDI.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
<artifactId>camel-archetype-component</artifactId>
- <version>3.17.0-SNAPSHOT</version>
+ <version>3.18.0-SNAPSHOT</version>
<description>Creates a new Camel component.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
<artifactId>camel-archetype-dataformat</artifactId>
- <version>3.17.0-SNAPSHOT</version>
+ <version>3.18.0-SNAPSHOT</version>
<description>Creates a new Camel data format.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
<artifactId>camel-archetype-java</artifactId>
- <version>3.17.0-SNAPSHOT</version>
+ <version>3.18.0-SNAPSHOT</version>
<description>Creates a new Camel project using Java DSL.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
<artifactId>camel-archetype-main</artifactId>
- <version>3.17.0-SNAPSHOT</version>
+ <version>3.18.0-SNAPSHOT</version>
<description>Creates a new Camel project using standalone Camel Main.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
<artifactId>camel-archetype-spring</artifactId>
- <version>3.17.0-SNAPSHOT</version>
+ <version>3.18.0-SNAPSHOT</version>
<description>Creates a new Camel project with added Spring DSL support.</description>
</archetype>
</archetypes>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-db2.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-db2.json
index fc212c74e33..cb09da33bc6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-db2.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-db2.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "debezium-db2",
"title": "Debezium DB2 Connector",
- "description": "Capture changes from a Oracle database.",
+ "description": "Capture changes from a DB2 database.",
"deprecated": false,
"firstVersion": "3.17.0",
"label": "database,sql",
@@ -11,7 +11,7 @@
"supportLevel": "Preview",
"groupId": "org.apache.camel",
"artifactId": "camel-debezium-db2",
- "version": "3.17.0-SNAPSHOT",
+ "version": "3.18.0-SNAPSHOT",
"scheme": "debezium-db2",
"extendsScheme": "",
"syntax": "debezium-db2:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-secret-manager.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-secret-manager.json
index 45d00137287..885cfbc75df 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-secret-manager.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-secret-manager.json
@@ -8,10 +8,10 @@
"firstVersion": "3.16.0",
"label": "cloud",
"javaType": "org.apache.camel.component.google.secret.manager.GoogleSecretManagerComponent",
- "supportLevel": "Preview",
+ "supportLevel": "Stable",
"groupId": "org.apache.camel",
"artifactId": "camel-google-secret-manager",
- "version": "3.17.0-SNAPSHOT",
+ "version": "3.18.0-SNAPSHOT",
"scheme": "google-secret-manager",
"extendsScheme": "",
"syntax": "google-secret-manager:project",
[camel] 02/03: Sync deps and regen
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7de9e4a2b55ef46aa5f2feb98ee27209a93c31ff
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri May 20 06:50:26 2022 +0200
Sync deps and regen
---
camel-dependencies/pom.xml | 2 +-
.../camel/catalog/archetypes/archetype-catalog.xml | 14 ++++++-------
.../camel/catalog/components/debezium-db2.json | 4 ++--
.../catalog/components/google-secret-manager.json | 4 ++--
.../apache/camel/catalog/models/errorHandler.json | 24 ++++++++++++++++++----
5 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 281904b8a5a..101e4601681 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -521,7 +521,7 @@
<swagger-openapi3-version>2.1.13</swagger-openapi3-version>
<templating-maven-plugin-version>1.0.0</templating-maven-plugin-version>
<testcontainers-version>1.17.1</testcontainers-version>
- <tika-version>2.3.0</tika-version>
+ <tika-version>2.4.0</tika-version>
<trimStackTrace>false</trimStackTrace>
<twilio-version>7.55.3</twilio-version>
<twitter4j-version>4.0.7</twitter4j-version>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml
index 7fb5c32738f..7f967d476ea 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml
@@ -4,43 +4,43 @@
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
<artifactId>camel-archetype-api-component</artifactId>
- <version>3.18.0-SNAPSHOT</version>
+ <version>3.17.0-SNAPSHOT</version>
<description>Creates a new Camel component that wraps one or more API proxies.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
<artifactId>camel-archetype-cdi</artifactId>
- <version>3.18.0-SNAPSHOT</version>
+ <version>3.17.0-SNAPSHOT</version>
<description>Creates a new Camel project using CDI.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
<artifactId>camel-archetype-component</artifactId>
- <version>3.18.0-SNAPSHOT</version>
+ <version>3.17.0-SNAPSHOT</version>
<description>Creates a new Camel component.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
<artifactId>camel-archetype-dataformat</artifactId>
- <version>3.18.0-SNAPSHOT</version>
+ <version>3.17.0-SNAPSHOT</version>
<description>Creates a new Camel data format.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
<artifactId>camel-archetype-java</artifactId>
- <version>3.18.0-SNAPSHOT</version>
+ <version>3.17.0-SNAPSHOT</version>
<description>Creates a new Camel project using Java DSL.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
<artifactId>camel-archetype-main</artifactId>
- <version>3.18.0-SNAPSHOT</version>
+ <version>3.17.0-SNAPSHOT</version>
<description>Creates a new Camel project using standalone Camel Main.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
<artifactId>camel-archetype-spring</artifactId>
- <version>3.18.0-SNAPSHOT</version>
+ <version>3.17.0-SNAPSHOT</version>
<description>Creates a new Camel project with added Spring DSL support.</description>
</archetype>
</archetypes>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-db2.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-db2.json
index cb09da33bc6..fc212c74e33 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-db2.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-db2.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "debezium-db2",
"title": "Debezium DB2 Connector",
- "description": "Capture changes from a DB2 database.",
+ "description": "Capture changes from a Oracle database.",
"deprecated": false,
"firstVersion": "3.17.0",
"label": "database,sql",
@@ -11,7 +11,7 @@
"supportLevel": "Preview",
"groupId": "org.apache.camel",
"artifactId": "camel-debezium-db2",
- "version": "3.18.0-SNAPSHOT",
+ "version": "3.17.0-SNAPSHOT",
"scheme": "debezium-db2",
"extendsScheme": "",
"syntax": "debezium-db2:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-secret-manager.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-secret-manager.json
index 885cfbc75df..45d00137287 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-secret-manager.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-secret-manager.json
@@ -8,10 +8,10 @@
"firstVersion": "3.16.0",
"label": "cloud",
"javaType": "org.apache.camel.component.google.secret.manager.GoogleSecretManagerComponent",
- "supportLevel": "Stable",
+ "supportLevel": "Preview",
"groupId": "org.apache.camel",
"artifactId": "camel-google-secret-manager",
- "version": "3.18.0-SNAPSHOT",
+ "version": "3.17.0-SNAPSHOT",
"scheme": "google-secret-manager",
"extendsScheme": "",
"syntax": "google-secret-manager:project",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json
index ddcf5343eb1..b35eb757c4a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json
@@ -3,16 +3,32 @@
"kind": "model",
"name": "errorHandler",
"title": "Error Handler",
- "description": "Camel error handling.",
+ "description": "Error handler settings",
"deprecated": false,
- "label": "configuration,error",
- "javaType": "org.apache.camel.model.ErrorHandlerDefinition",
+ "label": "spring,configuration,error",
+ "javaType": "org.apache.camel.spring.xml.SpringErrorHandlerDefinition",
"abstract": false,
"input": false,
"output": false
},
"properties": {
- "errorHandlerType": { "kind": "element", "displayName": "Error Handler Type", "required": true, "type": "object", "javaType": "org.apache.camel.ErrorHandlerFactory", "oneOf": [ "deadLetterChannel", "defaultErrorHandler", "jtaTransactionErrorHandler", "noErrorHandler", "springTransactionErrorHandler" ], "deprecated": false, "autowired": false, "secret": false, "description": "The specific error handler in use." },
+ "type": { "kind": "attribute", "displayName": "Type", "required": true, "type": "enum", "javaType": "org.apache.camel.spring.xml.SpringErrorHandlerType", "enum": [ "dead-letter-channel", "default-error-handler", "no-error-handler", "transaction-error-handler" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DefaultErrorHandler", "description": "The type of the error handler" },
+ "deadLetterUri": { "kind": "attribute", "displayName": "Dead Letter Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The dead letter endpoint uri for the Dead Letter error handler." },
+ "deadLetterHandleNewException": { "kind": "attribute", "displayName": "Dead Letter Handle New Exception", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Whether the dead letter channel should handle (and ignore) any new exception that may been thrown during sending the message to the dead letter endpoint. The default value is true which means any such kind of exception is handled and ignor [...]
+ "level": { "kind": "attribute", "displayName": "Level", "required": false, "type": "enum", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "debug", "error", "info", "off", "trace", "warn" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "ERROR", "description": "Logging level to use when using the logging error handler type." },
+ "rollbackLoggingLevel": { "kind": "attribute", "displayName": "Rollback Logging Level", "required": false, "type": "enum", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "debug", "error", "info", "off", "trace", "warn" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "WARN", "description": "Sets the logging level to use for logging transactional rollback. This option is default WARN." },
+ "logName": { "kind": "attribute", "displayName": "Log Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of the logger to use for the logging error handler" },
+ "useOriginalMessage": { "kind": "attribute", "displayName": "Use Original Message", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Will use the original input org.apache.camel.Message (original body and headers) when an org.apache.camel.Exchange is moved to the dead letter queue. Notice: this only applies when all redeliveries attempt have failed and the org.apache [...]
+ "useOriginalBody": { "kind": "attribute", "displayName": "Use Original Body", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Will use the original input org.apache.camel.Message body (original body only) when an org.apache.camel.Exchange is moved to the dead letter queue. Notice: this only applies when all redeliveries attempt have failed and the org.apache.camel.E [...]
+ "transactionTemplateRef": { "kind": "attribute", "displayName": "Transaction Template Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "References to the org.springframework.transaction.support.TransactionTemplate to use with the transaction error handler." },
+ "transactionManagerRef": { "kind": "attribute", "displayName": "Transaction Manager Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "References to the org.springframework.transaction.PlatformTransactionManager to use with the transaction error handler." },
+ "onRedeliveryRef": { "kind": "attribute", "displayName": "On Redelivery Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets a reference to a processor that should be processed before a redelivery attempt. Can be used to change the org.apache.camel.Exchange before its being redelivered." },
+ "onExceptionOccurredRef": { "kind": "attribute", "displayName": "On Exception Occurred Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets a reference to a processor that should be processed just after an exception occurred. Can be used to perform custom logging about the occurred exception at the exact time it happened. Important: Any exception thrown from this processor will be ign [...]
+ "onPrepareFailureRef": { "kind": "attribute", "displayName": "On Prepare Failure Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets a reference to a processor to prepare the org.apache.camel.Exchange before handled by the failure processor \/ dead letter channel. This allows for example to enrich the message before sending to a dead letter queue." },
+ "retryWhileRef": { "kind": "attribute", "displayName": "Retry While Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets a reference to an retry while expression. Will continue retrying until expression evaluates to false." },
+ "redeliveryPolicyRef": { "kind": "attribute", "displayName": "Redelivery Policy Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets a reference to a RedeliveryPolicy to be used for redelivery settings." },
+ "executorServiceRef": { "kind": "attribute", "displayName": "Executor Service Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets a reference to a thread pool to be used by the error handler" },
+ "redeliveryPolicy": { "kind": "element", "displayName": "Redelivery Policy", "required": false, "type": "object", "javaType": "org.apache.camel.spring.xml.CamelRedeliveryPolicyFactoryBean", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the redelivery settings" },
"id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
}
}
[camel] 01/03: Upgrade Tika to version 2.4.0
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit aaba1a6b0a1d6a98a2577a8d511e7d9b1abe0734
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri May 20 06:46:04 2022 +0200
Upgrade Tika to version 2.4.0
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index e8b4946f550..478d366b587 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -509,7 +509,7 @@
<stringtemplate-version>4.3.3</stringtemplate-version>
<templating-maven-plugin-version>1.0.0</templating-maven-plugin-version>
<testcontainers-version>1.17.1</testcontainers-version>
- <tika-version>2.3.0</tika-version>
+ <tika-version>2.4.0</tika-version>
<twilio-version>7.55.3</twilio-version>
<twitter4j-version>4.0.7</twitter4j-version>
<undertow-version>2.2.17.Final</undertow-version>