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/04/11 06:04:41 UTC
[camel] branch master updated (df6c04d -> db6e485)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from df6c04d Regen and sync deps
new b4f5a8b Upgrade jira
new 01f5afd Regen
new 30ddb97 camel-core - Optimize with off uuid generator that can be used for memory profiling.
new db6e485 Upgrade jira
The 4 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 +-
.../camel/catalog/main/camel-main-configuration-metadata.json | 2 +-
.../java/org/apache/camel/main/DefaultConfigurationConfigurer.java | 1 +
.../src/main/java/org/apache/camel/support/OffUuidGenerator.java | 6 ++++++
docs/components/modules/others/pages/main.adoc | 2 +-
parent/pom.xml | 2 +-
6 files changed, 11 insertions(+), 4 deletions(-)
[camel] 04/04: Upgrade jira
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit db6e485ed38cf11815684c0fe0044d74c3781af8
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Apr 11 08:03:52 2021 +0200
Upgrade jira
---
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 f26c725..8881f8d 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -341,7 +341,7 @@
<jgroups-version>4.2.11.Final</jgroups-version>
<jing-version>20030619</jing-version>
<jira-guava-version>26.0-jre</jira-guava-version>
- <jira-rest-client-api-version>5.2.1</jira-rest-client-api-version>
+ <jira-rest-client-api-version>5.2.2</jira-rest-client-api-version>
<jmh-version>1.26</jmh-version>
<jnats-version>2.8.0</jnats-version>
<jodatime2-bundle-version>2.10.6</jodatime2-bundle-version>
[camel] 01/04: Upgrade jira
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b4f5a8b7dd11106ee9380c975aab871050bfee47
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Apr 11 07:58:51 2021 +0200
Upgrade jira
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 2bab4ac..d868971 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -324,7 +324,7 @@
<jgroups-raft-leveldbjni-version>1.8</jgroups-raft-leveldbjni-version>
<jgroups-raft-mapdb-version>1.0.8</jgroups-raft-mapdb-version>
<jira-guava-version>26.0-jre</jira-guava-version>
- <jira-rest-client-api-version>5.2.1</jira-rest-client-api-version>
+ <jira-rest-client-api-version>5.2.2</jira-rest-client-api-version>
<libthrift-version>0.12.0</libthrift-version>
<jing-version>20030619</jing-version>
<jmh-version>1.26</jmh-version>
[camel] 03/04: camel-core - Optimize with off uuid generator that
can be used for memory profiling.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 30ddb975ec0f08edd84df2a31e43a88a64c728a9
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Apr 11 08:03:17 2021 +0200
camel-core - Optimize with off uuid generator that can be used for memory profiling.
---
.../java/org/apache/camel/main/DefaultConfigurationConfigurer.java | 1 +
.../src/main/java/org/apache/camel/support/OffUuidGenerator.java | 6 ++++++
2 files changed, 7 insertions(+)
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
index 6b7f3bf..d4bbe00 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
@@ -208,6 +208,7 @@ public final class DefaultConfigurationConfigurer {
camelContext.setUuidGenerator(new SimpleUuidGenerator());
} else if ("off".equals(config.getUuidGenerator())) {
camelContext.setUuidGenerator(new OffUuidGenerator());
+ LOG.warn("Using OffUuidGenerator (Only intended for development purposes)");
}
camelContext.setMessageHistory(config.isMessageHistory());
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/OffUuidGenerator.java b/core/camel-support/src/main/java/org/apache/camel/support/OffUuidGenerator.java
index 213f473..a7d8a18 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/OffUuidGenerator.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/OffUuidGenerator.java
@@ -16,11 +16,17 @@
*/
package org.apache.camel.support;
+import org.apache.camel.Experimental;
import org.apache.camel.spi.UuidGenerator;
/**
* {@link UuidGenerator} which is turned off for exchange ids, but generated UUIDs for everything else.
+ *
+ * This is only intended for development for performance profiling - do not use in production.
+ * Some EIPs and functionalities of Camel requires exchange IDs to be unique and this generated
+ * will therefore not work in all situations.
*/
+@Experimental
public class OffUuidGenerator extends DefaultUuidGenerator {
@Override
[camel] 02/04: Regen
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 01f5afd8abaacfe1880d377c3a40959b39c3970f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Apr 11 07:59:04 2021 +0200
Regen
---
.../apache/camel/catalog/main/camel-main-configuration-metadata.json | 2 +-
docs/components/modules/others/pages/main.adoc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
index 8a15602..b4f38a5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
@@ -101,7 +101,7 @@
{ "name": "camel.main.useBreadcrumb", "description": "Set whether breadcrumb is enabled. The default value is false.", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.main.useDataType", "description": "Whether to enable using data type on Camel messages. Data type are automatic turned on if one ore more routes has been explicit configured with input and output types. Otherwise data type is default off.", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.main.useMdcLogging", "description": "To turn on MDC logging", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": "false" },
- { "name": "camel.main.uuidGenerator", "description": "UUID generator to use. default (32 bytes), short (16 bytes), classic (32 bytes or longer), simple (long incrementing counter)", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": "string", "javaType": "java.lang.String", "defaultValue": "default", "enum": [ "classic", "default", "short", "simple" ] },
+ { "name": "camel.main.uuidGenerator", "description": "UUID generator to use. default (32 bytes), short (16 bytes), classic (32 bytes or longer), simple (long incrementing counter), off (turned off for exchanges - only intended for performance profiling)", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": "string", "javaType": "java.lang.String", "defaultValue": "default", "enum": [ "classic", "default", "short", "simple", "off" ] },
{ "name": "camel.faulttolerance.bulkheadEnabled", "description": "Whether bulkhead is enabled or not on the circuit breaker. Default is false.", "sourceType": "org.apache.camel.main.FaultToleranceConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean", "defaultValue": false },
{ "name": "camel.faulttolerance.bulkheadExecutorServiceRef", "description": "References to a custom thread pool to use when bulkhead is enabled.", "sourceType": "org.apache.camel.main.FaultToleranceConfigurationProperties", "type": "string", "javaType": "java.lang.String" },
{ "name": "camel.faulttolerance.bulkheadMaxConcurrentCalls", "description": "Configures the max amount of concurrent calls the bulkhead will support. Default value is 10.", "sourceType": "org.apache.camel.main.FaultToleranceConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer", "defaultValue": 10 },
diff --git a/docs/components/modules/others/pages/main.adoc b/docs/components/modules/others/pages/main.adoc
index bf27707..1474878 100644
--- a/docs/components/modules/others/pages/main.adoc
+++ b/docs/components/modules/others/pages/main.adoc
@@ -115,7 +115,7 @@ The following table lists all the options:
| *camel.main.useBreadcrumb* | Set whether breadcrumb is enabled. The default value is false. | false | boolean
| *camel.main.useDataType* | Whether to enable using data type on Camel messages. Data type are automatic turned on if one ore more routes has been explicit configured with input and output types. Otherwise data type is default off. | false | boolean
| *camel.main.useMdcLogging* | To turn on MDC logging | false | boolean
-| *camel.main.uuidGenerator* | UUID generator to use. default (32 bytes), short (16 bytes), classic (32 bytes or longer), simple (long incrementing counter) | default | String
+| *camel.main.uuidGenerator* | UUID generator to use. default (32 bytes), short (16 bytes), classic (32 bytes or longer), simple (long incrementing counter), off (turned off for exchanges - only intended for performance profiling) | default | String
| *camel.faulttolerance.bulkhead{zwsp}Enabled* | Whether bulkhead is enabled or not on the circuit breaker. Default is false. | false | Boolean
| *camel.faulttolerance.bulkhead{zwsp}ExecutorServiceRef* | References to a custom thread pool to use when bulkhead is enabled. | | String
| *camel.faulttolerance.bulkhead{zwsp}MaxConcurrentCalls* | Configures the max amount of concurrent calls the bulkhead will support. Default value is 10. | 10 | Integer