This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 324928a3b403 CAMEL-25891: camel-spring-xml - make tests safe to run in
parallel in the same JVM (#29515)
324928a3b403 is described below
commit 324928a3b403eb8c5cc84255aceaac0d50545ae1
Author: Aurélien Pupier <[email protected]>
AuthorDate: Tue Nov 10 07:46:17 2026 +0100
CAMEL-25891: camel-spring-xml - make tests safe to run in parallel in the
same JVM (#29515)
Co-authored-by: IBM Bob 2.2.1
---
.../test/java/org/apache/camel/spring/DefaultJMXAgentTest.java | 2 ++
.../test/java/org/apache/camel/spring/DisableJmxAgentTest.java | 2 ++
.../test/java/org/apache/camel/spring/JMXAgentPropertiesTest.java | 2 ++
.../camel/spring/file/SpringSimpleFileNameWithQuoteTest.java | 5 ++++-
.../test/java/org/apache/camel/spring/issues/Camel14624Test.java | 2 ++
.../management/DualCamelContextManagedAutoAssignedNameTest.java | 2 ++
.../camel/spring/management/DualCamelContextManagedTest.java | 2 ++
.../spring/management/ManagedEndpointInjectRefEndpointTest.java | 2 ++
.../apache/camel/spring/management/ManagedRefEndpointTest.java | 2 ++
.../management/SpringCamelContextStartingFailedEventTest.java | 2 ++
.../spring/management/SpringDualLoggingEventNotifierTest.java | 2 ++
.../spring/management/SpringDumpRouteCoverageAdviceWithTest.java | 2 ++
.../camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java | 2 ++
.../management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java | 2 ++
.../camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java | 2 ++
.../spring/management/SpringJmxEndpointInjectBeanRefTest.java | 2 ++
.../spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java | 2 ++
.../camel/spring/management/SpringJmxEndpointInjectBeanTest.java | 2 ++
.../management/SpringJmxRecipientListRegisterAlwaysTest.java | 2 ++
.../camel/spring/management/SpringJmxRecipientListTest.java | 2 ++
.../camel/spring/management/SpringLoggingEventNotifierTest.java | 2 ++
.../camel/spring/management/SpringManagedCamelContextTest.java | 2 ++
.../camel/spring/management/SpringManagedCustomProcessorTest.java | 2 ++
.../spring/management/SpringManagedNamePatternFixedTest.java | 2 ++
.../camel/spring/management/SpringManagedNamePatternTest.java | 2 ++
.../apache/camel/spring/management/SpringManagedResourceTest.java | 2 ++
.../SpringManagedRouteRemoveContextScopedErrorHandlerTest.java | 2 ++
...ngManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java | 2 ++
.../SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java | 2 ++
.../apache/camel/spring/management/SpringManagedSanitizeTest.java | 2 ++
.../camel/spring/management/SpringManagedSedaEndpointTest.java | 2 ++
.../spring/management/SpringManagedStatisticsLevelOffTest.java | 2 ++
.../management/SpringManagedStatisticsLevelRoutesOnlyTest.java | 2 ++
.../spring/management/SpringManagedTransactedProcessorTest.java | 2 ++
.../camel/spring/management/SpringPublishEventNotifierTest.java | 2 ++
.../spring/management/XmlIoDumpRouteCoverageAdviceWithTest.java | 2 ++
.../SimpleLanguageWithSpringPropertyPlaceholderRouteTest.java | 5 ++++-
.../spring/processor/DualSpringManagedThreadsThreadPoolTest.java | 2 ++
.../spring/processor/SpringManagedThreadsThreadPoolTest.java | 2 ++
.../java/org/apache/camel/spring/processor/SpringTestHelper.java | 6 ++++--
.../spring/file/SpringSimpleFileNameWithQuoteTest-context.xml | 2 +-
.../camel/spring/interceptor/MixedTransactionPropagationTest.xml | 2 +-
.../camel/spring/interceptor/mixedPropagationTransactedTest.xml | 2 +-
.../springTransactionalClientDataSourceMinimalConfiguration.xml | 2 +-
.../camel/spring/interceptor/transactionalClientDataSource.xml | 2 +-
.../interceptor/transactionalClientWithAnnotatedBeanTest.xml | 2 +-
.../camel/spring/issues/SpringPropertyPlaceholderIssueTest.xml | 2 +-
...ransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml | 2 +-
.../org/apache/camel/spring/placeholder/bundle-context.properties | 4 ++--
.../processor/idempotent/FileConsumerIdempotentLoadStoreTest.xml | 2 +-
.../spring/processor/idempotent/fileConsumerIdempotentTest.xml | 2 +-
.../camel/spring/xml/handler/ErrorHandlerDefinitionParser.xml | 2 +-
.../src/test/java/org/apache/camel/TestSupportJmxCleanup.java | 8 +++++++-
53 files changed, 106 insertions(+), 18 deletions(-)
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
index 35085289357f..ac3cfb417588 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
@@ -20,6 +20,7 @@ import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -28,6 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test that verifies JMX is enabled by default.
*/
+@Isolated
public class DefaultJMXAgentTest extends SpringTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java
index 5d4fa31a14cc..4c3f2b0acb05 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java
@@ -21,6 +21,7 @@ import java.lang.management.ManagementFactory;
import javax.management.ObjectName;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -32,6 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
*
*
*/
+@Isolated
public class DisableJmxAgentTest extends DefaultJMXAgentTest {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/JMXAgentPropertiesTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/JMXAgentPropertiesTest.java
index 8df58e4a9a17..8511eb23a142 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/JMXAgentPropertiesTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/JMXAgentPropertiesTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.spring;
import org.apache.camel.CamelContext;
import org.apache.camel.spi.ManagementAgent;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -28,6 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test that verifies JMX properties can be configured via Spring.
*/
+@Isolated
public class JMXAgentPropertiesTest extends DefaultJMXAgentTest {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest.java
index 6da35580391d..aba5b9588f7a 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest.java
@@ -61,7 +61,10 @@ public class SpringSimpleFileNameWithQuoteTest extends
SpringRunWithTestSupport
ApplicationContextInitializer<ConfigurableApplicationContext> {
@Override
public void initialize(ConfigurableApplicationContext context) {
-
context.getEnvironment().getSystemProperties().put("testDirectory",
tempDir.toString());
+ // this is a JVM wide system property, not scoped to the context:
the key is prefixed with the test name
+ // so that it cannot clash with other tests running in parallel
+
context.getEnvironment().getSystemProperties().put("SpringSimpleFileNameWithQuoteTest.testDirectory",
+ tempDir.toString());
}
}
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/Camel14624Test.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/Camel14624Test.java
index e04be02fdc82..160615c59c73 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/Camel14624Test.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/Camel14624Test.java
@@ -23,11 +23,13 @@ import org.apache.camel.spi.TransactedPolicy;
import org.apache.camel.spring.spi.SpringTransactionPolicy;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionException;
import org.springframework.transaction.TransactionStatus;
+@Isolated
public class Camel14624Test extends CamelTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java
index a9b06f2da01f..0a126d2c398b 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java
@@ -26,6 +26,7 @@ import javax.management.ObjectName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -34,6 +35,7 @@ import static
org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledOnOs(OS.AIX)
+@Isolated
public class DualCamelContextManagedAutoAssignedNameTest extends
DualCamelContextManagedTest {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
index 2e3e6026b8c3..3f70fd780975 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -33,6 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledOnOs(OS.AIX)
+@Isolated
public class DualCamelContextManagedTest extends SpringTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
index 20b8e624fbca..900450edc019 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -33,6 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledOnOs(OS.AIX)
+@Isolated
public class ManagedEndpointInjectRefEndpointTest extends SpringTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
index 95ce526001d2..ba8f6fd45736 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -33,6 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledOnOs(OS.AIX)
+@Isolated
public class ManagedRefEndpointTest extends SpringTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
index 67bd8c6c7a67..f5fd8bb75119 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
@@ -22,6 +22,7 @@ import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -29,6 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringCamelContextStartingFailedEventTest extends
SpringTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.java
index 66b18b54c406..168177a12174 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.java
@@ -20,10 +20,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.management.LoggingEventNotifierTest;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringDualLoggingEventNotifierTest extends
LoggingEventNotifierTest {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringDumpRouteCoverageAdviceWithTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringDumpRouteCoverageAdviceWithTest.java
index 887f45e527ee..cbd1993b25d9 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringDumpRouteCoverageAdviceWithTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringDumpRouteCoverageAdviceWithTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -33,6 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringDumpRouteCoverageAdviceWithTest extends SpringTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
index 34849caf703c..7b70d750d4a6 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
@@ -23,6 +23,7 @@ import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -30,6 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringJmxDumpCBRRoutesAsXmlTest extends SpringTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java
index 5a3ce7c44498..f17f28e2bced 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java
@@ -23,6 +23,7 @@ import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -30,6 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringJmxDumpRoutesAsXmlIncludeHostNameTest extends
SpringTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java
index c536b4ceabcf..9d7359402092 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java
@@ -23,6 +23,7 @@ import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -30,6 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringJmxDumpRoutesAsXmlTest extends SpringTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java
index da6604212fff..9e8dc4a3835b 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java
@@ -23,6 +23,7 @@ import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -32,6 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringJmxEndpointInjectBeanRefTest extends SpringTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java
index 7570fc1f67ad..69aa2390bd08 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java
@@ -23,6 +23,7 @@ import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -32,6 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringJmxEndpointInjectBeanRefTwoTest extends SpringTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java
index 0c56b87c62b6..3d1a9de1af4f 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java
@@ -23,6 +23,7 @@ import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -31,6 +32,7 @@ import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TY
import static org.junit.jupiter.api.Assertions.*;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringJmxEndpointInjectBeanTest extends SpringTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java
index 5f7b10138086..603f0d4d283d 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java
@@ -24,6 +24,7 @@ import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -32,6 +33,7 @@ import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TY
import static org.junit.jupiter.api.Assertions.*;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringJmxRecipientListRegisterAlwaysTest extends
SpringTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java
index 9e3b1e9daec4..2fe531d8e295 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java
@@ -24,6 +24,7 @@ import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -32,6 +33,7 @@ import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TY
import static org.junit.jupiter.api.Assertions.*;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringJmxRecipientListTest extends SpringTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.java
index d6f04c5ef39c..f4fceaf3fa1b 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.java
@@ -20,10 +20,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.management.LoggingEventNotifierTest;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringLoggingEventNotifierTest extends LoggingEventNotifierTest {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
index 03aecf01caa5..03358c78ce43 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
@@ -28,6 +28,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.management.ManagedCamelContextTest;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -35,6 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@Disabled("Does not run well on CI due test uses JMX mbeans")
+@Isolated
public class SpringManagedCamelContextTest extends ManagedCamelContextTest {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
index 415a38fa67dc..327cb7ee8fb1 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.jmx.export.annotation.ManagedAttribute;
@@ -35,6 +36,7 @@ import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TY
import static org.junit.jupiter.api.Assertions.assertEquals;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringManagedCustomProcessorTest extends SpringTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.java
index fe66ebcb90e6..fa33e61be60d 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.java
@@ -20,10 +20,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.management.ManagedNamePatternFixedTest;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringManagedNamePatternFixedTest extends
ManagedNamePatternFixedTest {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternTest.java
index 4eebc3e6a8e6..1ada56e251b3 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternTest.java
@@ -20,10 +20,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.management.ManagedNamePatternTest;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringManagedNamePatternTest extends ManagedNamePatternTest {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedResourceTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedResourceTest.java
index a9562d9105a0..ae8822836844 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedResourceTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedResourceTest.java
@@ -20,10 +20,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.management.ManagedResourceTest;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringManagedResourceTest extends ManagedResourceTest {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.java
index 4f498780fb91..91f8380616fb 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.java
@@ -20,10 +20,12 @@ import org.apache.camel.CamelContext;
import
org.apache.camel.management.ManagedRouteRemoveContextScopedErrorHandlerTest;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringManagedRouteRemoveContextScopedErrorHandlerTest extends
ManagedRouteRemoveContextScopedErrorHandlerTest {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java
index 6018c7d23e0f..1bdce29cbac5 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java
@@ -20,10 +20,12 @@ import org.apache.camel.CamelContext;
import
org.apache.camel.management.ManagedRouteRemoveRouteAndContextScopedErrorHandlerTest;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest
extends ManagedRouteRemoveRouteAndContextScopedErrorHandlerTest {
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java
index c3a5ddd7ab94..69fe14369f52 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java
@@ -20,10 +20,12 @@ import org.apache.camel.CamelContext;
import
org.apache.camel.management.ManagedRouteRemoveRouteScopedErrorHandlerTest;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringManagedRouteRemoveRouteScopedErrorHandlerTest extends
ManagedRouteRemoveRouteScopedErrorHandlerTest {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSanitizeTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSanitizeTest.java
index 1fb8d0f81fbb..6e58f6489c54 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSanitizeTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSanitizeTest.java
@@ -20,10 +20,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.management.ManagedSanitizeTest;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringManagedSanitizeTest extends ManagedSanitizeTest {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java
index ec647abe60da..772a812bb39e 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java
@@ -23,6 +23,7 @@ import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -36,6 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*
*/
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringManagedSedaEndpointTest extends SpringTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java
index a67ba187be3e..891cea820cf3 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java
@@ -20,10 +20,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.management.ManagedStatisticsLevelOffTest;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringManagedStatisticsLevelOffTest extends
ManagedStatisticsLevelOffTest {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java
index 7a50d33392d2..ab455d721a6d 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java
@@ -20,10 +20,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.management.ManagedStatisticsLevelRoutesOnlyTest;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringManagedStatisticsLevelRoutesOnlyTest extends
ManagedStatisticsLevelRoutesOnlyTest {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.java
index 8b3481bb9d7e..c0004fd088b1 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -34,6 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*
*/
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringManagedTransactedProcessorTest extends SpringTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringPublishEventNotifierTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringPublishEventNotifierTest.java
index c3ca83912705..dff275967e0d 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringPublishEventNotifierTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringPublishEventNotifierTest.java
@@ -20,10 +20,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.management.PublishEventNotifierTest;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
@DisabledOnOs(OS.AIX)
+@Isolated
public class SpringPublishEventNotifierTest extends PublishEventNotifierTest {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/XmlIoDumpRouteCoverageAdviceWithTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/XmlIoDumpRouteCoverageAdviceWithTest.java
index 839976cc3ec4..897f442ab7b5 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/XmlIoDumpRouteCoverageAdviceWithTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/management/XmlIoDumpRouteCoverageAdviceWithTest.java
@@ -32,6 +32,7 @@ import org.apache.camel.xml.LwModelHelper;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.parallel.Isolated;
import static
org.apache.camel.management.DefaultManagementAgent.DEFAULT_DOMAIN;
import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.KEY_CONTEXT;
@@ -42,6 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledOnOs(OS.AIX)
+@Isolated
public class XmlIoDumpRouteCoverageAdviceWithTest extends ContextTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest.java
index 62b814e2160d..f0f404bcedfd 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest.java
@@ -78,7 +78,10 @@ public class
SimpleLanguageWithSpringPropertyPlaceholderRouteTest extends Spring
ApplicationContextInitializer<ConfigurableApplicationContext> {
@Override
public void initialize(ConfigurableApplicationContext context) {
-
context.getEnvironment().getSystemProperties().put("testDirectory",
tempDir.toString());
+ // this is a JVM wide system property, not scoped to the context:
the key is prefixed with the test name
+ // so that it cannot clash with other tests running in parallel
+ context.getEnvironment().getSystemProperties()
+
.put("SimpleLanguageWithSpringPropertyPlaceholderRouteTest.testDirectory",
tempDir.toString());
}
}
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java
index fd575e086cb2..633c67232506 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java
@@ -21,6 +21,7 @@ import javax.management.ObjectName;
import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -28,6 +29,7 @@ import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TY
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
+@Isolated
public class DualSpringManagedThreadsThreadPoolTest extends SpringTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java
index a656bc35caef..260e37eaf989 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java
@@ -22,6 +22,7 @@ import javax.management.ObjectName;
import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -29,6 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
@Disabled
+@Isolated
public class SpringManagedThreadsThreadPoolTest extends SpringTestSupport {
@Override
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTestHelper.java
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTestHelper.java
index 5ffeaf160235..f54817431067 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTestHelper.java
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTestHelper.java
@@ -26,6 +26,7 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spring.SpringCamelContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.core.env.MapPropertySource;
public final class SpringTestHelper {
@@ -47,8 +48,9 @@ public final class SpringTestHelper {
try {
DefaultCamelContext.setNoStart(true);
applicationContext = new ClassPathXmlApplicationContext(new
String[] { classpathUri }, false);
- applicationContext.getEnvironment().getSystemProperties().put(
- PROPERTY_TEST_DIR, test.testDirectory().toString());
+ // use a per context property source (not the JVM wide system
properties) so tests can run in parallel
+ applicationContext.getEnvironment().getPropertySources().addFirst(
+ new MapPropertySource("testDirectory",
Map.of(PROPERTY_TEST_DIR, test.testDirectory().toString())));
applicationContext.refresh();
} finally {
DefaultCamelContext.setNoStart(isNoStart);
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest-context.xml
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest-context.xml
index db723ee7b916..65891fc6a87d 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest-context.xml
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest-context.xml
@@ -27,7 +27,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<jmxAgent id="jmx" disabled="true"/>
<route>
- <from uri="file:{{testDirectory}}?initialDelay=0&delay=10"/>
+ <from
uri="file:{{SpringSimpleFileNameWithQuoteTest.testDirectory}}?initialDelay=0&delay=10"/>
<setHeader name="foo">
<simple>"${file:name}" abc</simple>
</setHeader>
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml
index 1fab1774221a..f5b5206c960b 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml
@@ -25,7 +25,7 @@
http://www.springframework.org/schema/jdbc
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
- <jdbc:embedded-database id="dataSource" type="H2">
+ <jdbc:embedded-database id="dataSource" type="H2" generate-name="true">
<jdbc:script location="classpath:sql/init.sql"/>
</jdbc:embedded-database>
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/mixedPropagationTransactedTest.xml
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/mixedPropagationTransactedTest.xml
index 4df2364c782e..15ec126a0880 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/mixedPropagationTransactedTest.xml
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/mixedPropagationTransactedTest.xml
@@ -25,7 +25,7 @@
http://www.springframework.org/schema/jdbc
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
- <jdbc:embedded-database id="dataSource" type="H2">
+ <jdbc:embedded-database id="dataSource" type="H2" generate-name="true">
<jdbc:script location="classpath:sql/init.sql"/>
</jdbc:embedded-database>
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml
index f6d235089a11..f505dc65f60e 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml
@@ -27,7 +27,7 @@
<!-- START SNIPPET: e1 -->
<!-- this example uses JDBC so we define a data source -->
- <jdbc:embedded-database id="dataSource" type="H2">
+ <jdbc:embedded-database id="dataSource" type="H2" generate-name="true">
<jdbc:script location="classpath:sql/init.sql"/>
</jdbc:embedded-database>
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml
index 06d4b194e880..9fa5a9ff312a 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml
@@ -27,7 +27,7 @@
<!-- START SNIPPET: e1 -->
<!-- datasource to the database -->
- <jdbc:embedded-database id="dataSource" type="H2">
+ <jdbc:embedded-database id="dataSource" type="H2" generate-name="true">
<jdbc:script location="classpath:sql/init.sql"/>
</jdbc:embedded-database>
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientWithAnnotatedBeanTest.xml
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientWithAnnotatedBeanTest.xml
index adab12719825..30cdfa378e0e 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientWithAnnotatedBeanTest.xml
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientWithAnnotatedBeanTest.xml
@@ -33,7 +33,7 @@
<tx:annotation-driven transaction-manager="txManager"/>
<!-- datasource to the database -->
- <jdbc:embedded-database id="dataSource" type="H2">
+ <jdbc:embedded-database id="dataSource" type="H2" generate-name="true">
<jdbc:script location="classpath:sql/init.sql"/>
</jdbc:embedded-database>
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringPropertyPlaceholderIssueTest.xml
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringPropertyPlaceholderIssueTest.xml
index 13a0c3084e3d..7648586f1883 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringPropertyPlaceholderIssueTest.xml
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringPropertyPlaceholderIssueTest.xml
@@ -35,7 +35,7 @@
<!-- use $simple{ start token in the fileName parameter
to avoid clash with spring property placeholder. However we can
still use
spring property placeholders for the output folder -->
- <endpoint id="myFile"
uri="file:{{testDirectory}}/${outputFolder}?fileName=$simple{header.foo}"/>
+ <endpoint id="myFile"
uri="file:{{testDirectory:target/data/SpringPropertyPlaceholderIssueTest}}/${outputFolder}?fileName=$simple{header.foo}"/>
<route>
<from uri="direct:start"/>
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml
index bd9603586c3e..0b50c5b9fe3f 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml
@@ -27,7 +27,7 @@
">
<!-- the data source -->
- <jdbc:embedded-database id="dataSource" type="H2">
+ <jdbc:embedded-database id="dataSource" type="H2" generate-name="true">
<jdbc:script location="classpath:sql/init.sql"/>
</jdbc:embedded-database>
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/placeholder/bundle-context.properties
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/placeholder/bundle-context.properties
index 64a91f5b494d..8defd071c2c8 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/placeholder/bundle-context.properties
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/placeholder/bundle-context.properties
@@ -16,7 +16,7 @@
## ---------------------------------------------------------------------------
fromEndpoint=direct:start
-toEndpoint=file:{{testDirectory}}/outBox?fileName=test-${date:now:yyyyMMdd}.txt
+toEndpoint=file:{{SimpleLanguageWithSpringPropertyPlaceholderRouteTest.testDirectory}}/outBox?fileName=test-${date:now:yyyyMMdd}.txt
fromEndpointSimple=direct:startSimple
-toEndpointSimple=file:{{testDirectory}}/outBoxSimple?fileName=test-$simple{date:now:yyyyMMdd}.txt
+toEndpointSimple=file:{{SimpleLanguageWithSpringPropertyPlaceholderRouteTest.testDirectory}}/outBoxSimple?fileName=test-$simple{date:now:yyyyMMdd}.txt
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.xml
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.xml
index b857746d515b..7ae322933543 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.xml
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.xml
@@ -28,7 +28,7 @@
<!-- this is our file based idempotent store configured to use the
.filestore.dat as file -->
<bean id="fileStore"
class="org.apache.camel.support.processor.idempotent.FileIdempotentRepository">
<!-- the filename for the store -->
- <property name="fileStore"
value="#{systemProperties['testDirectory']}/.filestore.dat"/>
+ <property name="fileStore"
value="#{environment.getProperty('testDirectory')}/.filestore.dat"/>
<!-- the max filesize in bytes for the file. Camel will trunk and
flush the cache
if the file gets bigger -->
<property name="maxFileStoreSize" value="512000"/>
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/fileConsumerIdempotentTest.xml
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/fileConsumerIdempotentTest.xml
index b857746d515b..7ae322933543 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/fileConsumerIdempotentTest.xml
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/fileConsumerIdempotentTest.xml
@@ -28,7 +28,7 @@
<!-- this is our file based idempotent store configured to use the
.filestore.dat as file -->
<bean id="fileStore"
class="org.apache.camel.support.processor.idempotent.FileIdempotentRepository">
<!-- the filename for the store -->
- <property name="fileStore"
value="#{systemProperties['testDirectory']}/.filestore.dat"/>
+ <property name="fileStore"
value="#{environment.getProperty('testDirectory')}/.filestore.dat"/>
<!-- the max filesize in bytes for the file. Camel will trunk and
flush the cache
if the file gets bigger -->
<property name="maxFileStoreSize" value="512000"/>
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.xml
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.xml
index 9ee55d1b4f47..feb9e0ae457d 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.xml
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.xml
@@ -55,7 +55,7 @@
</camelContext>
<!-- END SNIPPET: example -->
- <jdbc:embedded-database id="dataSource" type="H2"/>
+ <jdbc:embedded-database id="dataSource" type="H2" generate-name="true"/>
<!-- spring transaction manager -->
<bean id="txManager"
class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
diff --git
a/core/camel-core/src/test/java/org/apache/camel/TestSupportJmxCleanup.java
b/core/camel-core/src/test/java/org/apache/camel/TestSupportJmxCleanup.java
index 1275bc6af85f..cf28c2cba7a6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/TestSupportJmxCleanup.java
+++ b/core/camel-core/src/test/java/org/apache/camel/TestSupportJmxCleanup.java
@@ -19,6 +19,7 @@ package org.apache.camel;
import java.lang.management.ManagementFactory;
import java.util.Set;
+import javax.management.InstanceNotFoundException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -39,7 +40,12 @@ public final class TestSupportJmxCleanup {
MBeanServer mbsc = ManagementFactory.getPlatformMBeanServer();
Set<ObjectName> s = mbsc.queryNames(new
ObjectName(getDomainName(domain) + ":*"), null);
for (ObjectName on : s) {
- mbsc.unregisterMBean(on);
+ try {
+ mbsc.unregisterMBean(on);
+ } catch (InstanceNotFoundException e) {
+ // already unregistered, for example by another test running
in parallel
+ LOG.debug("MBean {} was already unregistered", on, e);
+ }
}
}
