Migrate test classes from createService() to createSingletonService()

gnodet · claude · gnodet · commit 667840c300bf · 2026-03-27T16:45:32.000+01:00
Where safe, migrate test base classes to use createSingletonService()
so tests share a single container instance, reducing Docker overhead.

Tests left on createService() are annotated with comments explaining
why they cannot share a singleton container (state interference,
conflicting declarations, or container name collisions from
auth-variant containers).

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/DoclingITestSupport.java b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/DoclingITestSupport.java
@@ -31,7 +31,7 @@ public abstract class DoclingITestSupport extends CamelTestSupport {
     protected static final Logger LOG = LoggerFactory.getLogger(DoclingITestSupport.class);
 
     @RegisterExtension
-    static DoclingService doclingService = DoclingServiceFactory.createService();
+    static DoclingService doclingService = DoclingServiceFactory.createSingletonService();
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
diff --git a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/OcrExtractionIT.java b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/OcrExtractionIT.java
@@ -58,7 +58,7 @@ class OcrExtractionIT extends CamelTestSupport {
     private static final String TEST_TEXT_LINE3 = "OCR Test Document";
 
     @RegisterExtension
-    static DoclingService doclingService = DoclingServiceFactory.createService();
+    static DoclingService doclingService = DoclingServiceFactory.createSingletonService();
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
diff --git a/components/camel-ai/camel-kserve/src/test/java/org/apache/camel/component/kserve/it/KServeITSupport.java b/components/camel-ai/camel-kserve/src/test/java/org/apache/camel/component/kserve/it/KServeITSupport.java
@@ -26,7 +26,7 @@
 class KServeITSupport extends CamelTestSupport {
 
     @RegisterExtension
-    static TritonService service = TritonServiceFactory.createService();
+    static TritonService service = TritonServiceFactory.createSingletonService();
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMcpAndCamelToolsIT.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMcpAndCamelToolsIT.java
@@ -75,7 +75,7 @@ public class LangChain4jAgentMcpAndCamelToolsIT extends CamelTestSupport {
     static OllamaService OLLAMA = OllamaServiceFactory.createSingletonService();
 
     @RegisterExtension
-    static McpEverythingService MCP_EVERYTHING = McpEverythingServiceFactory.createService();
+    static McpEverythingService MCP_EVERYTHING = McpEverythingServiceFactory.createSingletonService();
 
     @Override
     protected void setupResources() throws Exception {
diff --git a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAIMcpAdvancedIT.java b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAIMcpAdvancedIT.java
@@ -51,7 +51,7 @@ public class OpenAIMcpAdvancedIT extends OpenAITestSupport {
     private static final String MCP_PROTOCOL_VERSIONS = "2024-11-05,2025-03-26,2025-06-18";
 
     @RegisterExtension
-    static McpEverythingService MCP_EVERYTHING = McpEverythingServiceFactory.createService();
+    static McpEverythingService MCP_EVERYTHING = McpEverythingServiceFactory.createSingletonService();
 
     private String returnDirectEndpointUri;
 
diff --git a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAIMcpConversationStoreIT.java b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAIMcpConversationStoreIT.java
@@ -57,7 +57,7 @@ public class OpenAIMcpConversationStoreIT extends OpenAITestSupport {
     private final Map<String, List<?>> conversationStore = new ConcurrentHashMap<>();
 
     @RegisterExtension
-    static McpEverythingService MCP_EVERYTHING = McpEverythingServiceFactory.createService();
+    static McpEverythingService MCP_EVERYTHING = McpEverythingServiceFactory.createSingletonService();
 
     @Override
     protected RouteBuilder createRouteBuilder() {
diff --git a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAIMcpManualToolLoopIT.java b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAIMcpManualToolLoopIT.java
@@ -51,7 +51,7 @@ public class OpenAIMcpManualToolLoopIT extends OpenAITestSupport {
     private static final String MCP_PROTOCOL_VERSIONS = "2024-11-05,2025-03-26,2025-06-18";
 
     @RegisterExtension
-    static McpEverythingService MCP_EVERYTHING = McpEverythingServiceFactory.createService();
+    static McpEverythingService MCP_EVERYTHING = McpEverythingServiceFactory.createSingletonService();
 
     @Override
     protected RouteBuilder createRouteBuilder() {
diff --git a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAIMcpToolsIT.java b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAIMcpToolsIT.java
@@ -43,7 +43,7 @@
 public class OpenAIMcpToolsIT extends OpenAITestSupport {
 
     @RegisterExtension
-    static McpEverythingService MCP_EVERYTHING = McpEverythingServiceFactory.createService();
+    static McpEverythingService MCP_EVERYTHING = McpEverythingServiceFactory.createSingletonService();
 
     @Override
     protected RouteBuilder createRouteBuilder() {
diff --git a/components/camel-ai/camel-tensorflow-serving/src/test/java/org/apache/camel/component/torchserve/it/TensorFlowServingITSupport.java b/components/camel-ai/camel-tensorflow-serving/src/test/java/org/apache/camel/component/torchserve/it/TensorFlowServingITSupport.java
@@ -26,7 +26,7 @@
 class TensorFlowServingITSupport extends CamelTestSupport {
 
     @RegisterExtension
-    static TensorFlowServingService service = TensorFlowServingServiceFactory.createService();
+    static TensorFlowServingService service = TensorFlowServingServiceFactory.createSingletonService();
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
diff --git a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/Base.java b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/Base.java
@@ -45,7 +45,7 @@ public class Base extends CamelTestSupport {
     static {
         initCredentials();
 
-        service = AzureStorageBlobServiceFactory.createService();
+        service = AzureStorageBlobServiceFactory.createSingletonService();
     }
 
     /*
diff --git a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/integration/StorageQueueBase.java b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/integration/StorageQueueBase.java
@@ -43,7 +43,7 @@ public class StorageQueueBase extends CamelTestSupport {
     static {
         initCredentials();
 
-        service = AzureStorageQueueServiceFactory.createService();
+        service = AzureStorageQueueServiceFactory.createSingletonService();
     }
 
     /*
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
@@ -31,6 +31,7 @@
 
 public class ConsulTestSupport extends CamelTestSupport {
     @RegisterExtension
+    // Not singleton-safe: ConsulHealthIT in same module creates own container with same alias
     public static ConsulService service = ConsulServiceFactory.createService();
 
     @RegisterExtension
diff --git a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/PubsubTestSupport.java b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/PubsubTestSupport.java
@@ -48,7 +48,7 @@
 
 public class PubsubTestSupport extends CamelTestSupport {
     @RegisterExtension
-    public static GooglePubSubService service = GooglePubSubServiceFactory.createService();
+    public static GooglePubSubService service = GooglePubSubServiceFactory.createSingletonService();
 
     public static final String PROJECT_ID;
 
diff --git a/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/HashicorpVaultPropertiesSourceNoEnvTestIT.java b/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/HashicorpVaultPropertiesSourceNoEnvTestIT.java
@@ -39,6 +39,7 @@
 public class HashicorpVaultPropertiesSourceNoEnvTestIT extends CamelTestSupport {
 
     @RegisterExtension
+    // Not singleton-safe: tests mutate shared Vault state (secret versions accumulate)
     public static HashicorpVaultService service = HashicorpServiceFactory.createService();
 
     @BeforeAll
diff --git a/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/operations/HashicorpVaultBase.java b/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/operations/HashicorpVaultBase.java
@@ -24,6 +24,7 @@
 
 public class HashicorpVaultBase extends CamelTestSupport {
     @RegisterExtension
+    // Not singleton-safe: tests mutate shared Vault state (secret versions accumulate)
     public static HashicorpVaultService service = HashicorpServiceFactory.createService();
 
     @Override
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastConfigurationTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastConfigurationTest.java
@@ -45,7 +45,7 @@
 class HazelcastConfigurationTest {
 
     @RegisterExtension
-    public static HazelcastService hazelcastService = HazelcastServiceFactory.createService();
+    public static HazelcastService hazelcastService = HazelcastServiceFactory.createSingletonService();
 
     @RegisterExtension
     public static TestEntityNameGenerator nameGenerator = new TestEntityNameGenerator();
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java
@@ -43,7 +43,7 @@
 public class HazelcastListProducerTest extends CamelTestSupport {
 
     @RegisterExtension
-    public static HazelcastService hazelcastService = HazelcastServiceFactory.createService();
+    public static HazelcastService hazelcastService = HazelcastServiceFactory.createSingletonService();
 
     @RegisterExtension
     public static TestEntityNameGenerator nameGenerator = new TestEntityNameGenerator();
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaTransferExchangeTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaTransferExchangeTest.java
@@ -38,7 +38,7 @@
 public class HazelcastSedaTransferExchangeTest extends CamelTestSupport {
 
     @RegisterExtension
-    public static HazelcastService hazelcastService = HazelcastServiceFactory.createService();
+    public static HazelcastService hazelcastService = HazelcastServiceFactory.createSingletonService();
 
     @RegisterExtension
     public static TestEntityNameGenerator nameGenerator = new TestEntityNameGenerator();
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java
@@ -45,7 +45,7 @@
 public class HazelcastSetProducerTest extends CamelTestSupport {
 
     @RegisterExtension
-    public static HazelcastService hazelcastService = HazelcastServiceFactory.createService();
+    public static HazelcastService hazelcastService = HazelcastServiceFactory.createSingletonService();
 
     @RegisterExtension
     public static TestEntityNameGenerator nameGenerator = new TestEntityNameGenerator();
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/policy/HazelcastRoutePolicyIT.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/policy/HazelcastRoutePolicyIT.java
@@ -47,7 +47,7 @@ public class HazelcastRoutePolicyIT {
     private static final Logger LOGGER = LoggerFactory.getLogger(HazelcastRoutePolicyIT.class);
 
     @RegisterExtension
-    public static HazelcastService hazelcastService = HazelcastServiceFactory.createService();
+    public static HazelcastService hazelcastService = HazelcastServiceFactory.createSingletonService();
 
     private static final List<String> CLIENTS = IntStream.range(0, 3).mapToObj(Integer::toString).toList();
     private static final List<String> RESULTS = new ArrayList<>();
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryCamelTestSupport.java b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryCamelTestSupport.java
@@ -31,7 +31,7 @@
 public class HazelcastAggregationRepositoryCamelTestSupport extends CamelTestSupport {
 
     @RegisterExtension
-    public static HazelcastService hazelcastService = HazelcastServiceFactory.createService();
+    public static HazelcastService hazelcastService = HazelcastServiceFactory.createSingletonService();
 
     @RegisterExtension
     public static TestEntityNameGenerator nameGenerator = new TestEntityNameGenerator();
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepositoryTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepositoryTest.java
@@ -41,7 +41,7 @@
 public class HazelcastIdempotentRepositoryTest extends CamelTestSupport {
 
     @RegisterExtension
-    public static HazelcastService hazelcastService = HazelcastServiceFactory.createService();
+    public static HazelcastService hazelcastService = HazelcastServiceFactory.createSingletonService();
 
     @RegisterExtension
     public static TestEntityNameGenerator nameGenerator = new TestEntityNameGenerator();
diff --git a/components/camel-iggy/src/test/java/org/apache/camel/component/iggy/IggyTestBase.java b/components/camel-iggy/src/test/java/org/apache/camel/component/iggy/IggyTestBase.java
@@ -45,7 +45,7 @@ public abstract class IggyTestBase {
 
     @Order(1)
     @RegisterExtension
-    protected static IggyService iggyService = IggyServiceFactory.createService();
+    protected static IggyService iggyService = IggyServiceFactory.createSingletonService();
 
     @Order(2)
     @RegisterExtension
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentIbmMQTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentIbmMQTest.java
@@ -35,7 +35,7 @@
 public class JmsComponentIbmMQTest extends CamelTestSupport {
 
     @RegisterExtension
-    public static IbmMQService service = IbmMQServiceFactory.createService();
+    public static IbmMQService service = IbmMQServiceFactory.createSingletonService();
 
     @Test
     public void testSend() throws Exception {
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToIbmMQTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToIbmMQTest.java
@@ -35,7 +35,7 @@
 public class JmsReplyToIbmMQTest extends CamelTestSupport {
 
     @RegisterExtension
-    public static IbmMQService service = IbmMQServiceFactory.createService();
+    public static IbmMQService service = IbmMQServiceFactory.createSingletonService();
 
     @Test
     public void testCustomJMSReplyToInOut() {
diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakConsumerIT.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakConsumerIT.java
@@ -50,7 +50,7 @@ public class KeycloakConsumerIT extends CamelTestSupport {
     private static final Logger log = LoggerFactory.getLogger(KeycloakConsumerIT.class);
 
     @RegisterExtension
-    static KeycloakService keycloakService = KeycloakServiceFactory.createService();
+    static KeycloakService keycloakService = KeycloakServiceFactory.createSingletonService();
 
     // Test data - use unique names to avoid conflicts
     private static final String TEST_REALM_NAME = "consumer-test-realm-" + UUID.randomUUID().toString().substring(0, 8);
diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakTestInfraIT.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakTestInfraIT.java
@@ -59,7 +59,7 @@ public class KeycloakTestInfraIT extends CamelTestSupport {
     private static final Logger log = LoggerFactory.getLogger(KeycloakTestInfraIT.class);
 
     @RegisterExtension
-    static KeycloakService keycloakService = KeycloakServiceFactory.createService();
+    static KeycloakService keycloakService = KeycloakServiceFactory.createSingletonService();
 
     // Test data - use unique names to avoid conflicts
     private static final String TEST_REALM_NAME = "testinfra-realm-" + UUID.randomUUID().toString().substring(0, 8);
diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityTestInfraIT.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityTestInfraIT.java
@@ -77,7 +77,7 @@ public class KeycloakSecurityTestInfraIT extends CamelTestSupport {
     private static final Logger log = LoggerFactory.getLogger(KeycloakSecurityTestInfraIT.class);
 
     @RegisterExtension
-    static KeycloakService keycloakService = KeycloakServiceFactory.createService();
+    static KeycloakService keycloakService = KeycloakServiceFactory.createSingletonService();
 
     // Test data - use unique names to avoid conflicts
     private static final String TEST_REALM_NAME = "security-test-realm-" + UUID.randomUUID().toString().substring(0, 8);
diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakTokenBindingSecurityIT.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakTokenBindingSecurityIT.java
@@ -69,7 +69,7 @@ public class KeycloakTokenBindingSecurityIT extends CamelTestSupport {
     private static final Logger log = LoggerFactory.getLogger(KeycloakTokenBindingSecurityIT.class);
 
     @RegisterExtension
-    static KeycloakService keycloakService = KeycloakServiceFactory.createService();
+    static KeycloakService keycloakService = KeycloakServiceFactory.createSingletonService();
 
     // Test data - use unique names
     private static final String TEST_REALM_NAME = "token-binding-realm-" + UUID.randomUUID().toString().substring(0, 8);
diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakTokenIntrospectionIT.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakTokenIntrospectionIT.java
@@ -73,7 +73,7 @@ public class KeycloakTokenIntrospectionIT extends CamelTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(KeycloakTokenIntrospectionIT.class);
 
     @RegisterExtension
-    static KeycloakService keycloakService = KeycloakServiceFactory.createService();
+    static KeycloakService keycloakService = KeycloakServiceFactory.createSingletonService();
 
     // Test data - use unique names to avoid conflicts
     private static final String TEST_REALM_NAME = "introspection-realm-" + UUID.randomUUID().toString().substring(0, 8);
diff --git a/components/camel-ldif/src/test/java/org/apache/camel/component/ldif/LdifTestSupport.java b/components/camel-ldif/src/test/java/org/apache/camel/component/ldif/LdifTestSupport.java
@@ -23,7 +23,7 @@
 
 public class LdifTestSupport extends CamelTestSupport {
     @RegisterExtension
-    public static OpenldapService service = OpenldapServiceFactory.createService();
+    public static OpenldapService service = OpenldapServiceFactory.createSingletonService();
 
     protected int port;
 
diff --git a/components/camel-lra/src/test/java/org/apache/camel/service/lra/AbstractLRATestSupport.java b/components/camel-lra/src/test/java/org/apache/camel/service/lra/AbstractLRATestSupport.java
@@ -45,6 +45,7 @@
 public abstract class AbstractLRATestSupport extends CamelTestSupport {
 
     @RegisterExtension
+    // Not singleton-safe: shared LRA coordinator causes transaction state interference across tests
     static MicroprofileLRAService service = MicroprofileLRAServiceFactory.createService();
 
     @RegisterExtension
diff --git a/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioIntegrationTestSupport.java b/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioIntegrationTestSupport.java
@@ -23,6 +23,6 @@
 
 class MinioIntegrationTestSupport extends CamelTestSupport {
     @RegisterExtension
-    static MinioService service = MinioServiceFactory.createService();
+    static MinioService service = MinioServiceFactory.createSingletonService();
 
 }
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsITSupport.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsITSupport.java
@@ -31,6 +31,7 @@
 
 public class NatsITSupport extends CamelTestSupport {
     @RegisterExtension
+    // Not singleton-safe: NatsAuth*ITSupport creates auth-variant containers with same "camel-nats" alias
     static NatsService service = NatsServiceFactory.createService();
 
     static {
diff --git a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5ITSupport.java b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5ITSupport.java
@@ -23,6 +23,7 @@
 
 public abstract class PahoMqtt5ITSupport extends CamelTestSupport {
     @RegisterExtension
+    // Not singleton-safe: PahoMqtt5ReconnectAfterFailureIT creates own container for stop/start testing
     public static MosquittoService service = MosquittoServiceFactory.createService();
 
     protected int mqttPort;
diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/HashicorpVaultKeyLifecycleIT.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/HashicorpVaultKeyLifecycleIT.java
@@ -48,6 +48,7 @@
 public class HashicorpVaultKeyLifecycleIT extends CamelTestSupport {
 
     @RegisterExtension
+    // Not singleton-safe: tests mutate shared Vault state (secret versions accumulate)
     public static HashicorpVaultService service = HashicorpServiceFactory.createService();
 
     private HashicorpVaultKeyLifecycleManager keyManager;
diff --git a/components/camel-redis/src/test/java/org/apache/camel/component/redis/processor/aggregate/integration/AggregateRedisIT.java b/components/camel-redis/src/test/java/org/apache/camel/component/redis/processor/aggregate/integration/AggregateRedisIT.java
@@ -35,7 +35,7 @@
 public class AggregateRedisIT extends CamelTestSupport {
 
     @RegisterExtension
-    static RedisService service = RedisServiceFactory.createService();
+    static RedisService service = RedisServiceFactory.createSingletonService();
 
     @Test
     public void testABC() throws Exception {
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/integration/SolrTestSupport.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/integration/SolrTestSupport.java
@@ -56,7 +56,7 @@ public abstract class SolrTestSupport implements CamelTestSupportHelper, Configu
 
     @Order(1)
     @RegisterExtension
-    public static final SolrService service = SolrServiceFactory.createService();
+    public static final SolrService service = SolrServiceFactory.createSingletonService();
 
     @Order(2)
     @RegisterExtension
diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatMcpSseIT.java b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatMcpSseIT.java
@@ -34,7 +34,7 @@
 public class SpringAiChatMcpSseIT extends OllamaTestSupport {
 
     @RegisterExtension
-    static McpEverythingSseService MCP_EVERYTHING = McpEverythingSseServiceFactory.createService();
+    static McpEverythingSseService MCP_EVERYTHING = McpEverythingSseServiceFactory.createSingletonService();
 
     @Test
     public void testMcpEchoTool() {
diff --git a/components/camel-spring-parent/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQITSupport.java b/components/camel-spring-parent/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQITSupport.java
@@ -30,6 +30,7 @@
 public abstract class RabbitMQITSupport extends CamelTestSupport {
 
     @RegisterExtension
+    // Not singleton-safe: tests use conflicting exchange/queue declarations with hardcoded names
     public static RabbitMQService service = RabbitMQServiceFactory.createService();
 
     protected Logger log = LoggerFactory.getLogger(getClass());
diff --git a/components/camel-spring-parent/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/test/infra/services/RabbitMQServiceFactory.java b/components/camel-spring-parent/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/test/infra/services/RabbitMQServiceFactory.java
@@ -26,4 +26,8 @@ private RabbitMQServiceFactory() {
     public static RabbitMQService createService() {
         return org.apache.camel.test.infra.rabbitmq.services.RabbitMQServiceFactory.createService();
     }
+
+    public static RabbitMQService createSingletonService() {
+        return org.apache.camel.test.infra.rabbitmq.services.RabbitMQServiceFactory.createSingletonService();
+    }
 }
diff --git a/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/integration/RedisConsumerManualIT.java b/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/integration/RedisConsumerManualIT.java
@@ -33,7 +33,7 @@
 public class RedisConsumerManualIT extends RedisTestSupport {
 
     @RegisterExtension
-    static RedisService service = RedisServiceFactory.createService();
+    static RedisService service = RedisServiceFactory.createSingletonService();
 
     private static final RedisMessageListenerContainer LISTENER_CONTAINER = new RedisMessageListenerContainer();
     private static JedisConnectionFactory jedisConnectionFactory;
diff --git a/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/integration/RedisProducerManualIT.java b/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/integration/RedisProducerManualIT.java
@@ -32,7 +32,7 @@
 public class RedisProducerManualIT extends RedisTestSupport {
 
     @RegisterExtension
-    static RedisService service = RedisServiceFactory.createService();
+    static RedisService service = RedisServiceFactory.createSingletonService();
     private static JedisConnectionFactory connectionFactory;
 
     @BeforeAll
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppBaseIT.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppBaseIT.java
@@ -35,7 +35,7 @@
 @DisabledOnOs(value = OS.AIX, disabledReason = "has problem with all the new reconnection stuff and whatnot")
 public class XmppBaseIT extends CamelTestSupport {
     @RegisterExtension
-    static XmppService service = XmppServiceFactory.createService();
+    static XmppService service = XmppServiceFactory.createSingletonService();
 
     static {
         try (InputStream is = XmppBaseIT.class.getClassLoader().getResourceAsStream("logging.properties")) {

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public class Base extends CamelTestSupport {`
`45`	`45`	`static {`
`46`	`46`	`initCredentials();`
`47`	`47`
`48`		`- service = AzureStorageBlobServiceFactory.createService();`
	`48`	`+ service = AzureStorageBlobServiceFactory.createSingletonService();`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/*`