This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 46128be856 Rename camel-quarkus-junit5 to camel-quarkus-junit
46128be856 is described below
commit 46128be856435c765e4bb43ad36f0b27ac94f2d4
Author: James Netherton <[email protected]>
AuthorDate: Fri Jan 16 09:45:01 2026 +0000
Rename camel-quarkus-junit5 to camel-quarkus-junit
Fixes #8130
---
.../modules/ROOT/pages/migration-guide/3.31.0.adoc | 13 ++++
.../camel-spring-boot-to-camel-quarkus.adoc | 2 +-
docs/modules/ROOT/pages/migration-guide/index.adoc | 1 +
docs/modules/ROOT/pages/user-guide/testing.adoc | 4 +-
integration-tests-jvm/junit-test-framework/pom.xml | 76 ++++++++++++++++++++++
.../framework/CamelQuarkusTestFrameworkTest.java | 24 ++++---
integration-tests-jvm/pom.xml | 1 +
integration-tests/cxf-soap-grouped/pom.xml | 5 --
poms/bom/pom.xml | 16 +++++
poms/bom/src/main/generated/flattened-full-pom.xml | 16 +++++
.../src/main/generated/flattened-reduced-pom.xml | 7 +-
.../generated/flattened-reduced-verbose-pom.xml | 7 +-
.../pom.xml | 6 +-
.../extensions/continousDev/ContinuousDevTest.java | 4 +-
.../test/extensions/continousDev/HelloET.java | 0
.../extensions/continousDev/HelloResource.java | 2 +-
.../doubeRouteBuilder/DoubleRoutesTest.java | 0
.../test/extensions/doubeRouteBuilder/FirstET.java | 0
.../extensions/doubeRouteBuilder/RouteBuilder.java | 0
.../extensions/doubeRouteBuilder/SecondET.java | 0
.../ProducedRouteBuilderET.java | 0
.../ProducedRouteBuilderTest.java | 2 +-
.../routeBuilder/RouteBuilderFailureET.java | 0
.../routeBuilder/RouteBuilderFailureTest.java | 2 +-
.../routeBuilder/RouteBuilderWarningET.java | 0
...RouteBuilderWarningWithProducedBuilderTest.java | 0
...teBuilderWarningWithoutProducedBuilderTest.java | 0
.../extensions/routeBuilder/RouteProducer.java | 0
.../{junit5 => camel-quarkus-junit}/pom.xml | 6 +-
.../camel/quarkus/test/AfterAllCallback.java | 0
.../camel/quarkus/test/AfterConstructCallback.java | 0
.../camel/quarkus/test/AfterEachCallback.java | 0
.../camel/quarkus/test/BeforeEachCallback.java | 0
.../apache/camel/quarkus/test/CallbackUtil.java | 0
.../quarkus/test/CamelQuarkusTestSupport.java | 18 ++---
.../test/ContextNotStoppingManagerFactory.java | 8 +--
.../test/CustomCamelContextConfiguration.java | 2 +-
.../test/CustomTestExecutionConfiguration.java | 2 +-
.../test/LegacyCamelContextNotStoppingManager.java | 8 +--
.../TransientCamelContextNotStoppingManager.java | 6 +-
...test.junit.callback.QuarkusTestAfterAllCallback | 0
...unit.callback.QuarkusTestAfterConstructCallback | 0
...est.junit.callback.QuarkusTestAfterEachCallback | 0
...st.junit.callback.QuarkusTestBeforeEachCallback | 0
.../test/common/AbstractSimpleMockTest.java | 0
.../test/common/JupiterCallbackCorrectTest.java | 0
.../quarkus/test/junit6}/CamelTestSupportTest.java | 2 +-
.../junit6}/RouteFilterPatternExcludeTest.java | 2 +-
.../RouteFilterPatternIncludeExcludeTest.java | 2 +-
.../junit6}/RouteFilterPatternIncludeTest.java | 2 +-
.../patterns/AdviceWithAnotherRouteTest.java | 2 +-
.../junit6}/patterns/AdviceWithLambdaTest.java | 2 +-
.../patterns/DebugNoLazyTypeConverterTest.java | 4 +-
.../quarkus/test/junit6}/patterns/DebugTest.java | 4 +-
.../test/junit6/patterns/DebugUnitTest.java} | 10 +--
.../FilterCreateCamelContextPerClassTest.java | 2 +-
.../junit6}/patterns/FilterFluentTemplateTest.java | 2 +-
.../test/junit6}/patterns/FilterJUnit5Test.java | 2 +-
.../quarkus/test/junit6}/patterns/FilterTest.java | 2 +-
.../test/junit6}/patterns/GetMockEndpointTest.java | 2 +-
.../patterns/IsMockEndpointsAndSkipJUnit5Test.java | 2 +-
.../junit6}/patterns/IsMockEndpointsFileTest.java | 4 +-
.../patterns/IsMockEndpointsJUnit5Test.java | 2 +-
.../test/junit6}/patterns/IsMockEndpointsTest.java | 2 +-
.../patterns/MockEndpointFailNoHeaderTest.java | 2 +-
.../test/junit6}/patterns/MyProduceBean.java | 2 +-
.../quarkus/test/junit6}/patterns/MySender.java | 2 +-
.../test/junit6}/patterns/ProduceBeanTest.java | 2 +-
.../RouteBuilderConfigureExceptionTest.java | 2 +-
.../RouteProcessorDumpRouteCoverageTest.java | 12 ++--
.../junit6}/patterns/SimpleMockEndpointsTest.java | 2 +-
.../junit6}/patterns/SimpleNotifyBuilderTest.java | 2 +-
.../patterns/SimpleWeaveAddMockLastTest.java | 2 +-
.../test/junit6}/patterns/TestDebugBreakpoint.java | 4 +-
...rridePropertiesWithPropertiesComponentTest.java | 2 +-
.../AdviceInDoBeforeEachMethodsTest.java | 0
test-framework/junit5/pom.xml | 43 +-----------
test-framework/pom.xml | 3 +-
tooling/test-list/pom.xml | 4 +-
79 files changed, 231 insertions(+), 141 deletions(-)
diff --git a/docs/modules/ROOT/pages/migration-guide/3.31.0.adoc
b/docs/modules/ROOT/pages/migration-guide/3.31.0.adoc
new file mode 100644
index 0000000000..cdba5ef94c
--- /dev/null
+++ b/docs/modules/ROOT/pages/migration-guide/3.31.0.adoc
@@ -0,0 +1,13 @@
+= Camel Quarkus 3.31.0 Migration Guide
+
+The following guide outlines how to adapt your code to changes that were made
in Camel Quarkus 3.31.0.
+
+== `camel-quarkus-junit5` renamed to `camel-quarkus-junit`
+
+To align with the Quarkus test framework upgrading from JUnit 5.x to 6.x, the
`camel-quarkus-junit5` test framework module has renamed to
`camel-quarkus-junit`.
+
+Any imports in your tests for `org.apache.camel.test.junit5` should be updated
to `org.apache.camel.test.junit6`.
+
+The `camel-quarkus-junit5` artifact will continue to exist for backwards
compatibility, until Camel Quarkus 3.34.0 is released. Where it will be
removed. We recommend switching to `camel-quarkus-junit` as soon as possible.
+
+Similarly, any usage of `org.apache.camel:camel-test-junit5` should be updated
to `org.apache.camel:camel-test-junit6`.
diff --git
a/docs/modules/ROOT/pages/migration-guide/camel-spring-boot-to-camel-quarkus.adoc
b/docs/modules/ROOT/pages/migration-guide/camel-spring-boot-to-camel-quarkus.adoc
index c5b4facfe7..66fa7ef6ab 100644
---
a/docs/modules/ROOT/pages/migration-guide/camel-spring-boot-to-camel-quarkus.adoc
+++
b/docs/modules/ROOT/pages/migration-guide/camel-spring-boot-to-camel-quarkus.adoc
@@ -74,7 +74,7 @@ In case, the Camel Spring XML DSL was used, it needs to be
migrated. Please see
Tests annotated with `@CamelSpringBootTest`, `@CamelSpringTest` and
`@SpringBootTest` must used `@QuarkusTest` instead.
-In case of tests which extends `CamelSpringBootTestSupport`, it must be
replaced by `CamelQuarkusTestsSupport` from `camel-quarkus-junit5` dependency
(to add to the pom). Note that this solution is working only for JVM mode.
+In case of tests which extends `CamelSpringBootTestSupport`, it must be
replaced by `CamelQuarkusTestsSupport` from `camel-quarkus-junit` dependency
(to add to the pom). Note that this solution is working only for JVM mode.
As a reminder and in case of specific cases, see
xref:user-guide/testing.adoc[Camel Quarkus Testing User guide].
diff --git a/docs/modules/ROOT/pages/migration-guide/index.adoc
b/docs/modules/ROOT/pages/migration-guide/index.adoc
index 5f729cc2e9..313e6e7e83 100644
--- a/docs/modules/ROOT/pages/migration-guide/index.adoc
+++ b/docs/modules/ROOT/pages/migration-guide/index.adoc
@@ -4,6 +4,7 @@ We do frequent releases, a release almost every month, and even
though we strive
Listed here are guides on how to migrate between major versions and anything
of significance to watch for when upgrading from minor versions.
+* xref:migration-guide/3.31.0.adoc[Camel Quarkus 3.30.x to Camel Quarkus
3.31.0 migration guide]
* xref:migration-guide/3.27.0.adoc[Camel Quarkus 3.26.x to Camel Quarkus
3.27.0 migration guide]
* xref:migration-guide/3.26.0.adoc[Camel Quarkus 3.25.x to Camel Quarkus
3.26.0 migration guide]
* xref:migration-guide/3.23.0.adoc[Camel Quarkus 3.22.x to Camel Quarkus
3.23.0 migration guide]
diff --git a/docs/modules/ROOT/pages/user-guide/testing.adoc
b/docs/modules/ROOT/pages/user-guide/testing.adoc
index 9e4f57d82e..3e15fd6f4c 100644
--- a/docs/modules/ROOT/pages/user-guide/testing.adoc
+++ b/docs/modules/ROOT/pages/user-guide/testing.adoc
@@ -230,13 +230,13 @@ The original `CamelTestSupport` class is not well suited
to Quarkus, so there's
> IMPORTANT: `CamelQuarkusTestSupport` only works in JVM mode. If you need to
> test in native mode, then use one of the alternate test strategies described
> above.
-To use `CamelQuarkusTestSupport`, you must add `camel-quarkus-junit5` as a
test scoped dependency to your application.
+To use `CamelQuarkusTestSupport`, you must add `camel-quarkus-junit` as a test
scoped dependency to your application.
[source,xml]
----
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-junit5</artifactId>
+ <artifactId>camel-quarkus-junit</artifactId>
<scope>test</scope>
</dependency>
----
diff --git a/integration-tests-jvm/junit-test-framework/pom.xml
b/integration-tests-jvm/junit-test-framework/pom.xml
new file mode 100644
index 0000000000..25db83c880
--- /dev/null
+++ b/integration-tests-jvm/junit-test-framework/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-build-parent-it</artifactId>
+ <version>3.31.0-SNAPSHOT</version>
+ <relativePath>../../poms/build-parent-it/pom.xml</relativePath>
+ </parent>
+
+
<artifactId>camel-quarkus-integration-test-junit-test-framework</artifactId>
+ <name>Camel Quarkus :: Integration Tests :: JUnit Test Framework ::
Tests</name>
+ <description>The camel integration tests</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-direct</artifactId>
+ </dependency>
+
+ <!-- test dependencies -->
+ <!-- TODO: Update to camel-quarkus-junit after camel-quarkus-junit5
removal -->
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <!-- Backwards compat test for users not migrated to
camel-quarkus-junit -->
+ <artifactId>camel-quarkus-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>virtualDependencies</id>
+ <activation>
+ <property>
+ <name>!noVirtualDependencies</name>
+ </property>
+ </activation>
+ <dependencies>
+ <!-- The following dependencies guarantee that this module is
built after them. You can update them by running `mvn process-resources
-Pformat -N` from the source tree root directory -->
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-direct-deployment</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+</project>
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/GetMockEndpointTest.java
b/integration-tests-jvm/junit-test-framework/src/test/java/org/apache/camel/quarkus/junit/test/framework/CamelQuarkusTestFrameworkTest.java
similarity index 66%
copy from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/GetMockEndpointTest.java
copy to
integration-tests-jvm/junit-test-framework/src/test/java/org/apache/camel/quarkus/junit/test/framework/CamelQuarkusTestFrameworkTest.java
index 553a0973d2..ee5c0b96fb 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/GetMockEndpointTest.java
+++
b/integration-tests-jvm/junit-test-framework/src/test/java/org/apache/camel/quarkus/junit/test/framework/CamelQuarkusTestFrameworkTest.java
@@ -14,35 +14,33 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.junit.test.framework;
import io.quarkus.test.junit.QuarkusTest;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.quarkus.test.CamelQuarkusTestSupport;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
@QuarkusTest
-public class GetMockEndpointTest extends CamelQuarkusTestSupport {
+class CamelQuarkusTestFrameworkTest extends CamelQuarkusTestSupport {
@Test
- public void testMock() throws Exception {
- getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
-
- template.sendBody("direct:start", "Hello World");
-
- MockEndpoint.assertIsSatisfied(context);
+ void camelQuarkusTestFrameworkIsAccessible() {
+ String result = template.requestBody("direct:start", "World",
String.class);
+ assertEquals("Hello World", result);
}
@Override
- protected RoutesBuilder createRouteBuilder() {
+ protected RoutesBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
- public void configure() {
- from("direct:start").to("mock:result?failFast=false");
+ public void configure() throws Exception {
+ from("direct:start")
+ .setBody().simple("Hello ${body}");
}
};
}
-
}
diff --git a/integration-tests-jvm/pom.xml b/integration-tests-jvm/pom.xml
index 1c35569d98..d0ac544b06 100644
--- a/integration-tests-jvm/pom.xml
+++ b/integration-tests-jvm/pom.xml
@@ -75,6 +75,7 @@
<module>jooq</module>
<module>json-patch</module>
<module>jsonapi</module>
+ <module>junit-test-framework</module>
<module>ldif</module>
<module>lucene</module>
<module>main-devmode</module>
diff --git a/integration-tests/cxf-soap-grouped/pom.xml
b/integration-tests/cxf-soap-grouped/pom.xml
index dac79d1b24..2ad623b09b 100644
--- a/integration-tests/cxf-soap-grouped/pom.xml
+++ b/integration-tests/cxf-soap-grouped/pom.xml
@@ -119,11 +119,6 @@
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index c724d68013..bd38add9f8 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -3020,6 +3020,17 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-junit6</artifactId>
+ <version>${camel.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-directvm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-threadpoolfactory-vertx</artifactId>
@@ -5149,6 +5160,11 @@
<artifactId>camel-quarkus-jta-deployment</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-junit</artifactId>
+ <version>${camel-quarkus.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-junit5</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index d247a139f1..7424435ad6 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -2920,6 +2920,17 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-test-junit6</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.17.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.camel</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-directvm</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-threadpoolfactory-vertx</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -5037,6 +5048,11 @@
<artifactId>camel-quarkus-jta-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.31.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-quarkus-junit</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.31.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-quarkus-junit5</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index ee358b7fec..c397eacf42 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -2901,7 +2901,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<version>4.17.0</version>
<exclusions>
<exclusion>
@@ -5027,6 +5027,11 @@
<artifactId>camel-quarkus-jta-deployment</artifactId>
<version>3.31.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-junit</artifactId>
+ <version>3.31.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-junit5</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index 91389984f8..3ed0ccc992 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -2901,7 +2901,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>camel-test-junit5</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-test-junit6</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>4.17.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
@@ -5027,6 +5027,11 @@
<artifactId>camel-quarkus-jta-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.31.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-quarkus-junit</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.31.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-quarkus-junit5</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/test-framework/junit5-extension-tests/pom.xml
b/test-framework/camel-quarkus-junit-tests/pom.xml
similarity index 93%
rename from test-framework/junit5-extension-tests/pom.xml
rename to test-framework/camel-quarkus-junit-tests/pom.xml
index 3305daf085..1d08c6cd19 100644
--- a/test-framework/junit5-extension-tests/pom.xml
+++ b/test-framework/camel-quarkus-junit-tests/pom.xml
@@ -26,8 +26,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-quarkus-junit5-extension-tests</artifactId>
- <name>Camel Quarkus :: Test Framework :: Junit5 :: Extension Tests</name>
+ <artifactId>camel-quarkus-junit-tests</artifactId>
+ <name>Camel Quarkus :: Test Framework :: Junit :: Tests</name>
<dependencies>
<dependency>
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-junit5</artifactId>
+ <artifactId>camel-quarkus-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/continousDev/ContinuousDevTest.java
b/test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/continousDev/ContinuousDevTest.java
similarity index 97%
rename from
test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/continousDev/ContinuousDevTest.java
rename to
test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/continousDev/ContinuousDevTest.java
index fbab891fbf..41213e812f 100644
---
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/continousDev/ContinuousDevTest.java
+++
b/test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/continousDev/ContinuousDevTest.java
@@ -41,7 +41,7 @@ public class ContinuousDevTest {
public JavaArchive get() {
return
ShrinkWrap.create(JavaArchive.class).addClasses(HelloResource.class)
.add(new StringAsset(
-
ContinuousTestingTestUtils.appProperties("camel-quarkus.junit5.message=Sheldon")),
+
ContinuousTestingTestUtils.appProperties("camel-quarkus.junit.message=Sheldon")),
"application.properties");
}
})
@@ -64,7 +64,7 @@ public class ContinuousDevTest {
TEST.modifyResourceFile("application.properties", new Function<String,
String>() {
@Override
public String apply(String s) {
- return
ContinuousTestingTestUtils.appProperties("camel-quarkus.junit5.message=Leonard");
+ return
ContinuousTestingTestUtils.appProperties("camel-quarkus.junit.message=Leonard");
}
});
ts = utils.waitForNextCompletion();
diff --git
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/continousDev/HelloET.java
b/test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/continousDev/HelloET.java
similarity index 100%
rename from
test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/continousDev/HelloET.java
rename to
test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/continousDev/HelloET.java
diff --git
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/continousDev/HelloResource.java
b/test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/continousDev/HelloResource.java
similarity index 96%
rename from
test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/continousDev/HelloResource.java
rename to
test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/continousDev/HelloResource.java
index 95b5f7aafc..32a1e0c6d3 100644
---
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/continousDev/HelloResource.java
+++
b/test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/continousDev/HelloResource.java
@@ -30,7 +30,7 @@ import org.eclipse.microprofile.config.inject.ConfigProperty;
@ApplicationScoped
public class HelloResource {
- @ConfigProperty(name = "camel-quarkus.junit5.message")
+ @ConfigProperty(name = "camel-quarkus.junit.message")
String message;
@Inject
diff --git
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilder/DoubleRoutesTest.java
b/test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilder/DoubleRoutesTest.java
similarity index 100%
rename from
test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilder/DoubleRoutesTest.java
rename to
test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilder/DoubleRoutesTest.java
diff --git
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilder/FirstET.java
b/test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilder/FirstET.java
similarity index 100%
rename from
test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilder/FirstET.java
rename to
test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilder/FirstET.java
diff --git
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilder/RouteBuilder.java
b/test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilder/RouteBuilder.java
similarity index 100%
rename from
test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilder/RouteBuilder.java
rename to
test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilder/RouteBuilder.java
diff --git
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilder/SecondET.java
b/test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilder/SecondET.java
similarity index 100%
rename from
test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilder/SecondET.java
rename to
test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilder/SecondET.java
diff --git
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/producedRouteBuilder/ProducedRouteBuilderET.java
b/test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/producedRouteBuilder/ProducedRouteBuilderET.java
similarity index 100%
rename from
test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/producedRouteBuilder/ProducedRouteBuilderET.java
rename to
test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/producedRouteBuilder/ProducedRouteBuilderET.java
diff --git
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/producedRouteBuilder/ProducedRouteBuilderTest.java
b/test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/producedRouteBuilder/ProducedRouteBuilderTest.java
similarity index 97%
rename from
test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/producedRouteBuilder/ProducedRouteBuilderTest.java
rename to
test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/producedRouteBuilder/ProducedRouteBuilderTest.java
index dfe0a81e59..1ff1cd25aa 100644
---
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/producedRouteBuilder/ProducedRouteBuilderTest.java
+++
b/test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/producedRouteBuilder/ProducedRouteBuilderTest.java
@@ -39,7 +39,7 @@ public class ProducedRouteBuilderTest {
public JavaArchive get() {
return ShrinkWrap.create(JavaArchive.class)
.add(new StringAsset(
-
ContinuousTestingTestUtils.appProperties("camel-quarkus.junit5.message=Sheldon")),
+
ContinuousTestingTestUtils.appProperties("camel-quarkus.junit.message=Sheldon")),
"application.properties");
}
})
diff --git
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderFailureET.java
b/test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderFailureET.java
similarity index 100%
rename from
test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderFailureET.java
rename to
test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderFailureET.java
diff --git
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderFailureTest.java
b/test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderFailureTest.java
similarity index 98%
rename from
test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderFailureTest.java
rename to
test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderFailureTest.java
index ef8b01e586..f181978b52 100644
---
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderFailureTest.java
+++
b/test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderFailureTest.java
@@ -39,7 +39,7 @@ public class RouteBuilderFailureTest {
JavaArchive ja = ShrinkWrap.create(JavaArchive.class)
.addClasses(RouteBuilderFailureET.class,
HelloResource.class)
.add(new StringAsset(
-
ContinuousTestingTestUtils.appProperties("camel-quarkus.junit5.message=Sheldon")),
+
ContinuousTestingTestUtils.appProperties("camel-quarkus.junit.message=Sheldon")),
"application.properties");
return ja;
})
diff --git
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningET.java
b/test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningET.java
similarity index 100%
rename from
test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningET.java
rename to
test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningET.java
diff --git
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningWithProducedBuilderTest.java
b/test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningWithProducedBuilderTest.java
similarity index 100%
rename from
test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningWithProducedBuilderTest.java
rename to
test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningWithProducedBuilderTest.java
diff --git
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningWithoutProducedBuilderTest.java
b/test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningWithoutProducedBuilderTest.java
similarity index 100%
rename from
test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningWithoutProducedBuilderTest.java
rename to
test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningWithoutProducedBuilderTest.java
diff --git
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteProducer.java
b/test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteProducer.java
similarity index 100%
rename from
test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteProducer.java
rename to
test-framework/camel-quarkus-junit-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteProducer.java
diff --git a/test-framework/junit5/pom.xml
b/test-framework/camel-quarkus-junit/pom.xml
similarity index 94%
copy from test-framework/junit5/pom.xml
copy to test-framework/camel-quarkus-junit/pom.xml
index 4d2383ea72..5c3f184afe 100644
--- a/test-framework/junit5/pom.xml
+++ b/test-framework/camel-quarkus-junit/pom.xml
@@ -26,8 +26,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-quarkus-junit5</artifactId>
- <name>Camel Quarkus :: Test Framework :: Junit5</name>
+ <artifactId>camel-quarkus-junit</artifactId>
+ <name>Camel Quarkus :: Test Framework :: Junit</name>
<dependencies>
<dependency>
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/AfterAllCallback.java
b/test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/AfterAllCallback.java
similarity index 100%
rename from
test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/AfterAllCallback.java
rename to
test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/AfterAllCallback.java
diff --git
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/AfterConstructCallback.java
b/test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/AfterConstructCallback.java
similarity index 100%
rename from
test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/AfterConstructCallback.java
rename to
test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/AfterConstructCallback.java
diff --git
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/AfterEachCallback.java
b/test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/AfterEachCallback.java
similarity index 100%
rename from
test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/AfterEachCallback.java
rename to
test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/AfterEachCallback.java
diff --git
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/BeforeEachCallback.java
b/test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/BeforeEachCallback.java
similarity index 100%
rename from
test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/BeforeEachCallback.java
rename to
test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/BeforeEachCallback.java
diff --git
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java
b/test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java
similarity index 100%
rename from
test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java
rename to
test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java
diff --git
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java
b/test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java
similarity index 97%
rename from
test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java
rename to
test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java
index 06274cadf9..e39f41cb52 100644
---
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java
+++
b/test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java
@@ -39,15 +39,15 @@ import org.apache.camel.model.RouteDefinition;
import org.apache.camel.quarkus.core.FastCamelContext;
import org.apache.camel.quarkus.test.CallbackUtil.MockExtensionContext;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit5.AbstractTestSupport;
-import org.apache.camel.test.junit5.CamelContextConfiguration;
-import org.apache.camel.test.junit5.CamelContextManager;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.apache.camel.test.junit5.ContextManagerFactory;
-import org.apache.camel.test.junit5.TestExecutionConfiguration;
-import org.apache.camel.test.junit5.TestSupport;
-import org.apache.camel.test.junit5.util.ExtensionHelper;
-import org.apache.camel.test.junit5.util.RouteCoverageDumperExtension;
+import org.apache.camel.test.junit6.AbstractTestSupport;
+import org.apache.camel.test.junit6.CamelContextConfiguration;
+import org.apache.camel.test.junit6.CamelContextManager;
+import org.apache.camel.test.junit6.CamelTestSupport;
+import org.apache.camel.test.junit6.ContextManagerFactory;
+import org.apache.camel.test.junit6.TestExecutionConfiguration;
+import org.apache.camel.test.junit6.TestSupport;
+import org.apache.camel.test.junit6.util.ExtensionHelper;
+import org.apache.camel.test.junit6.util.RouteCoverageDumperExtension;
import org.apache.camel.util.StopWatch;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.TestInstance;
diff --git
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/ContextNotStoppingManagerFactory.java
b/test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/ContextNotStoppingManagerFactory.java
similarity index 86%
rename from
test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/ContextNotStoppingManagerFactory.java
rename to
test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/ContextNotStoppingManagerFactory.java
index 0ea21dd066..c67bcd739d 100644
---
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/ContextNotStoppingManagerFactory.java
+++
b/test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/ContextNotStoppingManagerFactory.java
@@ -17,10 +17,10 @@
package org.apache.camel.quarkus.test;
-import org.apache.camel.test.junit5.CamelContextConfiguration;
-import org.apache.camel.test.junit5.CamelContextManager;
-import org.apache.camel.test.junit5.ContextManagerFactory;
-import org.apache.camel.test.junit5.TestExecutionConfiguration;
+import org.apache.camel.test.junit6.CamelContextConfiguration;
+import org.apache.camel.test.junit6.CamelContextManager;
+import org.apache.camel.test.junit6.ContextManagerFactory;
+import org.apache.camel.test.junit6.TestExecutionConfiguration;
/**
* A factory class for creating context managers
diff --git
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CustomCamelContextConfiguration.java
b/test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/CustomCamelContextConfiguration.java
similarity index 96%
rename from
test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CustomCamelContextConfiguration.java
rename to
test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/CustomCamelContextConfiguration.java
index 54fb6aebc7..8424238f75 100644
---
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CustomCamelContextConfiguration.java
+++
b/test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/CustomCamelContextConfiguration.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.quarkus.test;
-import org.apache.camel.test.junit5.CamelContextConfiguration;
+import org.apache.camel.test.junit6.CamelContextConfiguration;
public final class CustomCamelContextConfiguration extends
CamelContextConfiguration {
diff --git
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CustomTestExecutionConfiguration.java
b/test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/CustomTestExecutionConfiguration.java
similarity index 95%
rename from
test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CustomTestExecutionConfiguration.java
rename to
test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/CustomTestExecutionConfiguration.java
index f07265f08f..2df8b12777 100644
---
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CustomTestExecutionConfiguration.java
+++
b/test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/CustomTestExecutionConfiguration.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.quarkus.test;
-import org.apache.camel.test.junit5.TestExecutionConfiguration;
+import org.apache.camel.test.junit6.TestExecutionConfiguration;
public final class CustomTestExecutionConfiguration extends
TestExecutionConfiguration {
diff --git
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/LegacyCamelContextNotStoppingManager.java
b/test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/LegacyCamelContextNotStoppingManager.java
similarity index 86%
rename from
test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/LegacyCamelContextNotStoppingManager.java
rename to
test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/LegacyCamelContextNotStoppingManager.java
index 7a831415bf..964fea125e 100644
---
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/LegacyCamelContextNotStoppingManager.java
+++
b/test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/LegacyCamelContextNotStoppingManager.java
@@ -19,10 +19,10 @@ package org.apache.camel.quarkus.test;
import org.apache.camel.CamelContext;
import org.apache.camel.Service;
-import org.apache.camel.test.junit5.CamelContextConfiguration;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.apache.camel.test.junit5.LegacyCamelContextManager;
-import org.apache.camel.test.junit5.TestExecutionConfiguration;
+import org.apache.camel.test.junit6.CamelContextConfiguration;
+import org.apache.camel.test.junit6.CamelTestSupport;
+import org.apache.camel.test.junit6.LegacyCamelContextManager;
+import org.apache.camel.test.junit6.TestExecutionConfiguration;
/**
* A {@link CamelContext} test lifecycle manager based on the behavior that
was built in {@link CamelTestSupport} up to
diff --git
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/TransientCamelContextNotStoppingManager.java
b/test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/TransientCamelContextNotStoppingManager.java
similarity index 88%
rename from
test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/TransientCamelContextNotStoppingManager.java
rename to
test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/TransientCamelContextNotStoppingManager.java
index bca3d43bfe..f3fc3aa7bf 100644
---
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/TransientCamelContextNotStoppingManager.java
+++
b/test-framework/camel-quarkus-junit/src/main/java/org/apache/camel/quarkus/test/TransientCamelContextNotStoppingManager.java
@@ -19,9 +19,9 @@ package org.apache.camel.quarkus.test;
import org.apache.camel.CamelContext;
import org.apache.camel.Service;
-import org.apache.camel.test.junit5.CamelContextConfiguration;
-import org.apache.camel.test.junit5.TestExecutionConfiguration;
-import org.apache.camel.test.junit5.TransientCamelContextManager;
+import org.apache.camel.test.junit6.CamelContextConfiguration;
+import org.apache.camel.test.junit6.TestExecutionConfiguration;
+import org.apache.camel.test.junit6.TransientCamelContextManager;
public class TransientCamelContextNotStoppingManager extends
TransientCamelContextManager {
diff --git
a/test-framework/junit5/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterAllCallback
b/test-framework/camel-quarkus-junit/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterAllCallback
similarity index 100%
rename from
test-framework/junit5/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterAllCallback
rename to
test-framework/camel-quarkus-junit/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterAllCallback
diff --git
a/test-framework/junit5/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback
b/test-framework/camel-quarkus-junit/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback
similarity index 100%
rename from
test-framework/junit5/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback
rename to
test-framework/camel-quarkus-junit/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback
diff --git
a/test-framework/junit5/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback
b/test-framework/camel-quarkus-junit/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback
similarity index 100%
rename from
test-framework/junit5/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback
rename to
test-framework/camel-quarkus-junit/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback
diff --git
a/test-framework/junit5/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestBeforeEachCallback
b/test-framework/camel-quarkus-junit/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestBeforeEachCallback
similarity index 100%
rename from
test-framework/junit5/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestBeforeEachCallback
rename to
test-framework/camel-quarkus-junit/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestBeforeEachCallback
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractSimpleMockTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/common/AbstractSimpleMockTest.java
similarity index 100%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractSimpleMockTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/common/AbstractSimpleMockTest.java
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/JupiterCallbackCorrectTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/common/JupiterCallbackCorrectTest.java
similarity index 100%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/JupiterCallbackCorrectTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/common/JupiterCallbackCorrectTest.java
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/CamelTestSupportTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/CamelTestSupportTest.java
similarity index 98%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/CamelTestSupportTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/CamelTestSupportTest.java
index ab24e6a714..52de1c48fa 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/CamelTestSupportTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/CamelTestSupportTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5;
+package org.apache.camel.quarkus.test.junit6;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternExcludeTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/RouteFilterPatternExcludeTest.java
similarity index 98%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternExcludeTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/RouteFilterPatternExcludeTest.java
index 8955d4f96d..9951b407af 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternExcludeTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/RouteFilterPatternExcludeTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5;
+package org.apache.camel.quarkus.test.junit6;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternIncludeExcludeTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/RouteFilterPatternIncludeExcludeTest.java
similarity index 98%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternIncludeExcludeTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/RouteFilterPatternIncludeExcludeTest.java
index c2b87805da..f317d9f965 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternIncludeExcludeTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/RouteFilterPatternIncludeExcludeTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5;
+package org.apache.camel.quarkus.test.junit6;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternIncludeTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/RouteFilterPatternIncludeTest.java
similarity index 98%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternIncludeTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/RouteFilterPatternIncludeTest.java
index eeced6cb9c..e0c2a78591 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternIncludeTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/RouteFilterPatternIncludeTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5;
+package org.apache.camel.quarkus.test.junit6;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/AdviceWithAnotherRouteTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/AdviceWithAnotherRouteTest.java
similarity index 98%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/AdviceWithAnotherRouteTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/AdviceWithAnotherRouteTest.java
index 493f952766..7d52b6b712 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/AdviceWithAnotherRouteTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/AdviceWithAnotherRouteTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import java.util.Properties;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/AdviceWithLambdaTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/AdviceWithLambdaTest.java
similarity index 97%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/AdviceWithLambdaTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/AdviceWithLambdaTest.java
index 7004519f3f..64c39c0a78 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/AdviceWithLambdaTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/AdviceWithLambdaTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugNoLazyTypeConverterTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/DebugNoLazyTypeConverterTest.java
similarity index 97%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugNoLazyTypeConverterTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/DebugNoLazyTypeConverterTest.java
index f916f27760..c781e51fa4 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugNoLazyTypeConverterTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/DebugNoLazyTypeConverterTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import io.quarkus.test.junit.QuarkusTest;
import org.apache.camel.Exchange;
@@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.quarkus.test.CamelQuarkusTestSupport;
-import org.apache.camel.test.junit5.DebugBreakpoint;
+import org.apache.camel.test.junit6.DebugBreakpoint;
import org.jboss.logging.Logger;
import org.junit.jupiter.api.Test;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/DebugTest.java
similarity index 97%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/DebugTest.java
index f713dc5d4a..51c3df84ae 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/DebugTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import io.quarkus.test.junit.QuarkusTest;
import org.apache.camel.Exchange;
@@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.quarkus.test.CamelQuarkusTestSupport;
-import org.apache.camel.test.junit5.DebugBreakpoint;
+import org.apache.camel.test.junit6.DebugBreakpoint;
import org.jboss.logging.Logger;
import org.junit.jupiter.api.Test;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugJUnit5Test.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/DebugUnitTest.java
similarity index 92%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugJUnit5Test.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/DebugUnitTest.java
index 19797864c5..f1e22d134f 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugJUnit5Test.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/DebugUnitTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
@@ -24,17 +24,17 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.quarkus.test.CamelQuarkusTestSupport;
-import org.apache.camel.test.junit5.DebugBreakpoint;
+import org.apache.camel.test.junit6.DebugBreakpoint;
import org.jboss.logging.Logger;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
@QuarkusTest
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@TestProfile(DebugJUnit5Test.class)
-public class DebugJUnit5Test extends CamelQuarkusTestSupport {
+@TestProfile(DebugUnitTest.class)
+public class DebugUnitTest extends CamelQuarkusTestSupport {
- private static final Logger LOG = Logger.getLogger(DebugJUnit5Test.class);
+ private static final Logger LOG = Logger.getLogger(DebugUnitTest.class);
private TestDebugBreakpoint testDebugBreakpoint;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/FilterCreateCamelContextPerClassTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/FilterCreateCamelContextPerClassTest.java
similarity index 97%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/FilterCreateCamelContextPerClassTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/FilterCreateCamelContextPerClassTest.java
index abd812e209..cec88c96b8 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/FilterCreateCamelContextPerClassTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/FilterCreateCamelContextPerClassTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/FilterFluentTemplateTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/FilterFluentTemplateTest.java
similarity index 97%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/FilterFluentTemplateTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/FilterFluentTemplateTest.java
index a250c94128..a299b66754 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/FilterFluentTemplateTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/FilterFluentTemplateTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import io.quarkus.test.junit.QuarkusTest;
import org.apache.camel.EndpointInject;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/FilterJUnit5Test.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/FilterJUnit5Test.java
similarity index 97%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/FilterJUnit5Test.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/FilterJUnit5Test.java
index 24bbb4b1ca..7fb8b4b745 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/FilterJUnit5Test.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/FilterJUnit5Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import io.quarkus.test.junit.QuarkusTest;
import org.apache.camel.EndpointInject;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/FilterTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/FilterTest.java
similarity index 97%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/FilterTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/FilterTest.java
index feca9fc937..589ce4ae33 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/FilterTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/FilterTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import io.quarkus.test.junit.QuarkusTest;
import org.apache.camel.EndpointInject;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/GetMockEndpointTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/GetMockEndpointTest.java
similarity index 96%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/GetMockEndpointTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/GetMockEndpointTest.java
index 553a0973d2..5cb21d2058 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/GetMockEndpointTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/GetMockEndpointTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import io.quarkus.test.junit.QuarkusTest;
import org.apache.camel.RoutesBuilder;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/IsMockEndpointsAndSkipJUnit5Test.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/IsMockEndpointsAndSkipJUnit5Test.java
similarity index 98%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/IsMockEndpointsAndSkipJUnit5Test.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/IsMockEndpointsAndSkipJUnit5Test.java
index 9205b055d6..8ab0ec07ec 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/IsMockEndpointsAndSkipJUnit5Test.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/IsMockEndpointsAndSkipJUnit5Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/IsMockEndpointsFileTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/IsMockEndpointsFileTest.java
similarity index 95%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/IsMockEndpointsFileTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/IsMockEndpointsFileTest.java
index be14f1861e..e55da47ea0 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/IsMockEndpointsFileTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/IsMockEndpointsFileTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import io.quarkus.test.junit.QuarkusTest;
import org.apache.camel.Exchange;
@@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.quarkus.test.CamelQuarkusTestSupport;
import org.junit.jupiter.api.Test;
-import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.apache.camel.test.junit6.TestSupport.deleteDirectory;
@QuarkusTest
public class IsMockEndpointsFileTest extends CamelQuarkusTestSupport {
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/IsMockEndpointsJUnit5Test.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/IsMockEndpointsJUnit5Test.java
similarity index 98%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/IsMockEndpointsJUnit5Test.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/IsMockEndpointsJUnit5Test.java
index 96c3816bf6..050f152bb4 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/IsMockEndpointsJUnit5Test.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/IsMockEndpointsJUnit5Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import io.quarkus.test.junit.QuarkusTest;
import org.apache.camel.builder.RouteBuilder;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/IsMockEndpointsTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/IsMockEndpointsTest.java
similarity index 97%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/IsMockEndpointsTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/IsMockEndpointsTest.java
index ec6f87093a..a525f4c381 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/IsMockEndpointsTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/IsMockEndpointsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import io.quarkus.test.junit.QuarkusTest;
import org.apache.camel.builder.RouteBuilder;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/MockEndpointFailNoHeaderTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/MockEndpointFailNoHeaderTest.java
similarity index 97%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/MockEndpointFailNoHeaderTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/MockEndpointFailNoHeaderTest.java
index 59392adff9..fed5692355 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/MockEndpointFailNoHeaderTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/MockEndpointFailNoHeaderTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import io.quarkus.test.junit.QuarkusTest;
import org.apache.camel.EndpointInject;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/MyProduceBean.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/MyProduceBean.java
similarity index 94%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/MyProduceBean.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/MyProduceBean.java
index 45ec3369bb..1f9d333fe9 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/MyProduceBean.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/MyProduceBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import org.apache.camel.Produce;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/MySender.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/MySender.java
similarity index 94%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/MySender.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/MySender.java
index f0d13314e5..83bbed81d7 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/MySender.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/MySender.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
/**
*
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/ProduceBeanTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/ProduceBeanTest.java
similarity index 96%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/ProduceBeanTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/ProduceBeanTest.java
index 17db1d5d61..f51bbbdc28 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/ProduceBeanTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/ProduceBeanTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import io.quarkus.test.junit.QuarkusTest;
import org.apache.camel.builder.RouteBuilder;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/RouteBuilderConfigureExceptionTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/RouteBuilderConfigureExceptionTest.java
similarity index 96%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/RouteBuilderConfigureExceptionTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/RouteBuilderConfigureExceptionTest.java
index 263adf28f9..423b5a5e99 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/RouteBuilderConfigureExceptionTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/RouteBuilderConfigureExceptionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import io.quarkus.test.junit.QuarkusTest;
import org.apache.camel.Predicate;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/RouteProcessorDumpRouteCoverageTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/RouteProcessorDumpRouteCoverageTest.java
similarity index 86%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/RouteProcessorDumpRouteCoverageTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/RouteProcessorDumpRouteCoverageTest.java
index a986b29ce2..db00715514 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/RouteProcessorDumpRouteCoverageTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/RouteProcessorDumpRouteCoverageTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.TestReporter;
-import static org.apache.camel.test.junit5.TestSupport.assertFileExists;
+import static org.apache.camel.test.junit6.TestSupport.assertFileExists;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -40,13 +40,13 @@ public class RouteProcessorDumpRouteCoverageTest extends
CamelQuarkusTestSupport
}
@Test
- public void testProcessorJunit5() {
+ public void testProcessor() {
String out = template.requestBody("direct:start", "Hello World",
String.class);
assertEquals("Bye World", out);
}
@Test
- public void testProcessorJunit5WithTestParameterInjection(TestInfo info,
TestReporter testReporter) {
+ public void testProcessorWithTestParameterInjection(TestInfo info,
TestReporter testReporter) {
assertNotNull(info);
assertNotNull(testReporter);
String out = template.requestBody("direct:start", "Hello World",
String.class);
@@ -56,9 +56,9 @@ public class RouteProcessorDumpRouteCoverageTest extends
CamelQuarkusTestSupport
@AfterAll
public static void checkDumpFilesCreatedAfterTests() {
// should create that file when test is done
-
assertFileExists("target/camel-route-coverage/RouteProcessorDumpRouteCoverageTest-testProcessorJunit5.xml");
+
assertFileExists("target/camel-route-coverage/RouteProcessorDumpRouteCoverageTest-testProcessor.xml");
assertFileExists(
-
"target/camel-route-coverage/RouteProcessorDumpRouteCoverageTest-testProcessorJunit5WithTestParameterInjection.xml");
+
"target/camel-route-coverage/RouteProcessorDumpRouteCoverageTest-testProcessorWithTestParameterInjection.xml");
}
@Override
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/SimpleMockEndpointsTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/SimpleMockEndpointsTest.java
similarity index 97%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/SimpleMockEndpointsTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/SimpleMockEndpointsTest.java
index 5e4142c228..e55835e51a 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/SimpleMockEndpointsTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/SimpleMockEndpointsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import io.quarkus.test.junit.QuarkusTest;
import org.apache.camel.Produce;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/SimpleNotifyBuilderTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/SimpleNotifyBuilderTest.java
similarity index 97%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/SimpleNotifyBuilderTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/SimpleNotifyBuilderTest.java
index 5cd5729da6..1193d52569 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/SimpleNotifyBuilderTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/SimpleNotifyBuilderTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import java.util.concurrent.TimeUnit;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/SimpleWeaveAddMockLastTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/SimpleWeaveAddMockLastTest.java
similarity index 97%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/SimpleWeaveAddMockLastTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/SimpleWeaveAddMockLastTest.java
index 81e369ed5e..2c5f8fa4ec 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/SimpleWeaveAddMockLastTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/SimpleWeaveAddMockLastTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/TestDebugBreakpoint.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/TestDebugBreakpoint.java
similarity index 94%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/TestDebugBreakpoint.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/TestDebugBreakpoint.java
index 35289e1210..3c5aaad166 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/TestDebugBreakpoint.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/TestDebugBreakpoint.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.model.ProcessorDefinition;
-import org.apache.camel.test.junit5.DebugBreakpoint;
+import org.apache.camel.test.junit6.DebugBreakpoint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/UseOverridePropertiesWithPropertiesComponentTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/UseOverridePropertiesWithPropertiesComponentTest.java
similarity index 98%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/UseOverridePropertiesWithPropertiesComponentTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/UseOverridePropertiesWithPropertiesComponentTest.java
index 7432bfb0ee..b00b370508 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/UseOverridePropertiesWithPropertiesComponentTest.java
+++
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/junit6/patterns/UseOverridePropertiesWithPropertiesComponentTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.test.junit5.patterns;
+package org.apache.camel.quarkus.test.junit6.patterns;
import java.util.Properties;
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/userTestCases/AdviceInDoBeforeEachMethodsTest.java
b/test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/userTestCases/AdviceInDoBeforeEachMethodsTest.java
similarity index 100%
rename from
test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/userTestCases/AdviceInDoBeforeEachMethodsTest.java
rename to
test-framework/camel-quarkus-junit/src/test/java/org/apache/camel/quarkus/test/userTestCases/AdviceInDoBeforeEachMethodsTest.java
diff --git a/test-framework/junit5/pom.xml b/test-framework/junit5/pom.xml
index 4d2383ea72..8d2e89ebae 100644
--- a/test-framework/junit5/pom.xml
+++ b/test-framework/junit5/pom.xml
@@ -27,50 +27,13 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>camel-quarkus-junit5</artifactId>
- <name>Camel Quarkus :: Test Framework :: Junit5</name>
+ <name>Camel Quarkus :: Test Framework :: Junit5 (Deprecated)</name>
+ <description>DEPRECATED: This artifact has moved to
org.apache.camel.quarkus:camel-quarkus-junit</description>
<dependencies>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-bean</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-management</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
+ <artifactId>camel-quarkus-junit</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/test-framework/pom.xml b/test-framework/pom.xml
index 9bc382f2ce..f1e4bd7428 100644
--- a/test-framework/pom.xml
+++ b/test-framework/pom.xml
@@ -33,8 +33,9 @@
<name>Camel Quarkus :: Test Framework :: Parent</name>
<modules>
+ <module>camel-quarkus-junit</module>
+ <module>camel-quarkus-junit-tests</module>
<module>junit5</module>
- <module>junit5-extension-tests</module>
</modules>
<dependencyManagement>
diff --git a/tooling/test-list/pom.xml b/tooling/test-list/pom.xml
index 335b88e260..b20e5cb11a 100644
--- a/tooling/test-list/pom.xml
+++ b/tooling/test-list/pom.xml
@@ -67,13 +67,13 @@
</excludes>
</fileSet>
<fileSet>
-
<directory>${basedir}/../../test-framework/junit5</directory>
+
<directory>${basedir}/../../test-framework/camel-quarkus-junit</directory>
<includes>
<include>pom.xml</include>
</includes>
</fileSet>
<fileSet>
-
<directory>${basedir}/../../test-framework/junit5-extension-tests</directory>
+
<directory>${basedir}/../../test-framework/camel-quarkus-junit-tests</directory>
<includes>
<include>pom.xml</include>
</includes>
