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/12/28 18:07:33 UTC
[camel] branch main updated: CAMEL-18847: Move AbstractDevConsole from camel-console to camel-support. So components with console plugins does not automatic include and enable dev consoles.
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
The following commit(s) were added to refs/heads/main by this push:
new ce91dad9689 CAMEL-18847: Move AbstractDevConsole from camel-console to camel-support. So components with console plugins does not automatic include and enable dev consoles.
ce91dad9689 is described below
commit ce91dad96892165371feb5bd53fef5e7cf2eaa89
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Dec 28 19:07:19 2022 +0100
CAMEL-18847: Move AbstractDevConsole from camel-console to camel-support. So components with console plugins does not automatic include and enable dev consoles.
---
catalog/camel-catalog-console/pom.xml | 10 +++++++---
.../java/org/apache/camel/catalog/console/CatalogConsole.java | 2 +-
components/camel-aws/camel-aws-secrets-manager/pom.xml | 2 +-
.../camel/component/aws/secretsmanager/SecretsDevConsole.java | 2 +-
components/camel-azure/camel-azure-key-vault/pom.xml | 2 +-
.../azure/key/vault/AzureKeyVaultManagerDevConsole.java | 2 +-
components/camel-google/camel-google-secret-manager/pom.xml | 2 +-
.../google/secret/manager/GoogleSecretManagerDevConsole.java | 2 +-
components/camel-micrometer/pom.xml | 2 +-
.../apache/camel/component/micrometer/MicrometerConsole.java | 2 +-
.../camel-microprofile-fault-tolerance/pom.xml | 6 +++++-
.../microprofile/faulttolerance/FaultToleranceConsole.java | 2 +-
.../camel-microprofile/camel-microprofile-metrics/pom.xml | 2 +-
.../component/microprofile/metrics/MicroProfileConsole.java | 2 +-
components/camel-mina/pom.xml | 2 +-
.../main/java/org/apache/camel/component/mina/MinaConsole.java | 2 +-
components/camel-mllp/pom.xml | 2 +-
.../main/java/org/apache/camel/component/mllp/MllpConsole.java | 2 +-
components/camel-netty/pom.xml | 2 +-
.../java/org/apache/camel/component/netty/NettyConsole.java | 2 +-
components/camel-platform-http/pom.xml | 2 +-
.../camel/component/platform/http/PlatformHttpConsole.java | 2 +-
components/camel-resilience4j/pom.xml | 6 +++++-
.../apache/camel/component/resilience4j/ResilienceConsole.java | 2 +-
.../src/main/java/org/apache/camel/console/DevConsole.java | 2 +-
core/camel-console/pom.xml | 2 +-
.../java/org/apache/camel/impl/console/BlockedConsole.java | 1 +
.../java/org/apache/camel/impl/console/ContextDevConsole.java | 1 +
.../java/org/apache/camel/impl/console/EndpointDevConsole.java | 1 +
.../main/java/org/apache/camel/impl/console/EventConsole.java | 1 +
.../apache/camel/impl/console/GarbageCollectorDevConsole.java | 1 +
.../java/org/apache/camel/impl/console/HealthDevConsole.java | 1 +
.../java/org/apache/camel/impl/console/InflightConsole.java | 1 +
.../org/apache/camel/impl/console/JavaSecurityDevConsole.java | 1 +
.../main/java/org/apache/camel/impl/console/JvmDevConsole.java | 1 +
.../main/java/org/apache/camel/impl/console/LogDevConsole.java | 1 +
.../java/org/apache/camel/impl/console/MemoryDevConsole.java | 1 +
.../org/apache/camel/impl/console/PropertiesDevConsole.java | 1 +
.../org/apache/camel/impl/console/RouteControllerConsole.java | 1 +
.../java/org/apache/camel/impl/console/RouteDevConsole.java | 1 +
.../java/org/apache/camel/impl/console/SourceDevConsole.java | 1 +
.../java/org/apache/camel/impl/console/ThreadDevConsole.java | 1 +
.../main/java/org/apache/camel/impl/console/TopDevConsole.java | 1 +
.../org/apache/camel/impl/console/TypeConverterConsole.java | 1 +
.../org/apache/camel/support}/console/AbstractDevConsole.java | 8 +++++---
.../modules/ROOT/pages/camel-3x-upgrade-guide-3_21.adoc | 9 +++++++++
.../apache/camel/main/console/DependencyDownloaderConsole.java | 2 +-
47 files changed, 73 insertions(+), 32 deletions(-)
diff --git a/catalog/camel-catalog-console/pom.xml b/catalog/camel-catalog-console/pom.xml
index 0c5c5f578c9..e4f0917ec91 100644
--- a/catalog/camel-catalog-console/pom.xml
+++ b/catalog/camel-catalog-console/pom.xml
@@ -40,13 +40,17 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-console</artifactId>
+ <artifactId>camel-catalog</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-catalog</artifactId>
+ <artifactId>camel-support</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-util-json</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/catalog/camel-catalog-console/src/main/java/org/apache/camel/catalog/console/CatalogConsole.java b/catalog/camel-catalog-console/src/main/java/org/apache/camel/catalog/console/CatalogConsole.java
index 23c7efffb33..67821eba876 100644
--- a/catalog/camel-catalog-console/src/main/java/org/apache/camel/catalog/console/CatalogConsole.java
+++ b/catalog/camel-catalog-console/src/main/java/org/apache/camel/catalog/console/CatalogConsole.java
@@ -22,7 +22,7 @@ import java.util.Map;
import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
-import org.apache.camel.impl.console.AbstractDevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.spi.annotations.DevConsole;
import org.apache.camel.tooling.model.ArtifactModel;
import org.apache.camel.tooling.model.OtherModel;
diff --git a/components/camel-aws/camel-aws-secrets-manager/pom.xml b/components/camel-aws/camel-aws-secrets-manager/pom.xml
index 1334ca99b61..e4cf76857ca 100644
--- a/components/camel-aws/camel-aws-secrets-manager/pom.xml
+++ b/components/camel-aws/camel-aws-secrets-manager/pom.xml
@@ -44,7 +44,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-console</artifactId>
+ <artifactId>camel-util-json</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsDevConsole.java b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsDevConsole.java
index b1b872abe83..15939f99a6f 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsDevConsole.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsDevConsole.java
@@ -24,10 +24,10 @@ import java.util.Map;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.component.aws.secretsmanager.vault.CloudTrailReloadTriggerTask;
-import org.apache.camel.impl.console.AbstractDevConsole;
import org.apache.camel.spi.PeriodTaskScheduler;
import org.apache.camel.spi.PropertiesFunction;
import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.TimeUtils;
import org.apache.camel.util.json.JsonArray;
import org.apache.camel.util.json.JsonObject;
diff --git a/components/camel-azure/camel-azure-key-vault/pom.xml b/components/camel-azure/camel-azure-key-vault/pom.xml
index 766223ddc8a..e0185507dcd 100644
--- a/components/camel-azure/camel-azure-key-vault/pom.xml
+++ b/components/camel-azure/camel-azure-key-vault/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-console</artifactId>
+ <artifactId>camel-util-json</artifactId>
</dependency>
<!-- azure sdk -->
diff --git a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/AzureKeyVaultManagerDevConsole.java b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/AzureKeyVaultManagerDevConsole.java
index a639fe2eb8a..0b58da6b62d 100644
--- a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/AzureKeyVaultManagerDevConsole.java
+++ b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/AzureKeyVaultManagerDevConsole.java
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.camel.ExtendedCamelContext;
-import org.apache.camel.impl.console.AbstractDevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.spi.PeriodTaskScheduler;
import org.apache.camel.spi.PropertiesFunction;
import org.apache.camel.spi.annotations.DevConsole;
diff --git a/components/camel-google/camel-google-secret-manager/pom.xml b/components/camel-google/camel-google-secret-manager/pom.xml
index c1433ce9f57..5488a941fc7 100644
--- a/components/camel-google/camel-google-secret-manager/pom.xml
+++ b/components/camel-google/camel-google-secret-manager/pom.xml
@@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-console</artifactId>
+ <artifactId>camel-util-json</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
diff --git a/components/camel-google/camel-google-secret-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerDevConsole.java b/components/camel-google/camel-google-secret-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerDevConsole.java
index 84ded6b12c6..6f444267b1a 100644
--- a/components/camel-google/camel-google-secret-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerDevConsole.java
+++ b/components/camel-google/camel-google-secret-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerDevConsole.java
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.component.google.secret.manager.vault.PubsubReloadTriggerTask;
-import org.apache.camel.impl.console.AbstractDevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.spi.PeriodTaskScheduler;
import org.apache.camel.spi.PropertiesFunction;
import org.apache.camel.spi.annotations.DevConsole;
diff --git a/components/camel-micrometer/pom.xml b/components/camel-micrometer/pom.xml
index d42ee632acd..df3f934de3e 100644
--- a/components/camel-micrometer/pom.xml
+++ b/components/camel-micrometer/pom.xml
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-console</artifactId>
+ <artifactId>camel-util-json</artifactId>
</dependency>
<dependency>
diff --git a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerConsole.java b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerConsole.java
index 6d67a20cecc..a95a7fd6f3f 100644
--- a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerConsole.java
+++ b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerConsole.java
@@ -29,7 +29,7 @@ import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Tag;
import io.micrometer.core.instrument.Timer;
-import org.apache.camel.impl.console.AbstractDevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.spi.annotations.DevConsole;
import org.apache.camel.util.json.JsonObject;
diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/pom.xml b/components/camel-microprofile/camel-microprofile-fault-tolerance/pom.xml
index c4d9c1b02e0..0a49067cad2 100644
--- a/components/camel-microprofile/camel-microprofile-fault-tolerance/pom.xml
+++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/pom.xml
@@ -47,7 +47,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-console</artifactId>
+ <artifactId>camel-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-util-json</artifactId>
</dependency>
<dependency>
diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConsole.java b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConsole.java
index b3d351c54a5..2ed526a3e2f 100644
--- a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConsole.java
+++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConsole.java
@@ -23,7 +23,7 @@ import java.util.Map;
import org.apache.camel.Processor;
import org.apache.camel.Route;
-import org.apache.camel.impl.console.AbstractDevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.spi.annotations.DevConsole;
import org.apache.camel.util.json.JsonObject;
diff --git a/components/camel-microprofile/camel-microprofile-metrics/pom.xml b/components/camel-microprofile/camel-microprofile-metrics/pom.xml
index 5a7bec42d3a..2c542915b0c 100644
--- a/components/camel-microprofile/camel-microprofile-metrics/pom.xml
+++ b/components/camel-microprofile/camel-microprofile-metrics/pom.xml
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-console</artifactId>
+ <artifactId>camel-util-json</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.metrics</groupId>
diff --git a/components/camel-microprofile/camel-microprofile-metrics/src/main/java/org/apache/camel/component/microprofile/metrics/MicroProfileConsole.java b/components/camel-microprofile/camel-microprofile-metrics/src/main/java/org/apache/camel/component/microprofile/metrics/MicroProfileConsole.java
index be84b6e6809..b8f40f36892 100644
--- a/components/camel-microprofile/camel-microprofile-metrics/src/main/java/org/apache/camel/component/microprofile/metrics/MicroProfileConsole.java
+++ b/components/camel-microprofile/camel-microprofile-metrics/src/main/java/org/apache/camel/component/microprofile/metrics/MicroProfileConsole.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.camel.impl.console.AbstractDevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.spi.annotations.DevConsole;
import org.apache.camel.util.TimeUtils;
import org.apache.camel.util.json.JsonObject;
diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml
index 7e33c7abd9c..6198d1a9bea 100644
--- a/components/camel-mina/pom.xml
+++ b/components/camel-mina/pom.xml
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-console</artifactId>
+ <artifactId>camel-util-json</artifactId>
</dependency>
<dependency>
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsole.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsole.java
index 29dee16c122..e2abab681f7 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsole.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsole.java
@@ -23,7 +23,7 @@ import java.util.stream.Collectors;
import org.apache.camel.Consumer;
import org.apache.camel.Route;
-import org.apache.camel.impl.console.AbstractDevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.spi.annotations.DevConsole;
import org.apache.camel.util.json.JsonObject;
diff --git a/components/camel-mllp/pom.xml b/components/camel-mllp/pom.xml
index 0b390e5ae8f..f27bf48c8e7 100644
--- a/components/camel-mllp/pom.xml
+++ b/components/camel-mllp/pom.xml
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-console</artifactId>
+ <artifactId>camel-util-json</artifactId>
</dependency>
<!-- testing -->
diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpConsole.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpConsole.java
index 4e14462b5a0..82bdf68664e 100644
--- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpConsole.java
+++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpConsole.java
@@ -23,7 +23,7 @@ import java.util.stream.Collectors;
import org.apache.camel.Consumer;
import org.apache.camel.Route;
-import org.apache.camel.impl.console.AbstractDevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.spi.annotations.DevConsole;
import org.apache.camel.util.json.JsonObject;
diff --git a/components/camel-netty/pom.xml b/components/camel-netty/pom.xml
index 8595743c64b..888339d576f 100644
--- a/components/camel-netty/pom.xml
+++ b/components/camel-netty/pom.xml
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-console</artifactId>
+ <artifactId>camel-util-json</artifactId>
</dependency>
<dependency>
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConsole.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConsole.java
index d35c4a667b5..524883cf313 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConsole.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConsole.java
@@ -23,7 +23,7 @@ import java.util.stream.Collectors;
import org.apache.camel.Consumer;
import org.apache.camel.Route;
-import org.apache.camel.impl.console.AbstractDevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.spi.annotations.DevConsole;
import org.apache.camel.util.json.JsonObject;
diff --git a/components/camel-platform-http/pom.xml b/components/camel-platform-http/pom.xml
index 51d1e6719a4..2fbc6301b05 100644
--- a/components/camel-platform-http/pom.xml
+++ b/components/camel-platform-http/pom.xml
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-console</artifactId>
+ <artifactId>camel-util-json</artifactId>
</dependency>
<!-- test infra -->
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 16f56ad2ab1..6a7c5efb211 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
@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.camel.impl.console.AbstractDevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.spi.annotations.DevConsole;
import org.apache.camel.util.json.JsonObject;
diff --git a/components/camel-resilience4j/pom.xml b/components/camel-resilience4j/pom.xml
index ea8f300b0d0..1308f66dff5 100644
--- a/components/camel-resilience4j/pom.xml
+++ b/components/camel-resilience4j/pom.xml
@@ -47,7 +47,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-console</artifactId>
+ <artifactId>camel-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-util-json</artifactId>
</dependency>
<dependency>
diff --git a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceConsole.java b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceConsole.java
index 6ce344eaf51..14c8248866c 100644
--- a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceConsole.java
+++ b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceConsole.java
@@ -23,7 +23,7 @@ import java.util.Map;
import org.apache.camel.Processor;
import org.apache.camel.Route;
-import org.apache.camel.impl.console.AbstractDevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.spi.annotations.DevConsole;
import org.apache.camel.util.json.JsonObject;
diff --git a/core/camel-api/src/main/java/org/apache/camel/console/DevConsole.java b/core/camel-api/src/main/java/org/apache/camel/console/DevConsole.java
index 518fbb2d6fd..bdcdf069b6c 100644
--- a/core/camel-api/src/main/java/org/apache/camel/console/DevConsole.java
+++ b/core/camel-api/src/main/java/org/apache/camel/console/DevConsole.java
@@ -56,7 +56,7 @@ public interface DevConsole {
* Whether this console supports the given media type.
*
* @param mediaType the media type
- * @return true if support, false if not
+ * @return true if supported, false if not
*/
boolean supportMediaType(MediaType mediaType);
diff --git a/core/camel-console/pom.xml b/core/camel-console/pom.xml
index 2afbfa956fa..4fd63390410 100644
--- a/core/camel-console/pom.xml
+++ b/core/camel-console/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core-engine</artifactId>
+ <artifactId>camel-support</artifactId>
</dependency>
<!-- json -->
<dependency>
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/BlockedConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/BlockedConsole.java
index 21af0911912..d161a51eed8 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/BlockedConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/BlockedConsole.java
@@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.spi.AsyncProcessorAwaitManager;
import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.TimeUtils;
import org.apache.camel.util.json.JsonObject;
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/ContextDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/ContextDevConsole.java
index db1f38eff84..86c722336b6 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/ContextDevConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/ContextDevConsole.java
@@ -26,6 +26,7 @@ import org.apache.camel.api.management.mbean.ManagedCamelContextMBean;
import org.apache.camel.spi.ContextReloadStrategy;
import org.apache.camel.spi.ResourceReloadStrategy;
import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.TimeUtils;
import org.apache.camel.util.json.JsonObject;
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/EndpointDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/EndpointDevConsole.java
index 07e873e3f4c..8ae6c4fa311 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/EndpointDevConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/EndpointDevConsole.java
@@ -27,6 +27,7 @@ import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.spi.EndpointRegistry;
import org.apache.camel.spi.RuntimeEndpointRegistry;
import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.json.JsonObject;
@DevConsole("endpoint")
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/EventConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/EventConsole.java
index 4f1c9bed9ad..1415ec7ccc5 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/EventConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/EventConsole.java
@@ -26,6 +26,7 @@ import org.apache.camel.spi.Configurer;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.DevConsole;
import org.apache.camel.support.EventNotifierSupport;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.TimeUtils;
import org.apache.camel.util.json.JsonObject;
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/GarbageCollectorDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/GarbageCollectorDevConsole.java
index 88bfc2ef55e..cd7ebb7a01d 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/GarbageCollectorDevConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/GarbageCollectorDevConsole.java
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.camel.spi.Configurer;
import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.json.JsonArray;
import org.apache.camel.util.json.JsonObject;
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/HealthDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/HealthDevConsole.java
index b8a6ec95f13..175849de7c2 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/HealthDevConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/HealthDevConsole.java
@@ -26,6 +26,7 @@ import java.util.stream.Stream;
import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.json.JsonArray;
import org.apache.camel.util.json.JsonObject;
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/InflightConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/InflightConsole.java
index 79c4c7cd830..bc4adeea440 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/InflightConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/InflightConsole.java
@@ -22,6 +22,7 @@ import java.util.Map;
import org.apache.camel.spi.InflightRepository;
import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.TimeUtils;
import org.apache.camel.util.json.JsonObject;
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/JavaSecurityDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/JavaSecurityDevConsole.java
index e7315f58e76..7dc36087b24 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/JavaSecurityDevConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/JavaSecurityDevConsole.java
@@ -24,6 +24,7 @@ import java.util.stream.Collectors;
import org.apache.camel.spi.Configurer;
import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.json.JsonArray;
import org.apache.camel.util.json.JsonObject;
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/JvmDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/JvmDevConsole.java
index e1a5d727d6a..22a991a98cb 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/JvmDevConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/JvmDevConsole.java
@@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.camel.spi.Configurer;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.TimeUtils;
import org.apache.camel.util.json.JsonObject;
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/LogDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/LogDevConsole.java
index 4e83682aa65..a4ba2053d5b 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/LogDevConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/LogDevConsole.java
@@ -25,6 +25,7 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.json.JsonObject;
@DevConsole("log")
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/MemoryDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/MemoryDevConsole.java
index 9e88f6fcce9..f5007abdce3 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/MemoryDevConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/MemoryDevConsole.java
@@ -22,6 +22,7 @@ import java.util.Map;
import org.apache.camel.spi.Configurer;
import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.json.JsonObject;
import static org.apache.camel.util.UnitUtils.printUnitFromBytesDot;
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/PropertiesDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/PropertiesDevConsole.java
index d3ac4916c9d..abde673d4eb 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/PropertiesDevConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/PropertiesDevConsole.java
@@ -20,6 +20,7 @@ import java.util.Map;
import org.apache.camel.spi.PropertiesComponent;
import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.json.JsonObject;
@DevConsole("properties")
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteControllerConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteControllerConsole.java
index 5b7bde5583f..988cf6a4752 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteControllerConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteControllerConsole.java
@@ -30,6 +30,7 @@ import org.apache.camel.Route;
import org.apache.camel.spi.RouteController;
import org.apache.camel.spi.SupervisingRouteController;
import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.TimeUtils;
import org.apache.camel.util.URISupport;
import org.apache.camel.util.backoff.BackOffTimer;
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
index 417aa59b745..1ccb736ddc3 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
@@ -31,6 +31,7 @@ import org.apache.camel.api.management.mbean.ManagedProcessorMBean;
import org.apache.camel.api.management.mbean.ManagedRouteMBean;
import org.apache.camel.spi.annotations.DevConsole;
import org.apache.camel.support.PatternHelper;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.StringHelper;
import org.apache.camel.util.TimeUtils;
import org.apache.camel.util.json.JsonArray;
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/SourceDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/SourceDevConsole.java
index 18b35b39485..6b17f522a40 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/SourceDevConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/SourceDevConsole.java
@@ -31,6 +31,7 @@ import org.apache.camel.spi.Resource;
import org.apache.camel.spi.annotations.DevConsole;
import org.apache.camel.support.LoggerHelper;
import org.apache.camel.support.PatternHelper;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.StringHelper;
import org.apache.camel.util.json.JsonObject;
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/ThreadDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/ThreadDevConsole.java
index da09c28213e..3deb5a82bcb 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/ThreadDevConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/ThreadDevConsole.java
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.camel.spi.Configurer;
import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.json.JsonArray;
import org.apache.camel.util.json.JsonObject;
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/TopDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/TopDevConsole.java
index f2b9b9b3c2b..90176c7eb81 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/TopDevConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/TopDevConsole.java
@@ -34,6 +34,7 @@ import org.apache.camel.spi.Resource;
import org.apache.camel.spi.annotations.DevConsole;
import org.apache.camel.support.LoggerHelper;
import org.apache.camel.support.PatternHelper;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.StringHelper;
import org.apache.camel.util.TimeUtils;
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/TypeConverterConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/TypeConverterConsole.java
index 06f80cc7a47..dd28b9b3d10 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/TypeConverterConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/TypeConverterConsole.java
@@ -20,6 +20,7 @@ import java.util.Map;
import org.apache.camel.spi.TypeConverterRegistry;
import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.json.JsonObject;
@DevConsole("type-converters")
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/AbstractDevConsole.java b/core/camel-support/src/main/java/org/apache/camel/support/console/AbstractDevConsole.java
similarity index 92%
rename from core/camel-console/src/main/java/org/apache/camel/impl/console/AbstractDevConsole.java
rename to core/camel-support/src/main/java/org/apache/camel/support/console/AbstractDevConsole.java
index 3da644e0252..c48b603a7d6 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/AbstractDevConsole.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/console/AbstractDevConsole.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.console;
+package org.apache.camel.support.console;
import java.util.Map;
@@ -22,7 +22,6 @@ import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.console.DevConsole;
import org.apache.camel.support.service.ServiceSupport;
-import org.apache.camel.util.json.JsonObject;
/**
* Base implementation for {@link DevConsole}.
@@ -112,9 +111,12 @@ public abstract class AbstractDevConsole extends ServiceSupport implements DevCo
/**
* Invokes and gets the output from this console in json format.
*
+ * The returned object can for example be an <tt>org.apache.camel.util.json.JsonObject</tt> from camel-util-json
+ * to represent JSon data.
+ *
* @see DevConsole#call(MediaType, Map)
*/
- protected abstract JsonObject doCallJson(Map<String, Object> options);
+ protected abstract Map<String, Object> doCallJson(Map<String, Object> options);
/**
* Invokes and gets the output from this console in text format.
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_21.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_21.adoc
index 2949033a8d3..0e116698538 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_21.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_21.adoc
@@ -10,6 +10,15 @@ from both 3.0 to 3.1 and 3.1 to 3.2.
XML parsers & XML transformers has been made more secure by disabling DOCTYPE and/or access to external DTD/Schema.
+=== camel-console
+
+The class `org.apache.camel.impl.console.AbstractDevConsole` has moved from `camel-console` to `camel-support`
+and moved to package `org.apache.camel.support.console.AbstractDevConsole`.
+
+Component developers that has plugins for Camel Developer Console, should just use
+`camel-support` and `camel-util-json` as dependencies,
+and then extend `AbstractDevConsole` for custom console implementations.
+
=== camel-main
The option `camel.main.routesReloadRestartDuration` has changed its default value from `true` to `false`.
diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/console/DependencyDownloaderConsole.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/console/DependencyDownloaderConsole.java
index 0ffc31a0d5d..3420429b2e6 100644
--- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/console/DependencyDownloaderConsole.java
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/console/DependencyDownloaderConsole.java
@@ -18,9 +18,9 @@ package org.apache.camel.main.console;
import java.util.Map;
-import org.apache.camel.impl.console.AbstractDevConsole;
import org.apache.camel.main.download.DependencyDownloaderClassLoader;
import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
import org.apache.camel.util.json.JsonObject;
@DevConsole("dependency-downloader")