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 2022/05/19 11:13:58 UTC

[camel] branch main updated (a87b991779d -> 59ea4acbcc1)

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


    from a87b991779d Set version to 3.18.0-SNAPSHOT
     new 80b9cd7ab5e Regen
     new 59ea4acbcc1 camel-jbang - Upgrade to 3.17.0

The 2 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:
 .../catalog/components/google-secret-manager.json  |  2 +-
 .../apache/camel/catalog/models/errorHandler.json  | 24 ++++------------------
 .../secret/manager/google-secret-manager.json      |  2 +-
 .../main/docs/google-secret-manager-component.adoc |  2 +-
 .../src/generated/resources/test-main-junit5.json  |  2 +-
 .../src/main/docs/test-main-junit5.adoc            |  2 +-
 .../src/generated/resources/metadata.json          |  2 +-
 .../camel-jbang-main/dist/CamelJBang.java          |  4 ++--
 .../src/main/jbang/main/CamelJBang.java            |  4 ++--
 9 files changed, 14 insertions(+), 30 deletions(-)


[camel] 02/02: camel-jbang - Upgrade to 3.17.0

Posted by da...@apache.org.
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 59ea4acbcc194955ebd4d0c1feb645a2cc0c4fdd
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu May 19 13:13:43 2022 +0200

    camel-jbang - Upgrade to 3.17.0
---
 dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java                | 4 ++--
 dsl/camel-jbang/camel-jbang-main/src/main/jbang/main/CamelJBang.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java b/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
index 24d732a4ee2..4741a42aa76 100755
--- a/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
+++ b/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
@@ -19,8 +19,8 @@
 
 //JAVA 11+
 //REPOS mavencentral,apache=https://repository.apache.org/snapshots
-//DEPS org.apache.camel:camel-bom:${camel.jbang.version:3.16.0}@pom
-//DEPS org.apache.camel:camel-jbang-core:${camel.jbang.version:3.16.0}
+//DEPS org.apache.camel:camel-bom:${camel.jbang.version:3.17.0}@pom
+//DEPS org.apache.camel:camel-jbang-core:${camel.jbang.version:3.17.0}
 //DEPS org.apache.camel.kamelets:camel-kamelets:${camel-kamelets.version:0.8.1}
 //DEPS org.apache.camel.kamelets:camel-kamelets-utils:${camel-kamelets.version:0.8.1}
 
diff --git a/dsl/camel-jbang/camel-jbang-main/src/main/jbang/main/CamelJBang.java b/dsl/camel-jbang/camel-jbang-main/src/main/jbang/main/CamelJBang.java
index 24d732a4ee2..4741a42aa76 100755
--- a/dsl/camel-jbang/camel-jbang-main/src/main/jbang/main/CamelJBang.java
+++ b/dsl/camel-jbang/camel-jbang-main/src/main/jbang/main/CamelJBang.java
@@ -19,8 +19,8 @@
 
 //JAVA 11+
 //REPOS mavencentral,apache=https://repository.apache.org/snapshots
-//DEPS org.apache.camel:camel-bom:${camel.jbang.version:3.16.0}@pom
-//DEPS org.apache.camel:camel-jbang-core:${camel.jbang.version:3.16.0}
+//DEPS org.apache.camel:camel-bom:${camel.jbang.version:3.17.0}@pom
+//DEPS org.apache.camel:camel-jbang-core:${camel.jbang.version:3.17.0}
 //DEPS org.apache.camel.kamelets:camel-kamelets:${camel-kamelets.version:0.8.1}
 //DEPS org.apache.camel.kamelets:camel-kamelets-utils:${camel-kamelets.version:0.8.1}
 


[camel] 01/02: Regen

Posted by da...@apache.org.
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 80b9cd7ab5ec08bf3f64129f2a61e5ac7683d120
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu May 19 13:12:49 2022 +0200

    Regen
---
 .../catalog/components/google-secret-manager.json  |  2 +-
 .../apache/camel/catalog/models/errorHandler.json  | 24 ++++------------------
 .../secret/manager/google-secret-manager.json      |  2 +-
 .../main/docs/google-secret-manager-component.adoc |  2 +-
 .../src/generated/resources/test-main-junit5.json  |  2 +-
 .../src/main/docs/test-main-junit5.adoc            |  2 +-
 .../src/generated/resources/metadata.json          |  2 +-
 7 files changed, 10 insertions(+), 26 deletions(-)

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 469da03954e..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,7 +8,7 @@
     "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.18.0-SNAPSHOT",
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 b35eb757c4a..ddcf5343eb1 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,32 +3,16 @@
     "kind": "model",
     "name": "errorHandler",
     "title": "Error Handler",
-    "description": "Error handler settings",
+    "description": "Camel error handling.",
     "deprecated": false,
-    "label": "spring,configuration,error",
-    "javaType": "org.apache.camel.spring.xml.SpringErrorHandlerDefinition",
+    "label": "configuration,error",
+    "javaType": "org.apache.camel.model.ErrorHandlerDefinition",
     "abstract": false,
     "input": false,
     "output": false
   },
   "properties": {
-    "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" },
+    "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." },
     "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" }
   }
 }
diff --git a/components/camel-google/camel-google-secret-manager/src/generated/resources/org/apache/camel/component/google/secret/manager/google-secret-manager.json b/components/camel-google/camel-google-secret-manager/src/generated/resources/org/apache/camel/component/google/secret/manager/google-secret-manager.json
index 469da03954e..885cfbc75df 100644
--- a/components/camel-google/camel-google-secret-manager/src/generated/resources/org/apache/camel/component/google/secret/manager/google-secret-manager.json
+++ b/components/camel-google/camel-google-secret-manager/src/generated/resources/org/apache/camel/component/google/secret/manager/google-secret-manager.json
@@ -8,7 +8,7 @@
     "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.18.0-SNAPSHOT",
diff --git a/components/camel-google/camel-google-secret-manager/src/main/docs/google-secret-manager-component.adoc b/components/camel-google/camel-google-secret-manager/src/main/docs/google-secret-manager-component.adoc
index 9dac97bcaa9..e90b83e52cc 100644
--- a/components/camel-google/camel-google-secret-manager/src/main/docs/google-secret-manager-component.adoc
+++ b/components/camel-google/camel-google-secret-manager/src/main/docs/google-secret-manager-component.adoc
@@ -4,7 +4,7 @@
 :artifactid: camel-google-secret-manager
 :description: Manage Google Secret Manager Secrets
 :since: 3.16
-:supportlevel: Preview
+:supportlevel: Stable
 :component-header: Only producer is supported
 //Manually maintained attributes
 :group: Google
diff --git a/components/camel-test/camel-test-main-junit5/src/generated/resources/test-main-junit5.json b/components/camel-test/camel-test-main-junit5/src/generated/resources/test-main-junit5.json
index c7df6ed9244..360cdb15301 100644
--- a/components/camel-test/camel-test-main-junit5/src/generated/resources/test-main-junit5.json
+++ b/components/camel-test/camel-test-main-junit5/src/generated/resources/test-main-junit5.json
@@ -7,7 +7,7 @@
     "deprecated": false,
     "firstVersion": "3.16.0",
     "label": "testing,java",
-    "supportLevel": "Preview",
+    "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-test-main-junit5",
     "version": "3.18.0-SNAPSHOT"
diff --git a/components/camel-test/camel-test-main-junit5/src/main/docs/test-main-junit5.adoc b/components/camel-test/camel-test-main-junit5/src/main/docs/test-main-junit5.adoc
index cbdd13320fe..d929fa95852 100644
--- a/components/camel-test/camel-test-main-junit5/src/main/docs/test-main-junit5.adoc
+++ b/components/camel-test/camel-test-main-junit5/src/main/docs/test-main-junit5.adoc
@@ -4,7 +4,7 @@
 :artifactid: camel-test-main-junit5
 :description: Camel unit testing with Main and JUnit 5
 :since: 3.16
-:supportlevel: Preview
+:supportlevel: Stable
 
 *Since Camel {since}*
 
diff --git a/dsl/camel-componentdsl/src/generated/resources/metadata.json b/dsl/camel-componentdsl/src/generated/resources/metadata.json
index 0e44130d3cc..0025fe41930 100644
--- a/dsl/camel-componentdsl/src/generated/resources/metadata.json
+++ b/dsl/camel-componentdsl/src/generated/resources/metadata.json
@@ -2607,7 +2607,7 @@
     "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.18.0-SNAPSHOT",