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/03 05:53:00 UTC
[camel] branch main created (now f618e153b63)
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
at f618e153b63 Sync deps
This branch includes the following new commits:
new 6b663e925f5 CAMEL-18026: dev console for camel-platform-http
new 93b47fbc4a1 CAMEL-18037: camel-jbang - Use quick shutdown timeout for development mode only.
new c880d61b0c3 Upgrade AWS SDK v2 to version 2.17.182
new e8a561cb7ce Sync deps and regen
new 84e6e365c21 Upgrade JNats to versio 2.14.1
new aa239e8bdd3 Use latest Nats Image 2.8.1
new f618e153b63 Sync deps
The 7 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.
[camel] 06/07: Use latest Nats Image 2.8.1
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 aa239e8bdd358d9a2a3c41b60711791973113055
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue May 3 07:43:32 2022 +0200
Use latest Nats Image 2.8.1
---
.../camel/test/infra/nats/services/NatsLocalContainerService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerService.java b/test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerService.java
index 4ffb1a6aedc..176222a59e7 100644
--- a/test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerService.java
+++ b/test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerService.java
@@ -24,7 +24,7 @@ import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.strategy.Wait;
public class NatsLocalContainerService implements NatsService, ContainerService<GenericContainer> {
- public static final String CONTAINER_IMAGE = "nats:2.7.4";
+ public static final String CONTAINER_IMAGE = "nats:2.8.1";
public static final String CONTAINER_NAME = "nats";
private static final int PORT = 4222;
[camel] 01/07: CAMEL-18026: dev console for camel-platform-http
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 6b663e925f5c627fe8e627cc13f46e7aef9a81a0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue May 3 07:12:46 2022 +0200
CAMEL-18026: dev console for camel-platform-http
---
.../component/platform/http/vertx/VertxPlatformHttpRouter.java | 1 -
.../apache/camel/component/platform/http/PlatformHttpConsole.java | 5 ++++-
.../camel/component/platform/http/spi/PlatformHttpEngine.java | 6 ++++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpRouter.java b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpRouter.java
index 0df41432f56..2e3e17ba980 100644
--- a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpRouter.java
+++ b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpRouter.java
@@ -22,7 +22,6 @@ import java.util.Map;
import io.vertx.core.Handler;
import io.vertx.core.Vertx;
import io.vertx.core.http.HttpMethod;
-import io.vertx.core.http.HttpServer;
import io.vertx.core.http.HttpServerRequest;
import io.vertx.ext.web.AllowForwardHeaders;
import io.vertx.ext.web.Route;
diff --git a/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpConsole.java b/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpConsole.java
index 50d5aadd363..4afcfa7e3f5 100644
--- a/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpConsole.java
+++ b/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpConsole.java
@@ -36,8 +36,11 @@ public class PlatformHttpConsole extends AbstractDevConsole {
PlatformHttpComponent http = getCamelContext().getComponent("platform-http", PlatformHttpComponent.class);
if (http != null) {
+ String server = "http://0.0.0.0";
int port = http.getEngine().getServerPort();
- String server = "http://0.0.0.0:" + port;
+ if (port > 0) {
+ server += ":" + port;
+ }
Set<HttpEndpointModel> models = http.getHttpEndpoints();
for (HttpEndpointModel model : models) {
if (model.getVerbs() != null) {
diff --git a/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/spi/PlatformHttpEngine.java b/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/spi/PlatformHttpEngine.java
index af5e7cc57b2..c5a6e52ceb5 100644
--- a/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/spi/PlatformHttpEngine.java
+++ b/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/spi/PlatformHttpEngine.java
@@ -35,8 +35,10 @@ public interface PlatformHttpEngine {
Consumer createConsumer(PlatformHttpEndpoint platformHttpEndpoint, Processor processor);
/**
- * The port number the HTTP server is using
+ * The port number the HTTP server is using, if possible to determine.
*/
- int getServerPort();
+ default int getServerPort() {
+ return 0;
+ }
}
[camel] 03/07: Upgrade AWS SDK v2 to version 2.17.182
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 c880d61b0c363044c87d102b22257dfe1a02b478
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue May 3 06:48:15 2022 +0200
Upgrade AWS SDK v2 to version 2.17.182
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index fa8a127bdb1..84e259e269e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -80,7 +80,7 @@
<avro-ipc-jetty-version>1.11.0</avro-ipc-jetty-version>
<avro-ipc-netty-version>1.11.0</avro-ipc-netty-version>
<awaitility-version>4.2.0</awaitility-version>
- <aws-java-sdk2-version>2.17.180</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.17.182</aws-java-sdk2-version>
<aws-xray-version>2.6.1</aws-xray-version>
<axiom-version>1.2.14</axiom-version>
<azure-jackson2-version>2.13.2</azure-jackson2-version>
[camel] 05/07: Upgrade JNats to versio 2.14.1
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 84e6e365c2106704bbc8b7cb5e5ee970f42f60d4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue May 3 07:40:28 2022 +0200
Upgrade JNats to versio 2.14.1
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 84e259e269e..33e33710c23 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -264,7 +264,7 @@
<jasypt-version>1.9.3</jasypt-version>
<java-grok-version>0.1.9</java-grok-version>
<java-util-version>2.0.0</java-util-version>
- <jnats-version>2.14.0</jnats-version>
+ <jnats-version>2.14.1</jnats-version>
<javacc-maven-plugin-version>2.6</javacc-maven-plugin-version>
<javacrumbs-version>0.22</javacrumbs-version>
<javaparser-version>3.13.10</javaparser-version>
[camel] 02/07: CAMEL-18037: camel-jbang - Use quick shutdown timeout for development mode only.
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 93b47fbc4a16e3e8169b6102121bc48abe423fad
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue May 3 07:35:46 2022 +0200
CAMEL-18037: camel-jbang - Use quick shutdown timeout for development mode only.
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 88f3689c8ad..0a30cf76078 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -265,8 +265,10 @@ class Run implements Callable<Integer> {
main.setAppName("Apache Camel (JBang)");
writeSetting(main, applicationProperties, "camel.main.name", name);
- writeSetting(main, applicationProperties, "camel.main.shutdownTimeout", "5");
-
+ if (dev) {
+ // allow quick shutdown during development
+ writeSetting(main, applicationProperties, "camel.main.shutdownTimeout", "5");
+ }
writeSetting(main, applicationProperties, "camel.main.routesReloadEnabled", dev ? "true" : "false");
writeSetting(main, applicationProperties, "camel.main.sourceLocationEnabled", "true");
writeSetting(main, applicationProperties, "camel.main.tracing", trace ? "true" : "false");
[camel] 04/07: 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 e8a561cb7ce0974cf91e88f1d64b8565494d59ad
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue May 3 07:38:07 2022 +0200
Sync deps and regen
---
camel-dependencies/pom.xml | 2 +-
.../apache/camel/catalog/models/errorHandler.json | 24 ++++++++++++++++++----
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index d2a96334d22..4fb547654d3 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -63,7 +63,7 @@
<avro-ipc-netty-version>1.11.0</avro-ipc-netty-version>
<avro-version>1.11.0</avro-version>
<awaitility-version>4.2.0</awaitility-version>
- <aws-java-sdk2-version>2.17.180</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.17.182</aws-java-sdk2-version>
<aws-xray-version>2.6.1</aws-xray-version>
<axiom-version>1.2.14</axiom-version>
<azure-cosmos-version>4.26.0</azure-cosmos-version>
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] 07/07: Sync deps
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 f618e153b63af9ca9d51198605675b8cb72f3ac8
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue May 3 07:47:48 2022 +0200
Sync deps
---
camel-dependencies/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 4fb547654d3..61b2469c46a 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -330,7 +330,7 @@
<jib-version>0.21.0</jib-version>
<jira-guava-version>26.0-jre</jira-guava-version>
<jira-rest-client-api-version>5.2.2</jira-rest-client-api-version>
- <jnats-version>2.14.0</jnats-version>
+ <jnats-version>2.14.1</jnats-version>
<jodatime2-version>2.10.11</jodatime2-version>
<johnzon-version>1.2.17</johnzon-version>
<jolt-version>0.1.6</jolt-version>