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 2025/01/01 16:08:41 UTC

(camel) 01/01: CAMEL-21575: camel-main - Concurrency issue on JDK21.

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

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

commit b63a95d0c5bd595cd0c13299825a7f6e1eba0fcb
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jan 1 17:07:29 2025 +0100

    CAMEL-21575: camel-main - Concurrency issue on JDK21.
---
 .../camel/component/properties/PropertiesComponentConfigurer.java    | 5 -----
 .../org/apache/camel/component/properties/PropertiesComponent.java   | 2 +-
 .../java/org/apache/camel/impl/console/EventConsoleConfigurer.java   | 5 -----
 .../camel/impl/console/GarbageCollectorDevConsoleConfigurer.java     | 5 -----
 .../apache/camel/impl/console/JavaSecurityDevConsoleConfigurer.java  | 5 -----
 .../java/org/apache/camel/impl/console/JvmDevConsoleConfigurer.java  | 5 -----
 .../org/apache/camel/impl/console/MemoryDevConsoleConfigurer.java    | 5 -----
 .../org/apache/camel/impl/console/ReceiveDevConsoleConfigurer.java   | 5 -----
 .../org/apache/camel/impl/console/ThreadDevConsoleConfigurer.java    | 5 -----
 .../org/apache/camel/impl/console/TraceDevConsoleConfigurer.java     | 5 -----
 .../src/main/java/org/apache/camel/impl/console/EventConsole.java    | 2 +-
 .../org/apache/camel/impl/console/GarbageCollectorDevConsole.java    | 2 +-
 .../java/org/apache/camel/impl/console/JavaSecurityDevConsole.java   | 2 +-
 .../src/main/java/org/apache/camel/impl/console/JvmDevConsole.java   | 2 +-
 .../main/java/org/apache/camel/impl/console/MemoryDevConsole.java    | 2 +-
 .../main/java/org/apache/camel/impl/console/ReceiveDevConsole.java   | 2 +-
 .../main/java/org/apache/camel/impl/console/ThreadDevConsole.java    | 2 +-
 .../src/main/java/org/apache/camel/impl/console/TraceDevConsole.java | 2 +-
 .../apache/camel/main/AwsVaultConfigurationPropertiesConfigurer.java | 5 -----
 .../camel/main/AzureVaultConfigurationPropertiesConfigurer.java      | 5 -----
 .../apache/camel/main/DebuggerConfigurationPropertiesConfigurer.java | 5 -----
 .../camel/main/FaultToleranceConfigurationPropertiesConfigurer.java  | 5 -----
 .../apache/camel/main/GcpVaultConfigurationPropertiesConfigurer.java | 5 -----
 .../camel/main/HashicorpVaultConfigurationPropertiesConfigurer.java  | 5 -----
 .../apache/camel/main/HealthConfigurationPropertiesConfigurer.java   | 5 -----
 .../camel/main/HttpServerConfigurationPropertiesConfigurer.java      | 5 -----
 .../KubernetesConfigmapsVaultConfigurationPropertiesConfigurer.java  | 5 -----
 .../camel/main/KubernetesVaultConfigurationPropertiesConfigurer.java | 5 -----
 .../org/apache/camel/main/LraConfigurationPropertiesConfigurer.java  | 5 -----
 .../org/apache/camel/main/MainConfigurationPropertiesConfigurer.java | 5 -----
 .../apache/camel/main/MetricsConfigurationPropertiesConfigurer.java  | 5 -----
 .../org/apache/camel/main/OtelConfigurationPropertiesConfigurer.java | 5 -----
 .../camel/main/Resilience4jConfigurationPropertiesConfigurer.java    | 5 -----
 .../org/apache/camel/main/RestConfigurationPropertiesConfigurer.java | 5 -----
 .../camel/main/RouteControllerConfigurationPropertiesConfigurer.java | 5 -----
 .../org/apache/camel/main/SSLConfigurationPropertiesConfigurer.java  | 5 -----
 .../main/StartupConditionConfigurationPropertiesConfigurer.java      | 5 -----
 .../camel/main/ThreadPoolConfigurationPropertiesConfigurer.java      | 5 -----
 .../main/ThreadPoolProfileConfigurationPropertiesConfigurer.java     | 5 -----
 .../apache/camel/main/TracerConfigurationPropertiesConfigurer.java   | 5 -----
 .../java/org/apache/camel/main/AwsVaultConfigurationProperties.java  | 2 +-
 .../org/apache/camel/main/AzureVaultConfigurationProperties.java     | 2 +-
 .../java/org/apache/camel/main/DebuggerConfigurationProperties.java  | 2 +-
 .../org/apache/camel/main/FaultToleranceConfigurationProperties.java | 2 +-
 .../java/org/apache/camel/main/GcpVaultConfigurationProperties.java  | 2 +-
 .../org/apache/camel/main/HashicorpVaultConfigurationProperties.java | 2 +-
 .../java/org/apache/camel/main/HealthConfigurationProperties.java    | 2 +-
 .../org/apache/camel/main/HttpServerConfigurationProperties.java     | 2 +-
 .../camel/main/KubernetesConfigmapsVaultConfigurationProperties.java | 2 +-
 .../apache/camel/main/KubernetesVaultConfigurationProperties.java    | 2 +-
 .../main/java/org/apache/camel/main/LraConfigurationProperties.java  | 2 +-
 .../main/java/org/apache/camel/main/MainConfigurationProperties.java | 2 +-
 core/camel-main/src/main/java/org/apache/camel/main/MainHelper.java  | 1 +
 .../java/org/apache/camel/main/MetricsConfigurationProperties.java   | 2 +-
 .../main/java/org/apache/camel/main/OtelConfigurationProperties.java | 2 +-
 .../org/apache/camel/main/Resilience4jConfigurationProperties.java   | 2 +-
 .../main/java/org/apache/camel/main/RestConfigurationProperties.java | 2 +-
 .../apache/camel/main/RouteControllerConfigurationProperties.java    | 2 +-
 .../main/java/org/apache/camel/main/SSLConfigurationProperties.java  | 2 +-
 .../apache/camel/main/StartupConditionConfigurationProperties.java   | 2 +-
 .../org/apache/camel/main/ThreadPoolConfigurationProperties.java     | 2 +-
 .../apache/camel/main/ThreadPoolProfileConfigurationProperties.java  | 2 +-
 .../java/org/apache/camel/main/TracerConfigurationProperties.java    | 2 +-
 63 files changed, 32 insertions(+), 186 deletions(-)

diff --git a/core/camel-base/src/generated/java/org/apache/camel/component/properties/PropertiesComponentConfigurer.java b/core/camel-base/src/generated/java/org/apache/camel/component/properties/PropertiesComponentConfigurer.java
index 7af20e677ab..8881fc6102e 100644
--- a/core/camel-base/src/generated/java/org/apache/camel/component/properties/PropertiesComponentConfigurer.java
+++ b/core/camel-base/src/generated/java/org/apache/camel/component/properties/PropertiesComponentConfigurer.java
@@ -39,7 +39,6 @@ public class PropertiesComponentConfigurer extends org.apache.camel.support.comp
         map.put("PropertiesParser", org.apache.camel.component.properties.PropertiesParser.class);
         map.put("SystemPropertiesMode", int.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(PropertiesComponentConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -84,10 +83,6 @@ public class PropertiesComponentConfigurer extends org.apache.camel.support.comp
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
index 904402ff462..ab3e2a6bac1 100644
--- a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
  */
 @ManagedResource(description = "Managed PropertiesComponent")
 @JdkService(org.apache.camel.spi.PropertiesComponent.FACTORY)
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class PropertiesComponent extends ServiceSupport
         implements org.apache.camel.spi.PropertiesComponent, StaticService, CamelContextAware {
 
diff --git a/core/camel-console/src/generated/java/org/apache/camel/impl/console/EventConsoleConfigurer.java b/core/camel-console/src/generated/java/org/apache/camel/impl/console/EventConsoleConfigurer.java
index 29737e6b804..088913d11d4 100644
--- a/core/camel-console/src/generated/java/org/apache/camel/impl/console/EventConsoleConfigurer.java
+++ b/core/camel-console/src/generated/java/org/apache/camel/impl/console/EventConsoleConfigurer.java
@@ -25,7 +25,6 @@ public class EventConsoleConfigurer extends org.apache.camel.support.component.P
         map.put("CamelContext", org.apache.camel.CamelContext.class);
         map.put("Capacity", int.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(EventConsoleConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -44,10 +43,6 @@ public class EventConsoleConfigurer extends org.apache.camel.support.component.P
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-console/src/generated/java/org/apache/camel/impl/console/GarbageCollectorDevConsoleConfigurer.java b/core/camel-console/src/generated/java/org/apache/camel/impl/console/GarbageCollectorDevConsoleConfigurer.java
index b468167b51f..103466c131e 100644
--- a/core/camel-console/src/generated/java/org/apache/camel/impl/console/GarbageCollectorDevConsoleConfigurer.java
+++ b/core/camel-console/src/generated/java/org/apache/camel/impl/console/GarbageCollectorDevConsoleConfigurer.java
@@ -24,7 +24,6 @@ public class GarbageCollectorDevConsoleConfigurer extends org.apache.camel.suppo
         Map<String, Object> map = new CaseInsensitiveMap();
         map.put("CamelContext", org.apache.camel.CamelContext.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(GarbageCollectorDevConsoleConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -42,10 +41,6 @@ public class GarbageCollectorDevConsoleConfigurer extends org.apache.camel.suppo
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-console/src/generated/java/org/apache/camel/impl/console/JavaSecurityDevConsoleConfigurer.java b/core/camel-console/src/generated/java/org/apache/camel/impl/console/JavaSecurityDevConsoleConfigurer.java
index a4ae282a93b..e4145131f44 100644
--- a/core/camel-console/src/generated/java/org/apache/camel/impl/console/JavaSecurityDevConsoleConfigurer.java
+++ b/core/camel-console/src/generated/java/org/apache/camel/impl/console/JavaSecurityDevConsoleConfigurer.java
@@ -24,7 +24,6 @@ public class JavaSecurityDevConsoleConfigurer extends org.apache.camel.support.c
         Map<String, Object> map = new CaseInsensitiveMap();
         map.put("CamelContext", org.apache.camel.CamelContext.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(JavaSecurityDevConsoleConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -42,10 +41,6 @@ public class JavaSecurityDevConsoleConfigurer extends org.apache.camel.support.c
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-console/src/generated/java/org/apache/camel/impl/console/JvmDevConsoleConfigurer.java b/core/camel-console/src/generated/java/org/apache/camel/impl/console/JvmDevConsoleConfigurer.java
index 4bfc135370b..6f81a68fb6b 100644
--- a/core/camel-console/src/generated/java/org/apache/camel/impl/console/JvmDevConsoleConfigurer.java
+++ b/core/camel-console/src/generated/java/org/apache/camel/impl/console/JvmDevConsoleConfigurer.java
@@ -25,7 +25,6 @@ public class JvmDevConsoleConfigurer extends org.apache.camel.support.component.
         map.put("CamelContext", org.apache.camel.CamelContext.class);
         map.put("ShowClasspath", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(JvmDevConsoleConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -45,10 +44,6 @@ public class JvmDevConsoleConfigurer extends org.apache.camel.support.component.
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-console/src/generated/java/org/apache/camel/impl/console/MemoryDevConsoleConfigurer.java b/core/camel-console/src/generated/java/org/apache/camel/impl/console/MemoryDevConsoleConfigurer.java
index 8758c352177..54a3b74d546 100644
--- a/core/camel-console/src/generated/java/org/apache/camel/impl/console/MemoryDevConsoleConfigurer.java
+++ b/core/camel-console/src/generated/java/org/apache/camel/impl/console/MemoryDevConsoleConfigurer.java
@@ -24,7 +24,6 @@ public class MemoryDevConsoleConfigurer extends org.apache.camel.support.compone
         Map<String, Object> map = new CaseInsensitiveMap();
         map.put("CamelContext", org.apache.camel.CamelContext.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(MemoryDevConsoleConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -42,10 +41,6 @@ public class MemoryDevConsoleConfigurer extends org.apache.camel.support.compone
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-console/src/generated/java/org/apache/camel/impl/console/ReceiveDevConsoleConfigurer.java b/core/camel-console/src/generated/java/org/apache/camel/impl/console/ReceiveDevConsoleConfigurer.java
index 0129a9fae6a..11acd85e6d8 100644
--- a/core/camel-console/src/generated/java/org/apache/camel/impl/console/ReceiveDevConsoleConfigurer.java
+++ b/core/camel-console/src/generated/java/org/apache/camel/impl/console/ReceiveDevConsoleConfigurer.java
@@ -27,7 +27,6 @@ public class ReceiveDevConsoleConfigurer extends org.apache.camel.support.compon
         map.put("Capacity", int.class);
         map.put("RemoveOnDump", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(ReceiveDevConsoleConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -50,10 +49,6 @@ public class ReceiveDevConsoleConfigurer extends org.apache.camel.support.compon
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-console/src/generated/java/org/apache/camel/impl/console/ThreadDevConsoleConfigurer.java b/core/camel-console/src/generated/java/org/apache/camel/impl/console/ThreadDevConsoleConfigurer.java
index d6a2a472747..4b3c63aa575 100644
--- a/core/camel-console/src/generated/java/org/apache/camel/impl/console/ThreadDevConsoleConfigurer.java
+++ b/core/camel-console/src/generated/java/org/apache/camel/impl/console/ThreadDevConsoleConfigurer.java
@@ -24,7 +24,6 @@ public class ThreadDevConsoleConfigurer extends org.apache.camel.support.compone
         Map<String, Object> map = new CaseInsensitiveMap();
         map.put("CamelContext", org.apache.camel.CamelContext.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(ThreadDevConsoleConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -42,10 +41,6 @@ public class ThreadDevConsoleConfigurer extends org.apache.camel.support.compone
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-console/src/generated/java/org/apache/camel/impl/console/TraceDevConsoleConfigurer.java b/core/camel-console/src/generated/java/org/apache/camel/impl/console/TraceDevConsoleConfigurer.java
index d6bbea035f9..a4aed79dc4f 100644
--- a/core/camel-console/src/generated/java/org/apache/camel/impl/console/TraceDevConsoleConfigurer.java
+++ b/core/camel-console/src/generated/java/org/apache/camel/impl/console/TraceDevConsoleConfigurer.java
@@ -25,7 +25,6 @@ public class TraceDevConsoleConfigurer extends org.apache.camel.support.componen
         map.put("CamelContext", org.apache.camel.CamelContext.class);
         map.put("Capacity", int.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(TraceDevConsoleConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -44,10 +43,6 @@ public class TraceDevConsoleConfigurer extends org.apache.camel.support.componen
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
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 f2ad01380af..02a77406948 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
@@ -32,7 +32,7 @@ import org.apache.camel.util.TimeUtils;
 import org.apache.camel.util.json.JsonObject;
 
 @DevConsole(name = "event", displayName = "Camel Events", description = "The most recent Camel events")
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class EventConsole extends AbstractDevConsole {
 
     @Metadata(defaultValue = "25",
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 4b727fe98fa..0ad109148b9 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
@@ -29,7 +29,7 @@ import org.apache.camel.util.json.JsonArray;
 import org.apache.camel.util.json.JsonObject;
 
 @DevConsole(name = "gc", displayName = "Garbage Collector", description = "Displays Garbage Collector information")
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class GarbageCollectorDevConsole extends AbstractDevConsole {
 
     public GarbageCollectorDevConsole() {
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 68cc6b65d6e..d93cf64b4ae 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
@@ -28,7 +28,7 @@ import org.apache.camel.util.json.JsonArray;
 import org.apache.camel.util.json.JsonObject;
 
 @DevConsole(name = "java-security", description = "Displays Java Security (JSSE) information")
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class JavaSecurityDevConsole extends AbstractDevConsole {
 
     public JavaSecurityDevConsole() {
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 8d1e851afd4..2931c7fd58c 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
@@ -28,7 +28,7 @@ import org.apache.camel.util.TimeUtils;
 import org.apache.camel.util.json.JsonObject;
 
 @DevConsole(name = "jvm", displayName = "JVM", description = "Displays JVM information")
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class JvmDevConsole extends AbstractDevConsole {
 
     @Metadata(defaultValue = "true", description = "Show classpath information")
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 141bbbccee1..eb1e863f5f6 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
@@ -28,7 +28,7 @@ import org.apache.camel.util.json.JsonObject;
 import static org.apache.camel.util.UnitUtils.printUnitFromBytesDot;
 
 @DevConsole(name = "memory", displayName = "JVM Memory", description = "Displays JVM memory information")
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class MemoryDevConsole extends AbstractDevConsole {
 
     public MemoryDevConsole() {
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/ReceiveDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/ReceiveDevConsole.java
index ff3a3215e7b..3f5652a68e7 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/ReceiveDevConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/ReceiveDevConsole.java
@@ -47,7 +47,7 @@ import org.apache.camel.util.json.JsonObject;
 import org.apache.camel.util.json.Jsoner;
 
 @DevConsole(name = "receive", displayName = "Camel Receive", description = "Consume messages from endpoints")
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class ReceiveDevConsole extends AbstractDevConsole {
 
     @Metadata(defaultValue = "100",
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 414d0535fb1..fdfacc4d5f0 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
@@ -29,7 +29,7 @@ import org.apache.camel.util.json.JsonArray;
 import org.apache.camel.util.json.JsonObject;
 
 @DevConsole(name = "thread", description = "Displays JVM Threads information")
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class ThreadDevConsole extends AbstractDevConsole {
 
     public ThreadDevConsole() {
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/TraceDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/TraceDevConsole.java
index a53c9ced4cb..dea7aa4b72d 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/TraceDevConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/TraceDevConsole.java
@@ -30,7 +30,7 @@ import org.apache.camel.util.json.JsonArray;
 import org.apache.camel.util.json.JsonObject;
 
 @DevConsole(name = "trace", displayName = "Camel Tracing", description = "Trace routed messages")
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class TraceDevConsole extends AbstractDevConsole {
 
     @Metadata(defaultValue = "100",
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/AwsVaultConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/AwsVaultConfigurationPropertiesConfigurer.java
index c1119628250..72fdfe8e9b0 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/AwsVaultConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/AwsVaultConfigurationPropertiesConfigurer.java
@@ -42,7 +42,6 @@ public class AwsVaultConfigurationPropertiesConfigurer extends org.apache.camel.
         map.put("UriEndpointOverride", java.lang.String.class);
         map.put("UseSqsNotification", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AwsVaultConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -94,10 +93,6 @@ public class AwsVaultConfigurationPropertiesConfigurer extends org.apache.camel.
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/AzureVaultConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/AzureVaultConfigurationPropertiesConfigurer.java
index 7c1cd4a8473..bf3be0a1c8d 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/AzureVaultConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/AzureVaultConfigurationPropertiesConfigurer.java
@@ -41,7 +41,6 @@ public class AzureVaultConfigurationPropertiesConfigurer extends org.apache.came
         map.put("TenantId", java.lang.String.class);
         map.put("VaultName", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AzureVaultConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -92,10 +91,6 @@ public class AzureVaultConfigurationPropertiesConfigurer extends org.apache.came
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/DebuggerConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/DebuggerConfigurationPropertiesConfigurer.java
index d44ca5c0453..d1e2b1f160b 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/DebuggerConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/DebuggerConfigurationPropertiesConfigurer.java
@@ -38,7 +38,6 @@ public class DebuggerConfigurationPropertiesConfigurer extends org.apache.camel.
         map.put("Standby", boolean.class);
         map.put("WaitForAttach", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(DebuggerConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -81,10 +80,6 @@ public class DebuggerConfigurationPropertiesConfigurer extends org.apache.camel.
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/FaultToleranceConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/FaultToleranceConfigurationPropertiesConfigurer.java
index 01d2e7fb9c7..e19b26b0513 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/FaultToleranceConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/FaultToleranceConfigurationPropertiesConfigurer.java
@@ -36,7 +36,6 @@ public class FaultToleranceConfigurationPropertiesConfigurer extends org.apache.
         map.put("TimeoutPoolSize", java.lang.Integer.class);
         map.put("TimeoutScheduledExecutorService", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(FaultToleranceConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -77,10 +76,6 @@ public class FaultToleranceConfigurationPropertiesConfigurer extends org.apache.
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/GcpVaultConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/GcpVaultConfigurationPropertiesConfigurer.java
index ba60380f0cb..9d2b2cea192 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/GcpVaultConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/GcpVaultConfigurationPropertiesConfigurer.java
@@ -36,7 +36,6 @@ public class GcpVaultConfigurationPropertiesConfigurer extends org.apache.camel.
         map.put("SubscriptionName", java.lang.String.class);
         map.put("UseDefaultInstance", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(GcpVaultConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -77,10 +76,6 @@ public class GcpVaultConfigurationPropertiesConfigurer extends org.apache.camel.
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/HashicorpVaultConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/HashicorpVaultConfigurationPropertiesConfigurer.java
index 95ca9d537f2..2143ce68bdb 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/HashicorpVaultConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/HashicorpVaultConfigurationPropertiesConfigurer.java
@@ -33,7 +33,6 @@ public class HashicorpVaultConfigurationPropertiesConfigurer extends org.apache.
         map.put("Scheme", java.lang.String.class);
         map.put("Token", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(HashicorpVaultConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -65,10 +64,6 @@ public class HashicorpVaultConfigurationPropertiesConfigurer extends org.apache.
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/HealthConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/HealthConfigurationPropertiesConfigurer.java
index de4623f8058..7374ac93aea 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/HealthConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/HealthConfigurationPropertiesConfigurer.java
@@ -31,7 +31,6 @@ public class HealthConfigurationPropertiesConfigurer extends org.apache.camel.su
         map.put("RegistryEnabled", java.lang.Boolean.class);
         map.put("RoutesEnabled", java.lang.Boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(HealthConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -62,10 +61,6 @@ public class HealthConfigurationPropertiesConfigurer extends org.apache.camel.su
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/HttpServerConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/HttpServerConfigurationPropertiesConfigurer.java
index dee440b9d43..448df94e6e6 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/HttpServerConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/HttpServerConfigurationPropertiesConfigurer.java
@@ -47,7 +47,6 @@ public class HttpServerConfigurationPropertiesConfigurer extends org.apache.came
         map.put("UploadSourceDir", java.lang.String.class);
         map.put("UseGlobalSslContextParameters", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(HttpServerConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -107,10 +106,6 @@ public class HttpServerConfigurationPropertiesConfigurer extends org.apache.came
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/KubernetesConfigmapsVaultConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/KubernetesConfigmapsVaultConfigurationPropertiesConfigurer.java
index 790cac8b53a..df0434f7c41 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/KubernetesConfigmapsVaultConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/KubernetesConfigmapsVaultConfigurationPropertiesConfigurer.java
@@ -31,7 +31,6 @@ public class KubernetesConfigmapsVaultConfigurationPropertiesConfigurer extends
         map.put("KubernetesVaultConfiguration", org.apache.camel.vault.KubernetesVaultConfiguration.class);
         map.put("RefreshEnabled", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(KubernetesConfigmapsVaultConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -62,10 +61,6 @@ public class KubernetesConfigmapsVaultConfigurationPropertiesConfigurer extends
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/KubernetesVaultConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/KubernetesVaultConfigurationPropertiesConfigurer.java
index 5733f1c41ff..999915dd67e 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/KubernetesVaultConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/KubernetesVaultConfigurationPropertiesConfigurer.java
@@ -31,7 +31,6 @@ public class KubernetesVaultConfigurationPropertiesConfigurer extends org.apache
         map.put("RefreshEnabled", boolean.class);
         map.put("Secrets", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(KubernetesVaultConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -62,10 +61,6 @@ public class KubernetesVaultConfigurationPropertiesConfigurer extends org.apache
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/LraConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/LraConfigurationPropertiesConfigurer.java
index 538e3e973e9..badb2b23ea6 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/LraConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/LraConfigurationPropertiesConfigurer.java
@@ -28,7 +28,6 @@ public class LraConfigurationPropertiesConfigurer extends org.apache.camel.suppo
         map.put("LocalParticipantContextPath", java.lang.String.class);
         map.put("LocalParticipantUrl", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(LraConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -53,10 +52,6 @@ public class LraConfigurationPropertiesConfigurer extends org.apache.camel.suppo
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
index d554ec953ce..d45c98f7f81 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
@@ -145,7 +145,6 @@ public class MainConfigurationPropertiesConfigurer extends org.apache.camel.supp
         map.put("UseMdcLogging", boolean.class);
         map.put("UuidGenerator", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(MainConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -398,10 +397,6 @@ public class MainConfigurationPropertiesConfigurer extends org.apache.camel.supp
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/MetricsConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/MetricsConfigurationPropertiesConfigurer.java
index 490b242d1f3..d3d2739b918 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/MetricsConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/MetricsConfigurationPropertiesConfigurer.java
@@ -34,7 +34,6 @@ public class MetricsConfigurationPropertiesConfigurer extends org.apache.camel.s
         map.put("RoutePolicyLevel", java.lang.String.class);
         map.put("TextFormatVersion", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(MetricsConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -69,10 +68,6 @@ public class MetricsConfigurationPropertiesConfigurer extends org.apache.camel.s
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/OtelConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/OtelConfigurationPropertiesConfigurer.java
index abd47a797a9..4eedba010f1 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/OtelConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/OtelConfigurationPropertiesConfigurer.java
@@ -28,7 +28,6 @@ public class OtelConfigurationPropertiesConfigurer extends org.apache.camel.supp
         map.put("InstrumentationName", java.lang.String.class);
         map.put("TraceProcessors", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(OtelConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -52,10 +51,6 @@ public class OtelConfigurationPropertiesConfigurer extends org.apache.camel.supp
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/Resilience4jConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/Resilience4jConfigurationPropertiesConfigurer.java
index e3f19840b4a..8527c629782 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/Resilience4jConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/Resilience4jConfigurationPropertiesConfigurer.java
@@ -43,7 +43,6 @@ public class Resilience4jConfigurationPropertiesConfigurer extends org.apache.ca
         map.put("WaitDurationInOpenState", java.lang.Integer.class);
         map.put("WritableStackTraceEnabled", java.lang.Boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Resilience4jConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -98,10 +97,6 @@ public class Resilience4jConfigurationPropertiesConfigurer extends org.apache.ca
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/RestConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/RestConfigurationPropertiesConfigurer.java
index 52416a8aeb8..7a0c05825fa 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/RestConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/RestConfigurationPropertiesConfigurer.java
@@ -52,7 +52,6 @@ public class RestConfigurationPropertiesConfigurer extends org.apache.camel.supp
         map.put("UseXForwardHeaders", boolean.class);
         map.put("XmlDataFormat", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(RestConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -122,10 +121,6 @@ public class RestConfigurationPropertiesConfigurer extends org.apache.camel.supp
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/RouteControllerConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/RouteControllerConfigurationPropertiesConfigurer.java
index fd504981e20..5c901218796 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/RouteControllerConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/RouteControllerConfigurationPropertiesConfigurer.java
@@ -35,7 +35,6 @@ public class RouteControllerConfigurationPropertiesConfigurer extends org.apache
         map.put("UnhealthyOnExhausted", boolean.class);
         map.put("UnhealthyOnRestarting", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(RouteControllerConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -74,10 +73,6 @@ public class RouteControllerConfigurationPropertiesConfigurer extends org.apache
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/SSLConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/SSLConfigurationPropertiesConfigurer.java
index 7659588cf01..f4d7fa454da 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/SSLConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/SSLConfigurationPropertiesConfigurer.java
@@ -43,7 +43,6 @@ public class SSLConfigurationPropertiesConfigurer extends org.apache.camel.suppo
         map.put("TrustStore", java.lang.String.class);
         map.put("TrustStorePassword", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(SSLConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -97,10 +96,6 @@ public class SSLConfigurationPropertiesConfigurer extends org.apache.camel.suppo
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/StartupConditionConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/StartupConditionConfigurationPropertiesConfigurer.java
index f9d0a93abd8..aca425683a6 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/StartupConditionConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/StartupConditionConfigurationPropertiesConfigurer.java
@@ -30,7 +30,6 @@ public class StartupConditionConfigurationPropertiesConfigurer extends org.apach
         map.put("OnTimeout", java.lang.String.class);
         map.put("Timeout", int.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(StartupConditionConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -57,10 +56,6 @@ public class StartupConditionConfigurationPropertiesConfigurer extends org.apach
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/ThreadPoolConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/ThreadPoolConfigurationPropertiesConfigurer.java
index 813e5e920cc..863a75b9473 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/ThreadPoolConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/ThreadPoolConfigurationPropertiesConfigurer.java
@@ -31,7 +31,6 @@ public class ThreadPoolConfigurationPropertiesConfigurer extends org.apache.came
         map.put("RejectedPolicy", org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy.class);
         map.put("TimeUnit", java.util.concurrent.TimeUnit.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(ThreadPoolConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -62,10 +61,6 @@ public class ThreadPoolConfigurationPropertiesConfigurer extends org.apache.came
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/ThreadPoolProfileConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/ThreadPoolProfileConfigurationPropertiesConfigurer.java
index f9d52a69c60..13eb2e98369 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/ThreadPoolProfileConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/ThreadPoolProfileConfigurationPropertiesConfigurer.java
@@ -31,7 +31,6 @@ public class ThreadPoolProfileConfigurationPropertiesConfigurer extends org.apac
         map.put("RejectedPolicy", org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy.class);
         map.put("TimeUnit", java.util.concurrent.TimeUnit.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(ThreadPoolProfileConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -62,10 +61,6 @@ public class ThreadPoolProfileConfigurationPropertiesConfigurer extends org.apac
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/TracerConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/TracerConfigurationPropertiesConfigurer.java
index 88d6c24959f..2c7cf5cafed 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/TracerConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/TracerConfigurationPropertiesConfigurer.java
@@ -37,7 +37,6 @@ public class TracerConfigurationPropertiesConfigurer extends org.apache.camel.su
         map.put("TraceRests", boolean.class);
         map.put("TraceTemplates", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(TracerConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -79,10 +78,6 @@ public class TracerConfigurationPropertiesConfigurer extends org.apache.camel.su
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/AwsVaultConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/AwsVaultConfigurationProperties.java
index 31abefa851e..0cdbb062c7c 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/AwsVaultConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/AwsVaultConfigurationProperties.java
@@ -23,7 +23,7 @@ import org.apache.camel.vault.AwsVaultConfiguration;
 /**
  * Configuration for access to AWS Secret.
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class AwsVaultConfigurationProperties extends AwsVaultConfiguration implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/AzureVaultConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/AzureVaultConfigurationProperties.java
index d0d1723edb9..9d78426c2ed 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/AzureVaultConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/AzureVaultConfigurationProperties.java
@@ -23,7 +23,7 @@ import org.apache.camel.vault.AzureVaultConfiguration;
 /**
  * Configuration for access to Azure Key Vault Secret.
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class AzureVaultConfigurationProperties extends AzureVaultConfiguration implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/DebuggerConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/DebuggerConfigurationProperties.java
index 98632124d6b..4635e19f47a 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/DebuggerConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/DebuggerConfigurationProperties.java
@@ -24,7 +24,7 @@ import org.apache.camel.spi.Metadata;
 /**
  * Debugger configuration.
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class DebuggerConfigurationProperties implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/FaultToleranceConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/FaultToleranceConfigurationProperties.java
index cb14732696e..dade5eddff5 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/FaultToleranceConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/FaultToleranceConfigurationProperties.java
@@ -23,7 +23,7 @@ import org.apache.camel.spi.Metadata;
 /**
  * Global configuration for MicroProfile Fault Tolerance EIP circuit breaker.
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class FaultToleranceConfigurationProperties implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/GcpVaultConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/GcpVaultConfigurationProperties.java
index 708c4ff34aa..e5a94a00fbb 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/GcpVaultConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/GcpVaultConfigurationProperties.java
@@ -23,7 +23,7 @@ import org.apache.camel.vault.GcpVaultConfiguration;
 /**
  * Configuration for access to GCP Secret.
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class GcpVaultConfigurationProperties extends GcpVaultConfiguration implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/HashicorpVaultConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/HashicorpVaultConfigurationProperties.java
index 1126f5e501d..28c874b544b 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/HashicorpVaultConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/HashicorpVaultConfigurationProperties.java
@@ -23,7 +23,7 @@ import org.apache.camel.vault.HashicorpVaultConfiguration;
 /**
  * Configuration for access to AWS Secret.
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class HashicorpVaultConfigurationProperties extends HashicorpVaultConfiguration implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/HealthConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/HealthConfigurationProperties.java
index 5c6bcde1700..a8b0655a7cd 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/HealthConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/HealthConfigurationProperties.java
@@ -23,7 +23,7 @@ import org.apache.camel.spi.Metadata;
 /**
  * Global configuration for Health Check
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class HealthConfigurationProperties implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/HttpServerConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/HttpServerConfigurationProperties.java
index 64e4b8352e9..f5f58eb0e85 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/HttpServerConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/HttpServerConfigurationProperties.java
@@ -23,7 +23,7 @@ import org.apache.camel.spi.Metadata;
 /**
  * Configuration for embedded HTTP server for standalone Camel applications (not Spring Boot / Quarkus).
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class HttpServerConfigurationProperties implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/KubernetesConfigmapsVaultConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/KubernetesConfigmapsVaultConfigurationProperties.java
index 9d5bb0251c4..b00496054ef 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/KubernetesConfigmapsVaultConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/KubernetesConfigmapsVaultConfigurationProperties.java
@@ -23,7 +23,7 @@ import org.apache.camel.vault.KubernetesConfigMapVaultConfiguration;
 /**
  * Configuration for access to Kubernetes Configmaps.
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class KubernetesConfigmapsVaultConfigurationProperties extends KubernetesConfigMapVaultConfiguration
         implements BootstrapCloseable {
 
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/KubernetesVaultConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/KubernetesVaultConfigurationProperties.java
index f568b36bb13..b85b12f8980 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/KubernetesVaultConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/KubernetesVaultConfigurationProperties.java
@@ -23,7 +23,7 @@ import org.apache.camel.vault.KubernetesVaultConfiguration;
 /**
  * Configuration for access to AWS Secret.
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class KubernetesVaultConfigurationProperties extends KubernetesVaultConfiguration implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/LraConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/LraConfigurationProperties.java
index bc2e19e68cb..3c91843d31c 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/LraConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/LraConfigurationProperties.java
@@ -23,7 +23,7 @@ import org.apache.camel.spi.Metadata;
 /**
  * Global configuration for Saga LRA
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class LraConfigurationProperties implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
index 22804433b09..706eb369501 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
@@ -31,7 +31,7 @@ import org.apache.camel.spi.Metadata;
 /**
  * Global configuration for Camel Main to configure context name, stream caching and other global configurations.
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class MainConfigurationProperties extends DefaultConfigurationProperties<MainConfigurationProperties>
         implements BootstrapCloseable {
 
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/MainHelper.java b/core/camel-main/src/main/java/org/apache/camel/main/MainHelper.java
index 61f994e899c..657f7542a6c 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/MainHelper.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/MainHelper.java
@@ -24,6 +24,7 @@ import java.io.LineNumberReader;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/MetricsConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/MetricsConfigurationProperties.java
index f86fce9d4cd..cd3a206c87a 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/MetricsConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/MetricsConfigurationProperties.java
@@ -23,7 +23,7 @@ import org.apache.camel.spi.Metadata;
 /**
  * Global configuration for Micrometer Metrics.
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class MetricsConfigurationProperties implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/OtelConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/OtelConfigurationProperties.java
index 2ee9adfa779..5ec97264144 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/OtelConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/OtelConfigurationProperties.java
@@ -23,7 +23,7 @@ import org.apache.camel.spi.Metadata;
 /**
  * Global configuration for OpenTelemetry
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class OtelConfigurationProperties implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/Resilience4jConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/Resilience4jConfigurationProperties.java
index 553d1e3a90a..460992a07f9 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/Resilience4jConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/Resilience4jConfigurationProperties.java
@@ -25,7 +25,7 @@ import org.apache.camel.spi.Metadata;
 /**
  * Global configuration for Resilience EIP circuit breaker.
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class Resilience4jConfigurationProperties implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/RestConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/RestConfigurationProperties.java
index 078b60c2f6c..cd0a08f9cf2 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/RestConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/RestConfigurationProperties.java
@@ -25,7 +25,7 @@ import org.apache.camel.spi.RestConfiguration;
 /**
  * Global configuration for Rest DSL.
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class RestConfigurationProperties extends RestConfiguration implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/RouteControllerConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/RouteControllerConfigurationProperties.java
index 4564e39235d..d74fe311793 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/RouteControllerConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/RouteControllerConfigurationProperties.java
@@ -23,7 +23,7 @@ import org.apache.camel.spi.Metadata;
 /**
  * Route controller configuration.
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class RouteControllerConfigurationProperties implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/SSLConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/SSLConfigurationProperties.java
index e140ad657f8..dff59cc0241 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/SSLConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/SSLConfigurationProperties.java
@@ -23,7 +23,7 @@ import org.apache.camel.spi.Metadata;
 /**
  * Global configuration for SSL.
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class SSLConfigurationProperties implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/StartupConditionConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/StartupConditionConfigurationProperties.java
index 9705601344d..d59852d6dab 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/StartupConditionConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/StartupConditionConfigurationProperties.java
@@ -23,7 +23,7 @@ import org.apache.camel.spi.Metadata;
 /**
  * Configuration for startup conditions
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class StartupConditionConfigurationProperties implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/ThreadPoolConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/ThreadPoolConfigurationProperties.java
index 9f007c5a1bb..50b7da84492 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/ThreadPoolConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/ThreadPoolConfigurationProperties.java
@@ -27,7 +27,7 @@ import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
 /**
  * Global configuration for thread pools
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class ThreadPoolConfigurationProperties implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/ThreadPoolProfileConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/ThreadPoolProfileConfigurationProperties.java
index 9da5344949e..f600bcbd71b 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/ThreadPoolProfileConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/ThreadPoolProfileConfigurationProperties.java
@@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit;
 import org.apache.camel.spi.Configurer;
 import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
 
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class ThreadPoolProfileConfigurationProperties {
 
     private String id;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/TracerConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/TracerConfigurationProperties.java
index 6d2eba264df..666f58d0747 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/TracerConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/TracerConfigurationProperties.java
@@ -23,7 +23,7 @@ import org.apache.camel.spi.Metadata;
 /**
  * Tracer configuration.
  */
-@Configurer(bootstrap = true, extended = true)
+@Configurer(extended = true)
 public class TracerConfigurationProperties implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;