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/12/21 06:02:13 UTC
[camel] branch main updated (badc9ae -> d61ba06)
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 badc9ae CAMEL-17062 Move properties sync to camel-dependencies to avoid deployment issues (#6518)
new 9784f0d CAMEL-17359: camel-debug - JAR to make camel debugging easier from tooling
new d61ba06 Upgrade to jackson 2.12.5
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:
components/camel-debug/src/main/docs/debug.adoc | 4 +++-
.../org/apache/camel/impl/debugger/CamelDebuggerFactory.java | 1 -
.../java/org/apache/camel/impl/engine/AbstractCamelContext.java | 2 +-
.../org/apache/camel/main/DefaultConfigurationConfigurer.java | 9 ++++++---
parent/pom.xml | 2 +-
5 files changed, 11 insertions(+), 7 deletions(-)
[camel] 02/02: Upgrade to jackson 2.12.5
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 d61ba06751356a66a1c5d0a540792a2472110f57
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 21 07:00:22 2021 +0100
Upgrade to jackson 2.12.5
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 69238a4..102c423 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -262,7 +262,7 @@
<isorelax-jaxp-bridge-version>1.1</isorelax-jaxp-bridge-version>
<ivy-version>2.5.0</ivy-version>
<jackson-version>1.9.12</jackson-version>
- <jackson2-version>2.12.4</jackson2-version>
+ <jackson2-version>2.12.5</jackson2-version>
<jackrabbit-version>2.21.9</jackrabbit-version>
<jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version>
<jasminb-jsonapi-version>0.11</jasminb-jsonapi-version>
[camel] 01/02: CAMEL-17359: camel-debug - JAR to make camel debugging easier from tooling
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 9784f0d6d5f40b5f35b3a54099dc343e66aabfb0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 21 06:51:48 2021 +0100
CAMEL-17359: camel-debug - JAR to make camel debugging easier from tooling
---
components/camel-debug/src/main/docs/debug.adoc | 4 +++-
.../org/apache/camel/impl/debugger/CamelDebuggerFactory.java | 1 -
.../java/org/apache/camel/impl/engine/AbstractCamelContext.java | 2 +-
.../org/apache/camel/main/DefaultConfigurationConfigurer.java | 9 ++++++---
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/components/camel-debug/src/main/docs/debug.adoc b/components/camel-debug/src/main/docs/debug.adoc
index 1bc140e..54f16c7 100644
--- a/components/camel-debug/src/main/docs/debug.adoc
+++ b/components/camel-debug/src/main/docs/debug.adoc
@@ -11,6 +11,8 @@
The camel-debug enables Camel debugger for 3rd party tooling.
This makes it easier to perform debugging in IDEs such as IDEA, Eclipse, VSCode
+IMPORTANT: The camel-debug is only for development purposes, it should **not** be used for production.
+
== Auto-detection from classpath
To use this implementation all you need to do is to add the `camel-debug` dependency to the classpath,
@@ -18,5 +20,5 @@ and Camel should auto-detect this on startup and log as follows:
[source,text]
----
-Detected and enabling Camel Debugging
+Detected: camel-debug JAR (enabling Camel Debugging)
----
diff --git a/components/camel-debug/src/main/java/org/apache/camel/impl/debugger/CamelDebuggerFactory.java b/components/camel-debug/src/main/java/org/apache/camel/impl/debugger/CamelDebuggerFactory.java
index a1f4fd9..5bd2f54 100644
--- a/components/camel-debug/src/main/java/org/apache/camel/impl/debugger/CamelDebuggerFactory.java
+++ b/components/camel-debug/src/main/java/org/apache/camel/impl/debugger/CamelDebuggerFactory.java
@@ -34,7 +34,6 @@ public class CamelDebuggerFactory implements DebuggerFactory {
BacklogDebugger backlog = BacklogDebugger.createDebugger(camelContext);
// we need to enable debugger after context is started
camelContext.adapt(ExtendedCamelContext.class).addLifecycleStrategy(new LifecycleStrategySupport() {
-
@Override
public void onContextStarted(CamelContext context) {
backlog.enableDebugger();
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 8143171..02aeae9 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -4122,7 +4122,7 @@ public abstract class AbstractCamelContext extends BaseService
DebuggerFactory df
= getBootstrapFactoryFinder().newInstance(Debugger.FACTORY, DebuggerFactory.class).orElse(null);
if (df != null) {
- LOG.info("Detected: {} enabling Camel Debugging", df);
+ LOG.info("Detected: {} JAR (enabling Camel Debugging)", df);
setDebugging(true);
Debugger debugger = df.createDebugger(this);
if (debugger != null) {
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 43b7952..2476d46 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
@@ -213,7 +213,6 @@ public final class DefaultConfigurationConfigurer {
LOG.warn("Using OffUuidGenerator (Only intended for development purposes)");
}
- camelContext.setMessageHistory(config.isMessageHistory());
camelContext.setLogMask(config.isLogMask());
camelContext.setLogExhaustedMessageBody(config.isLogExhaustedMessageBody());
camelContext.setAutoStartup(config.isAutoStartup());
@@ -259,11 +258,15 @@ public final class DefaultConfigurationConfigurer {
camelContext.getGlobalEndpointConfiguration().setBridgeErrorHandler(config.isEndpointBridgeErrorHandler());
camelContext.getGlobalEndpointConfiguration().setLazyStartProducer(config.isEndpointLazyStartProducer());
+ // debug may be enabled via camel-debug JAR on classpath so if config is false (default)
+ // then do not change setting on camel-context
if (config.isDebugging()) {
- // debug may be enabled via camel-debug JAR on classpath so if config is false (default)
- // then do not change setting on camel-context
camelContext.setDebugging(true);
}
+ if (config.isMessageHistory()) {
+ camelContext.setMessageHistory(true);
+ }
+
camelContext.setBacklogTracing(config.isBacklogTracing());
camelContext.setTracing(config.isTracing());
camelContext.setTracingStandby(config.isTracingStandby());