You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/08/26 12:37:21 UTC

[camel] branch main updated (f8caf50 -> e08d5c2)

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

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


    from f8caf50  Polish and cleanup documentation
     new e8ea1a2  CAMEL-16184: Deprecate the junit 4.x test modules
     new e08d5c2  CAMEL-16184: Deprecate the junit 4.x test modules

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../resources/org/apache/camel/catalog/others/test-spring.json       | 2 +-
 .../org/apache/camel/catalog/others/testcontainers-spring.json       | 2 +-
 .../resources/org/apache/camel/catalog/others/testcontainers.json    | 2 +-
 components/camel-test/camel-test-spring/pom.xml                      | 3 +--
 .../resources/META-INF/services/org/apache/camel/other.properties    | 2 +-
 .../camel-test-spring/src/generated/resources/test-spring.json       | 2 +-
 .../camel-test/camel-test-spring/src/main/docs/test-spring.adoc      | 5 +++--
 .../java/org/apache/camel/test/spring/CamelAnnotationsHandler.java   | 1 +
 .../java/org/apache/camel/test/spring/CamelSpringBootRunner.java     | 1 +
 .../main/java/org/apache/camel/test/spring/CamelSpringRunner.java    | 1 +
 .../org/apache/camel/test/spring/CamelSpringTestContextLoader.java   | 1 +
 .../spring/CamelSpringTestContextLoaderTestExecutionListener.java    | 1 +
 .../java/org/apache/camel/test/spring/CamelSpringTestHelper.java     | 1 +
 .../java/org/apache/camel/test/spring/CamelSpringTestSupport.java    | 1 +
 .../org/apache/camel/test/spring/CamelTestContextBootstrapper.java   | 1 +
 .../src/main/java/org/apache/camel/test/spring/DisableJmx.java       | 1 +
 .../main/java/org/apache/camel/test/spring/EnableRouteCoverage.java  | 1 +
 .../src/main/java/org/apache/camel/test/spring/ExcludeRoutes.java    | 1 +
 .../src/main/java/org/apache/camel/test/spring/MockEndpoints.java    | 1 +
 .../main/java/org/apache/camel/test/spring/MockEndpointsAndSkip.java | 1 +
 .../main/java/org/apache/camel/test/spring/ProvidesBreakpoint.java   | 1 +
 .../main/java/org/apache/camel/test/spring/RouteCoverageDumper.java  | 1 +
 .../org/apache/camel/test/spring/RouteCoverageEventNotifier.java     | 1 +
 .../src/main/java/org/apache/camel/test/spring/ShutdownTimeout.java  | 1 +
 .../org/apache/camel/test/spring/StopWatchTestExecutionListener.java | 1 +
 .../src/main/java/org/apache/camel/test/spring/UseAdviceWith.java    | 1 +
 .../test/spring/UseOverridePropertiesWithPropertiesComponent.java    | 1 +
 components/camel-test/camel-test/pom.xml                             | 3 +--
 .../resources/META-INF/services/org/apache/camel/other.properties    | 2 +-
 components/camel-test/camel-test/src/generated/resources/test.json   | 2 +-
 components/camel-test/camel-test/src/main/docs/test.adoc             | 5 +++--
 .../src/main/java/org/apache/camel/test/AvailablePortFinder.java     | 1 +
 .../org/apache/camel/test/AvailablePortFinderPropertiesFunction.java | 1 +
 .../org/apache/camel/test/ExcludingPackageScanClassResolver.java     | 1 +
 .../main/java/org/apache/camel/test/TestSupportNodeIdFactory.java    | 1 +
 .../main/java/org/apache/camel/test/junit4/CamelTearDownRule.java    | 1 +
 .../src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java | 1 +
 .../src/main/java/org/apache/camel/test/junit4/CamelTestWatcher.java | 1 +
 .../main/java/org/apache/camel/test/junit4/ExchangeTestSupport.java  | 1 +
 .../main/java/org/apache/camel/test/junit4/LanguageTestSupport.java  | 1 +
 .../src/main/java/org/apache/camel/test/junit4/TestSupport.java      | 1 +
 components/camel-test/camel-testcontainers-spring-junit5/pom.xml     | 1 -
 components/camel-test/camel-testcontainers-spring/pom.xml            | 3 +--
 .../resources/META-INF/services/org/apache/camel/other.properties    | 2 +-
 .../src/generated/resources/testcontainers-spring.json               | 2 +-
 .../src/main/docs/testcontainers-spring.adoc                         | 5 +++--
 components/camel-test/camel-testcontainers/pom.xml                   | 2 +-
 .../resources/META-INF/services/org/apache/camel/other.properties    | 2 +-
 .../camel-testcontainers/src/generated/resources/testcontainers.json | 2 +-
 .../camel-testcontainers/src/main/docs/testcontainers.adoc           | 5 +++--
 docs/components/modules/others/pages/test-spring.adoc                | 5 +++--
 docs/components/modules/others/pages/test.adoc                       | 5 +++--
 docs/components/modules/others/pages/testcontainers-spring.adoc      | 5 +++--
 docs/components/modules/others/pages/testcontainers.adoc             | 5 +++--
 54 files changed, 69 insertions(+), 35 deletions(-)

[camel] 02/02: CAMEL-16184: Deprecate the junit 4.x test modules

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit e08d5c26b196904d1d5b1f59318eb1b4ab689511
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Aug 26 14:36:34 2021 +0200

    CAMEL-16184: Deprecate the junit 4.x test modules
---
 .../main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java  | 1 +
 .../main/java/org/apache/camel/test/spring/CamelSpringBootRunner.java    | 1 +
 .../src/main/java/org/apache/camel/test/spring/CamelSpringRunner.java    | 1 +
 .../java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java  | 1 +
 .../test/spring/CamelSpringTestContextLoaderTestExecutionListener.java   | 1 +
 .../main/java/org/apache/camel/test/spring/CamelSpringTestHelper.java    | 1 +
 .../main/java/org/apache/camel/test/spring/CamelSpringTestSupport.java   | 1 +
 .../java/org/apache/camel/test/spring/CamelTestContextBootstrapper.java  | 1 +
 .../src/main/java/org/apache/camel/test/spring/DisableJmx.java           | 1 +
 .../src/main/java/org/apache/camel/test/spring/EnableRouteCoverage.java  | 1 +
 .../src/main/java/org/apache/camel/test/spring/ExcludeRoutes.java        | 1 +
 .../src/main/java/org/apache/camel/test/spring/MockEndpoints.java        | 1 +
 .../src/main/java/org/apache/camel/test/spring/MockEndpointsAndSkip.java | 1 +
 .../src/main/java/org/apache/camel/test/spring/ProvidesBreakpoint.java   | 1 +
 .../src/main/java/org/apache/camel/test/spring/RouteCoverageDumper.java  | 1 +
 .../java/org/apache/camel/test/spring/RouteCoverageEventNotifier.java    | 1 +
 .../src/main/java/org/apache/camel/test/spring/ShutdownTimeout.java      | 1 +
 .../org/apache/camel/test/spring/StopWatchTestExecutionListener.java     | 1 +
 .../src/main/java/org/apache/camel/test/spring/UseAdviceWith.java        | 1 +
 .../camel/test/spring/UseOverridePropertiesWithPropertiesComponent.java  | 1 +
 .../src/main/java/org/apache/camel/test/AvailablePortFinder.java         | 1 +
 .../org/apache/camel/test/AvailablePortFinderPropertiesFunction.java     | 1 +
 .../java/org/apache/camel/test/ExcludingPackageScanClassResolver.java    | 1 +
 .../src/main/java/org/apache/camel/test/TestSupportNodeIdFactory.java    | 1 +
 .../src/main/java/org/apache/camel/test/junit4/CamelTearDownRule.java    | 1 +
 .../src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java     | 1 +
 .../src/main/java/org/apache/camel/test/junit4/CamelTestWatcher.java     | 1 +
 .../src/main/java/org/apache/camel/test/junit4/ExchangeTestSupport.java  | 1 +
 .../src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java  | 1 +
 .../src/main/java/org/apache/camel/test/junit4/TestSupport.java          | 1 +
 30 files changed, 30 insertions(+)

diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
index 34dbfd8..0d583a9 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
@@ -44,6 +44,7 @@ import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.annotation.AnnotationUtils;
 
+@Deprecated
 public final class CamelAnnotationsHandler {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CamelAnnotationsHandler.class);
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringBootRunner.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringBootRunner.java
index 178ff8a..1d0e165 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringBootRunner.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringBootRunner.java
@@ -23,6 +23,7 @@ import org.junit.runners.model.InitializationError;
  * This approach allows developers to implement tests for their Spring Boot based applications/routes using the typical
  * Spring Test conventions for test development.
  */
+@Deprecated
 public class CamelSpringBootRunner extends CamelSpringRunner {
 
     public CamelSpringBootRunner(Class<?> clazz) throws InitializationError {
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringRunner.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringRunner.java
index 217eb1f..5b9936c 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringRunner.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringRunner.java
@@ -33,6 +33,7 @@ import org.springframework.test.context.support.DefaultBootstrapContext;
  * Test based test cases. This approach allows developers to implement tests for their Spring based applications/routes
  * using the typical Spring Test conventions for test development.
  */
+@Deprecated
 public class CamelSpringRunner extends SpringJUnit4ClassRunner {
 
     public CamelSpringRunner(Class<?> clazz) throws InitializationError {
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
index f452a7a..810449d 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
@@ -41,6 +41,7 @@ import org.springframework.util.StringUtils;
  * Replacement for the default {@link GenericXmlContextLoader} that provides hooks for processing some class level Camel
  * related test annotations.
  */
+@Deprecated
 public class CamelSpringTestContextLoader extends AbstractContextLoader {
 
     private static final Logger LOG = LoggerFactory.getLogger(CamelSpringTestContextLoader.class);
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoaderTestExecutionListener.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoaderTestExecutionListener.java
index f2b2425..6e5dbf5 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoaderTestExecutionListener.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoaderTestExecutionListener.java
@@ -27,6 +27,7 @@ import org.springframework.test.context.support.AbstractTestExecutionListener;
  * Implemented as a listener as the state can be set on a {@code ThreadLocal} and we are pretty sure that the same
  * thread will be used to initialize the Spring context.
  */
+@Deprecated
 public class CamelSpringTestContextLoaderTestExecutionListener extends AbstractTestExecutionListener {
 
     /**
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestHelper.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestHelper.java
index 51bc64d..8f5100d 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestHelper.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestHelper.java
@@ -35,6 +35,7 @@ import org.springframework.test.context.TestContext;
  * Note that this class makes use of {@link ThreadLocal}s to maintain some state. It is imperative that the state
  * setters and getters are accessed within the scope of a single thread in order for this class to work right.
  */
+@Deprecated
 public final class CamelSpringTestHelper {
 
     private static ThreadLocal<String> originalJmxDisabledValue = new ThreadLocal<>();
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestSupport.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestSupport.java
index 3ffc947..66e06b1 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestSupport.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestSupport.java
@@ -36,6 +36,7 @@ import org.springframework.context.support.GenericApplicationContext;
  * Base test-class for classic Spring application such as standalone, web applications. Do <tt>not</tt> use this class
  * for Spring Boot testing, instead use <code>@RunWith(CamelSpringBootRunner.class)</code>.
  */
+@Deprecated
 public abstract class CamelSpringTestSupport extends CamelTestSupport {
     protected static ThreadLocal<AbstractApplicationContext> threadAppContext = new ThreadLocal<>();
     protected static Object lock = new Object();
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelTestContextBootstrapper.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelTestContextBootstrapper.java
index 192d2d3..04b549b 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelTestContextBootstrapper.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelTestContextBootstrapper.java
@@ -22,6 +22,7 @@ import org.springframework.test.context.support.DefaultTestContextBootstrapper;
 /**
  * To bootstrap Camel for testing with Spring 4.1 onwards.
  */
+@Deprecated
 public class CamelTestContextBootstrapper extends DefaultTestContextBootstrapper {
 
     @Override
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/DisableJmx.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/DisableJmx.java
index 9039db5..c9f7149 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/DisableJmx.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/DisableJmx.java
@@ -33,6 +33,7 @@ import java.lang.annotation.Target;
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE })
+@Deprecated
 public @interface DisableJmx {
 
     /**
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/EnableRouteCoverage.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/EnableRouteCoverage.java
index 72e0d44..a722454 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/EnableRouteCoverage.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/EnableRouteCoverage.java
@@ -36,6 +36,7 @@ import java.lang.annotation.Target;
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE })
+@Deprecated
 public @interface EnableRouteCoverage {
 
 }
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/ExcludeRoutes.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/ExcludeRoutes.java
index 29adbd8..500627b 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/ExcludeRoutes.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/ExcludeRoutes.java
@@ -35,6 +35,7 @@ import org.apache.camel.RoutesBuilder;
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE })
+@Deprecated
 public @interface ExcludeRoutes {
 
     /**
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/MockEndpoints.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/MockEndpoints.java
index 317fb3a..a7772d8 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/MockEndpoints.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/MockEndpoints.java
@@ -34,6 +34,7 @@ import org.apache.camel.component.mock.InterceptSendToMockEndpointStrategy;
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE })
+@Deprecated
 public @interface MockEndpoints {
 
     /**
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/MockEndpointsAndSkip.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/MockEndpointsAndSkip.java
index 0421259..0288d32 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/MockEndpointsAndSkip.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/MockEndpointsAndSkip.java
@@ -34,6 +34,7 @@ import org.apache.camel.component.mock.InterceptSendToMockEndpointStrategy;
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE })
+@Deprecated
 public @interface MockEndpointsAndSkip {
 
     /**
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/ProvidesBreakpoint.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/ProvidesBreakpoint.java
index 0a4d6b3..4d4bb1d 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/ProvidesBreakpoint.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/ProvidesBreakpoint.java
@@ -32,5 +32,6 @@ import org.apache.camel.spi.Breakpoint;
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD })
+@Deprecated
 public @interface ProvidesBreakpoint {
 }
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/RouteCoverageDumper.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/RouteCoverageDumper.java
index 81f8401..e5659b8 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/RouteCoverageDumper.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/RouteCoverageDumper.java
@@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Helper to dump route coverage when using {@link EnableRouteCoverage}.
  */
+@Deprecated
 public final class RouteCoverageDumper {
 
     private static final Logger LOG = LoggerFactory.getLogger(RouteCoverageDumper.class);
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/RouteCoverageEventNotifier.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/RouteCoverageEventNotifier.java
index 4b10502..17321fd 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/RouteCoverageEventNotifier.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/RouteCoverageEventNotifier.java
@@ -23,6 +23,7 @@ import org.apache.camel.spi.CamelEvent;
 import org.apache.camel.spi.CamelEvent.CamelContextStoppingEvent;
 import org.apache.camel.support.EventNotifierSupport;
 
+@Deprecated
 public class RouteCoverageEventNotifier extends EventNotifierSupport {
 
     private final String testClassName;
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/ShutdownTimeout.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/ShutdownTimeout.java
index b72b100..d1aa65f 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/ShutdownTimeout.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/ShutdownTimeout.java
@@ -33,6 +33,7 @@ import java.util.concurrent.TimeUnit;
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE })
+@Deprecated
 public @interface ShutdownTimeout {
 
     /**
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/StopWatchTestExecutionListener.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/StopWatchTestExecutionListener.java
index 87095d7..8b52083 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/StopWatchTestExecutionListener.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/StopWatchTestExecutionListener.java
@@ -27,6 +27,7 @@ import org.springframework.test.context.support.AbstractTestExecutionListener;
  * An execution listener that simulates the timing output built in to
  * {@link org.apache.camel.test.junit4.CamelTestSupport}.
  */
+@Deprecated
 public class StopWatchTestExecutionListener extends AbstractTestExecutionListener {
 
     protected static ThreadLocal<StopWatch> threadStopWatch = new ThreadLocal<>();
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/UseAdviceWith.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/UseAdviceWith.java
index 4a71781..f4a442b 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/UseAdviceWith.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/UseAdviceWith.java
@@ -36,6 +36,7 @@ import org.apache.camel.CamelContext;
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE })
+@Deprecated
 public @interface UseAdviceWith {
 
     /**
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/UseOverridePropertiesWithPropertiesComponent.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/UseOverridePropertiesWithPropertiesComponent.java
index 95ffaaa..8ad76b2 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/UseOverridePropertiesWithPropertiesComponent.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/UseOverridePropertiesWithPropertiesComponent.java
@@ -30,6 +30,7 @@ import java.lang.annotation.Target;
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD })
+@Deprecated
 public @interface UseOverridePropertiesWithPropertiesComponent {
 
 }
diff --git a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinder.java b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinder.java
index 3adc24d..7a12771 100644
--- a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinder.java
+++ b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinder.java
@@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Finds currently available server ports.
  */
+@Deprecated
 public final class AvailablePortFinder {
 
     private static final Logger LOG = LoggerFactory.getLogger(AvailablePortFinder.class);
diff --git a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinderPropertiesFunction.java b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinderPropertiesFunction.java
index 078f0d6..57c36d6 100644
--- a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinderPropertiesFunction.java
+++ b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinderPropertiesFunction.java
@@ -52,6 +52,7 @@ import org.apache.camel.util.StringHelper;
  *
  * @see AvailablePortFinder
  */
+@Deprecated
 public class AvailablePortFinderPropertiesFunction implements PropertiesFunction {
     private final Map<String, String> portMapping;
 
diff --git a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/ExcludingPackageScanClassResolver.java b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/ExcludingPackageScanClassResolver.java
index ce04f9e..2895fdf 100644
--- a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/ExcludingPackageScanClassResolver.java
+++ b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/ExcludingPackageScanClassResolver.java
@@ -23,6 +23,7 @@ import org.apache.camel.impl.engine.DefaultPackageScanClassResolver;
 import org.apache.camel.impl.scan.AssignableToPackageScanFilter;
 import org.apache.camel.impl.scan.InvertingPackageScanFilter;
 
+@Deprecated
 public class ExcludingPackageScanClassResolver extends DefaultPackageScanClassResolver {
 
     public void setExcludedClasses(Set<Class<?>> excludedClasses) {
diff --git a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/TestSupportNodeIdFactory.java b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/TestSupportNodeIdFactory.java
index e66d42a..ef9780e 100644
--- a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/TestSupportNodeIdFactory.java
+++ b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/TestSupportNodeIdFactory.java
@@ -18,6 +18,7 @@ package org.apache.camel.test;
 
 import org.apache.camel.impl.engine.DefaultNodeIdFactory;
 
+@Deprecated
 public class TestSupportNodeIdFactory extends DefaultNodeIdFactory {
 
     /**
diff --git a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTearDownRule.java b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTearDownRule.java
index d52a4b5..c1986e1 100644
--- a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTearDownRule.java
+++ b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTearDownRule.java
@@ -21,6 +21,7 @@ import org.junit.rules.ExternalResource;
 /**
  * A JUnit rule to tear down Camel when using createCamelContextPerClass=true.
  */
+@Deprecated
 public class CamelTearDownRule extends ExternalResource {
 
     private final ThreadLocal<CamelTestSupport> testSupport;
diff --git a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
index 687d301..f432731 100644
--- a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
+++ b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
@@ -97,6 +97,7 @@ import org.slf4j.LoggerFactory;
  * {@link org.apache.camel.ProducerTemplate} for use in the test case Do <tt>not</tt> use this class for Spring Boot
  * testing, instead use <code>@RunWith(CamelSpringBootRunner.class)</code>.
  */
+@Deprecated
 public abstract class CamelTestSupport extends TestSupport {
 
     /**
diff --git a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestWatcher.java b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestWatcher.java
index cbdca6a..6dfa257 100644
--- a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestWatcher.java
+++ b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestWatcher.java
@@ -23,6 +23,7 @@ import org.junit.runner.Description;
 /**
  * A JUnit {@link org.junit.rules.TestWatcher} that is used to time how long the test takes.
  */
+@Deprecated
 public class CamelTestWatcher extends TestWatcher {
 
     private final StopWatch watch = new StopWatch();
diff --git a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/ExchangeTestSupport.java b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/ExchangeTestSupport.java
index 4d0f2df..cf4aefe 100644
--- a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/ExchangeTestSupport.java
+++ b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/ExchangeTestSupport.java
@@ -24,6 +24,7 @@ import org.junit.Before;
 /**
  * A base class for a test which requires a {@link org.apache.camel.CamelContext} and a populated {@link Exchange}
  */
+@Deprecated
 public abstract class ExchangeTestSupport extends CamelTestSupport {
     protected Exchange exchange;
 
diff --git a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java
index 66f1071..54afb7b 100644
--- a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java
+++ b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java
@@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory;
 /**
  * A useful base class for testing the language plugins in Camel
  */
+@Deprecated
 public abstract class LanguageTestSupport extends ExchangeTestSupport {
 
     private static final Logger LOG = LoggerFactory.getLogger(LanguageTestSupport.class);
diff --git a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
index 5503b96..3e7c525 100644
--- a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
+++ b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
@@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory;
 /**
  * A bunch of useful testing methods
  */
+@Deprecated
 public abstract class TestSupport extends Assert {
 
     protected static final String LS = System.lineSeparator();

[camel] 01/02: CAMEL-16184: Deprecate the junit 4.x test modules

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit e8ea1a21603dc010fe6966016a0f6aa662814635
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Aug 26 14:33:40 2021 +0200

    CAMEL-16184: Deprecate the junit 4.x test modules
---
 .../resources/org/apache/camel/catalog/others/test-spring.json       | 2 +-
 .../org/apache/camel/catalog/others/testcontainers-spring.json       | 2 +-
 .../resources/org/apache/camel/catalog/others/testcontainers.json    | 2 +-
 components/camel-test/camel-test-spring/pom.xml                      | 3 +--
 .../resources/META-INF/services/org/apache/camel/other.properties    | 2 +-
 .../camel-test-spring/src/generated/resources/test-spring.json       | 2 +-
 .../camel-test/camel-test-spring/src/main/docs/test-spring.adoc      | 5 +++--
 components/camel-test/camel-test/pom.xml                             | 3 +--
 .../resources/META-INF/services/org/apache/camel/other.properties    | 2 +-
 components/camel-test/camel-test/src/generated/resources/test.json   | 2 +-
 components/camel-test/camel-test/src/main/docs/test.adoc             | 5 +++--
 components/camel-test/camel-testcontainers-spring-junit5/pom.xml     | 1 -
 components/camel-test/camel-testcontainers-spring/pom.xml            | 3 +--
 .../resources/META-INF/services/org/apache/camel/other.properties    | 2 +-
 .../src/generated/resources/testcontainers-spring.json               | 2 +-
 .../src/main/docs/testcontainers-spring.adoc                         | 5 +++--
 components/camel-test/camel-testcontainers/pom.xml                   | 2 +-
 .../resources/META-INF/services/org/apache/camel/other.properties    | 2 +-
 .../camel-testcontainers/src/generated/resources/testcontainers.json | 2 +-
 .../camel-testcontainers/src/main/docs/testcontainers.adoc           | 5 +++--
 docs/components/modules/others/pages/test-spring.adoc                | 5 +++--
 docs/components/modules/others/pages/test.adoc                       | 5 +++--
 docs/components/modules/others/pages/testcontainers-spring.adoc      | 5 +++--
 docs/components/modules/others/pages/testcontainers.adoc             | 5 +++--
 24 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring.json
index 3b78725..f6943a7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring.json
@@ -4,7 +4,7 @@
     "name": "test-spring",
     "title": "Test Spring",
     "description": "Camel unit testing with Spring",
-    "deprecated": false,
+    "deprecated": true,
     "firstVersion": "2.10.0",
     "label": "testing,java,spring",
     "supportLevel": "Stable",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/testcontainers-spring.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/testcontainers-spring.json
index acae457..4d8b143 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/testcontainers-spring.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/testcontainers-spring.json
@@ -4,7 +4,7 @@
     "name": "testcontainers-spring",
     "title": "Testcontainers Spring",
     "description": "Camel unit testing with Spring and testcontainers",
-    "deprecated": false,
+    "deprecated": true,
     "firstVersion": "2.22.0",
     "label": "testing,java,docker",
     "supportLevel": "Stable",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/testcontainers.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/testcontainers.json
index d672a8d..4f9568a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/testcontainers.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/testcontainers.json
@@ -4,7 +4,7 @@
     "name": "testcontainers",
     "title": "Testcontainers",
     "description": "Camel support for testcontainers",
-    "deprecated": false,
+    "deprecated": true,
     "firstVersion": "2.22.0",
     "label": "testing,java,docker",
     "supportLevel": "Stable",
diff --git a/components/camel-test/camel-test-spring/pom.xml b/components/camel-test/camel-test-spring/pom.xml
index 7f2025f..4a0e4ba 100644
--- a/components/camel-test/camel-test-spring/pom.xml
+++ b/components/camel-test/camel-test-spring/pom.xml
@@ -29,13 +29,12 @@
     <artifactId>camel-test-spring</artifactId>
     <packaging>jar</packaging>
 
-    <name>Camel :: Test :: Spring</name>
+    <name>Camel :: Test :: Spring (deprecated)</name>
     <description>Camel unit testing with Spring</description>
 
     <properties>
         <firstVersion>2.10.0</firstVersion>
         <label>testing,java,spring</label>
-
         <spring-version>${spring5-version}</spring-version>
     </properties>
 
diff --git a/components/camel-test/camel-test-spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-test/camel-test-spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index ccf0e66..079f982 100644
--- a/components/camel-test/camel-test-spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ b/components/camel-test/camel-test-spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -3,5 +3,5 @@ name=test-spring
 groupId=org.apache.camel
 artifactId=camel-test-spring
 version=3.12.0-SNAPSHOT
-projectName=Camel :: Test :: Spring
+projectName=Camel :: Test :: Spring (deprecated)
 projectDescription=Camel unit testing with Spring
diff --git a/components/camel-test/camel-test-spring/src/generated/resources/test-spring.json b/components/camel-test/camel-test-spring/src/generated/resources/test-spring.json
index 3b78725..f6943a7 100644
--- a/components/camel-test/camel-test-spring/src/generated/resources/test-spring.json
+++ b/components/camel-test/camel-test-spring/src/generated/resources/test-spring.json
@@ -4,7 +4,7 @@
     "name": "test-spring",
     "title": "Test Spring",
     "description": "Camel unit testing with Spring",
-    "deprecated": false,
+    "deprecated": true,
     "firstVersion": "2.10.0",
     "label": "testing,java,spring",
     "supportLevel": "Stable",
diff --git a/components/camel-test/camel-test-spring/src/main/docs/test-spring.adoc b/components/camel-test/camel-test-spring/src/main/docs/test-spring.adoc
index 6d54062..6997df8 100644
--- a/components/camel-test/camel-test-spring/src/main/docs/test-spring.adoc
+++ b/components/camel-test/camel-test-spring/src/main/docs/test-spring.adoc
@@ -1,10 +1,11 @@
 [[test-spring-other]]
-= Test Spring Component
+= Test Spring Component (deprecated)
 :docTitle: Test Spring
 :artifactId: camel-test-spring
 :description: Camel unit testing with Spring
 :since: 2.10
-:supportLevel: Stable
+:supportLevel: Stable-deprecated
+:deprecated: *deprecated*
 include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/test-spring.adoc[opts=optional]
 
 *Since Camel {since}*
diff --git a/components/camel-test/camel-test/pom.xml b/components/camel-test/camel-test/pom.xml
index 7145d12..c09dbf6 100644
--- a/components/camel-test/camel-test/pom.xml
+++ b/components/camel-test/camel-test/pom.xml
@@ -29,13 +29,12 @@
     <artifactId>camel-test</artifactId>
     <packaging>jar</packaging>
 
-    <name>Camel :: Test</name>
+    <name>Camel :: Test (deprecated)</name>
     <description>Camel unit testing</description>
 
     <properties>
         <firstVersion>2.9.0</firstVersion>
         <label>testing,java</label>
-
     </properties>
 
     <dependencies>
diff --git a/components/camel-test/camel-test/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-test/camel-test/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index fd8fb90..bca168d 100644
--- a/components/camel-test/camel-test/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ b/components/camel-test/camel-test/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -3,5 +3,5 @@ name=test
 groupId=org.apache.camel
 artifactId=camel-test
 version=3.12.0-SNAPSHOT
-projectName=Camel :: Test
+projectName=Camel :: Test (deprecated)
 projectDescription=Camel unit testing
diff --git a/components/camel-test/camel-test/src/generated/resources/test.json b/components/camel-test/camel-test/src/generated/resources/test.json
index 582dae2..a116e8d 100644
--- a/components/camel-test/camel-test/src/generated/resources/test.json
+++ b/components/camel-test/camel-test/src/generated/resources/test.json
@@ -4,7 +4,7 @@
     "name": "test",
     "title": "Test",
     "description": "Camel unit testing",
-    "deprecated": false,
+    "deprecated": true,
     "firstVersion": "2.9.0",
     "label": "testing,java",
     "supportLevel": "Stable",
diff --git a/components/camel-test/camel-test/src/main/docs/test.adoc b/components/camel-test/camel-test/src/main/docs/test.adoc
index 3701a5e..eb7ec22 100644
--- a/components/camel-test/camel-test/src/main/docs/test.adoc
+++ b/components/camel-test/camel-test/src/main/docs/test.adoc
@@ -1,10 +1,11 @@
 [[test-other]]
-= Test Component
+= Test Component (deprecated)
 :docTitle: Test
 :artifactId: camel-test
 :description: Camel unit testing
 :since: 2.9
-:supportLevel: Stable
+:supportLevel: Stable-deprecated
+:deprecated: *deprecated*
 include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/test.adoc[opts=optional]
 
 *Since Camel {since}*
diff --git a/components/camel-test/camel-testcontainers-spring-junit5/pom.xml b/components/camel-test/camel-testcontainers-spring-junit5/pom.xml
index 704359a..54f07bf 100644
--- a/components/camel-test/camel-testcontainers-spring-junit5/pom.xml
+++ b/components/camel-test/camel-testcontainers-spring-junit5/pom.xml
@@ -35,7 +35,6 @@
     <properties>
         <firstVersion>3.0.0</firstVersion>
         <label>testing,java,docker</label>
-
     </properties>
 
     <dependencies>
diff --git a/components/camel-test/camel-testcontainers-spring/pom.xml b/components/camel-test/camel-testcontainers-spring/pom.xml
index 60f5d14..2acc937 100644
--- a/components/camel-test/camel-testcontainers-spring/pom.xml
+++ b/components/camel-test/camel-testcontainers-spring/pom.xml
@@ -29,13 +29,12 @@
     <artifactId>camel-testcontainers-spring</artifactId>
     <packaging>jar</packaging>
 
-    <name>Camel :: Testcontainers :: Spring</name>
+    <name>Camel :: Testcontainers :: Spring (deprecated)</name>
     <description>Camel unit testing with Spring and testcontainers</description>
 
     <properties>
         <firstVersion>2.22.0</firstVersion>
         <label>testing,java,docker</label>
-
     </properties>
 
     <dependencies>
diff --git a/components/camel-test/camel-testcontainers-spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-test/camel-testcontainers-spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index 35b90df..3577ef0 100644
--- a/components/camel-test/camel-testcontainers-spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ b/components/camel-test/camel-testcontainers-spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -3,5 +3,5 @@ name=testcontainers-spring
 groupId=org.apache.camel
 artifactId=camel-testcontainers-spring
 version=3.12.0-SNAPSHOT
-projectName=Camel :: Testcontainers :: Spring
+projectName=Camel :: Testcontainers :: Spring (deprecated)
 projectDescription=Camel unit testing with Spring and testcontainers
diff --git a/components/camel-test/camel-testcontainers-spring/src/generated/resources/testcontainers-spring.json b/components/camel-test/camel-testcontainers-spring/src/generated/resources/testcontainers-spring.json
index acae457..4d8b143 100644
--- a/components/camel-test/camel-testcontainers-spring/src/generated/resources/testcontainers-spring.json
+++ b/components/camel-test/camel-testcontainers-spring/src/generated/resources/testcontainers-spring.json
@@ -4,7 +4,7 @@
     "name": "testcontainers-spring",
     "title": "Testcontainers Spring",
     "description": "Camel unit testing with Spring and testcontainers",
-    "deprecated": false,
+    "deprecated": true,
     "firstVersion": "2.22.0",
     "label": "testing,java,docker",
     "supportLevel": "Stable",
diff --git a/components/camel-test/camel-testcontainers-spring/src/main/docs/testcontainers-spring.adoc b/components/camel-test/camel-testcontainers-spring/src/main/docs/testcontainers-spring.adoc
index 5ec022d..699dee4 100644
--- a/components/camel-test/camel-testcontainers-spring/src/main/docs/testcontainers-spring.adoc
+++ b/components/camel-test/camel-testcontainers-spring/src/main/docs/testcontainers-spring.adoc
@@ -1,10 +1,11 @@
 [[testcontainers-spring-other]]
-= Testcontainers Spring Component
+= Testcontainers Spring Component (deprecated)
 :docTitle: Testcontainers Spring
 :artifactId: camel-testcontainers-spring
 :description: Camel unit testing with Spring and testcontainers
 :since: 2.22
-:supportLevel: Stable
+:supportLevel: Stable-deprecated
+:deprecated: *deprecated*
 include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/testcontainers-spring.adoc[opts=optional]
 
 *Since Camel {since}*
diff --git a/components/camel-test/camel-testcontainers/pom.xml b/components/camel-test/camel-testcontainers/pom.xml
index e2e0fbf..147dbf4 100644
--- a/components/camel-test/camel-testcontainers/pom.xml
+++ b/components/camel-test/camel-testcontainers/pom.xml
@@ -29,7 +29,7 @@
     <artifactId>camel-testcontainers</artifactId>
     <packaging>jar</packaging>
 
-    <name>Camel :: Testcontainers</name>
+    <name>Camel :: Testcontainers (deprecated)</name>
     <description>Camel support for testcontainers</description>
 
     <properties>
diff --git a/components/camel-test/camel-testcontainers/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-test/camel-testcontainers/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index 4dba38d..0569b5c 100644
--- a/components/camel-test/camel-testcontainers/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ b/components/camel-test/camel-testcontainers/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -3,5 +3,5 @@ name=testcontainers
 groupId=org.apache.camel
 artifactId=camel-testcontainers
 version=3.12.0-SNAPSHOT
-projectName=Camel :: Testcontainers
+projectName=Camel :: Testcontainers (deprecated)
 projectDescription=Camel support for testcontainers
diff --git a/components/camel-test/camel-testcontainers/src/generated/resources/testcontainers.json b/components/camel-test/camel-testcontainers/src/generated/resources/testcontainers.json
index d672a8d..4f9568a 100644
--- a/components/camel-test/camel-testcontainers/src/generated/resources/testcontainers.json
+++ b/components/camel-test/camel-testcontainers/src/generated/resources/testcontainers.json
@@ -4,7 +4,7 @@
     "name": "testcontainers",
     "title": "Testcontainers",
     "description": "Camel support for testcontainers",
-    "deprecated": false,
+    "deprecated": true,
     "firstVersion": "2.22.0",
     "label": "testing,java,docker",
     "supportLevel": "Stable",
diff --git a/components/camel-test/camel-testcontainers/src/main/docs/testcontainers.adoc b/components/camel-test/camel-testcontainers/src/main/docs/testcontainers.adoc
index 3d0b330..17381a0 100644
--- a/components/camel-test/camel-testcontainers/src/main/docs/testcontainers.adoc
+++ b/components/camel-test/camel-testcontainers/src/main/docs/testcontainers.adoc
@@ -1,10 +1,11 @@
 [[testcontainers-other]]
-= Testcontainers Component
+= Testcontainers Component (deprecated)
 :docTitle: Testcontainers
 :artifactId: camel-testcontainers
 :description: Camel support for testcontainers
 :since: 2.22
-:supportLevel: Stable
+:supportLevel: Stable-deprecated
+:deprecated: *deprecated*
 include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/testcontainers.adoc[opts=optional]
 
 *Since Camel {since}*
diff --git a/docs/components/modules/others/pages/test-spring.adoc b/docs/components/modules/others/pages/test-spring.adoc
index 0e9341f..311a17b 100644
--- a/docs/components/modules/others/pages/test-spring.adoc
+++ b/docs/components/modules/others/pages/test-spring.adoc
@@ -1,12 +1,13 @@
 [[test-spring-other]]
-= Test Spring Component
+= Test Spring Component (deprecated)
 //THIS FILE IS COPIED: EDIT THE SOURCE FILE:
 :page-source: components/camel-test/camel-test-spring/src/main/docs/test-spring.adoc
 :docTitle: Test Spring
 :artifactId: camel-test-spring
 :description: Camel unit testing with Spring
 :since: 2.10
-:supportLevel: Stable
+:supportLevel: Stable-deprecated
+:deprecated: *deprecated*
 include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/test-spring.adoc[opts=optional]
 
 *Since Camel {since}*
diff --git a/docs/components/modules/others/pages/test.adoc b/docs/components/modules/others/pages/test.adoc
index 8cace19..be93e9d 100644
--- a/docs/components/modules/others/pages/test.adoc
+++ b/docs/components/modules/others/pages/test.adoc
@@ -1,12 +1,13 @@
 [[test-other]]
-= Test Component
+= Test Component (deprecated)
 //THIS FILE IS COPIED: EDIT THE SOURCE FILE:
 :page-source: components/camel-test/camel-test/src/main/docs/test.adoc
 :docTitle: Test
 :artifactId: camel-test
 :description: Camel unit testing
 :since: 2.9
-:supportLevel: Stable
+:supportLevel: Stable-deprecated
+:deprecated: *deprecated*
 include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/test.adoc[opts=optional]
 
 *Since Camel {since}*
diff --git a/docs/components/modules/others/pages/testcontainers-spring.adoc b/docs/components/modules/others/pages/testcontainers-spring.adoc
index e66fae8..e306db2 100644
--- a/docs/components/modules/others/pages/testcontainers-spring.adoc
+++ b/docs/components/modules/others/pages/testcontainers-spring.adoc
@@ -1,12 +1,13 @@
 [[testcontainers-spring-other]]
-= Testcontainers Spring Component
+= Testcontainers Spring Component (deprecated)
 //THIS FILE IS COPIED: EDIT THE SOURCE FILE:
 :page-source: components/camel-test/camel-testcontainers-spring/src/main/docs/testcontainers-spring.adoc
 :docTitle: Testcontainers Spring
 :artifactId: camel-testcontainers-spring
 :description: Camel unit testing with Spring and testcontainers
 :since: 2.22
-:supportLevel: Stable
+:supportLevel: Stable-deprecated
+:deprecated: *deprecated*
 include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/testcontainers-spring.adoc[opts=optional]
 
 *Since Camel {since}*
diff --git a/docs/components/modules/others/pages/testcontainers.adoc b/docs/components/modules/others/pages/testcontainers.adoc
index fd83908..d818159 100644
--- a/docs/components/modules/others/pages/testcontainers.adoc
+++ b/docs/components/modules/others/pages/testcontainers.adoc
@@ -1,12 +1,13 @@
 [[testcontainers-other]]
-= Testcontainers Component
+= Testcontainers Component (deprecated)
 //THIS FILE IS COPIED: EDIT THE SOURCE FILE:
 :page-source: components/camel-test/camel-testcontainers/src/main/docs/testcontainers.adoc
 :docTitle: Testcontainers
 :artifactId: camel-testcontainers
 :description: Camel support for testcontainers
 :since: 2.22
-:supportLevel: Stable
+:supportLevel: Stable-deprecated
+:deprecated: *deprecated*
 include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/testcontainers.adoc[opts=optional]
 
 *Since Camel {since}*