diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8a3a69b2a..08e0e6db1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,3 +34,25 @@ jobs:
cache: maven
- name: Build with Maven
run: mvn --batch-mode --no-transfer-progress clean verify
+
+ # Test JUnit Jupiter module with JUnit 6 (requires Java 17+)
+ junit6-verify:
+ name: Verify JUnit Jupiter with JUnit 6 - JDK ${{ matrix.java }}
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+ strategy:
+ matrix:
+ java:
+ - 17
+ - 21
+ steps:
+ - name: Checkout arquillian-core
+ uses: actions/checkout@v6
+ - name: Setup JDK ${{ matrix.java }}
+ uses: actions/setup-java@v5
+ with:
+ java-version: ${{ matrix.java }}
+ distribution: temurin
+ cache: maven
+ - name: Build with JUnit 6
+ run: mvn --batch-mode --no-transfer-progress clean verify -Pjunit6 -pl junit-jupiter/core,junit-jupiter/container -am
diff --git a/bom/pom.xml b/bom/pom.xml
index d035a3592..6cdbc04b1 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -130,7 +130,7 @@
${project.version}
-
+
org.jboss.arquillian.junit
arquillian-junit-core
@@ -147,7 +147,19 @@
${project.version}
-
+
+
+ org.jboss.arquillian.jupiter
+ arquillian-junit-jupiter-core
+ ${project.version}
+
+
+ org.jboss.arquillian.jupiter
+ arquillian-junit-jupiter-container
+ ${project.version}
+
+
+
org.jboss.arquillian.junit5
arquillian-junit5-core
diff --git a/build/pom.xml b/build/pom.xml
index 0c8d7dd43..8d75f8ddc 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -25,7 +25,7 @@
1
4.13.2
- 5.14.3
+ 5.14.3
4.11.0
7.5
3.27.7
@@ -68,7 +68,7 @@
org.junit
junit-bom
- ${version.junit5}
+ ${version.junit-jupiter}
pom
import
@@ -121,4 +121,15 @@
+
+
+
+
+ junit6
+
+ 6.0.2
+
+
+
+
diff --git a/integration-tests/junit5-tests/pom.xml b/integration-tests/junit5-tests/pom.xml
index 39446792e..3b5eb91e2 100644
--- a/integration-tests/junit5-tests/pom.xml
+++ b/integration-tests/junit5-tests/pom.xml
@@ -43,8 +43,8 @@
test
- org.jboss.arquillian.junit5
- arquillian-junit5-container
+ org.jboss.arquillian.jupiter
+ arquillian-junit-jupiter-container
test
diff --git a/junit5/README.adoc b/junit-jupiter/README.adoc
similarity index 60%
rename from junit5/README.adoc
rename to junit-jupiter/README.adoc
index 703433089..0b4ac2944 100644
--- a/junit5/README.adoc
+++ b/junit-jupiter/README.adoc
@@ -6,10 +6,9 @@ This module provides Arquillian integration for JUnit Jupiter.
This module supports the *JUnit Jupiter* platform.
-[IMPORTANT]
+[NOTE]
====
-Despite the `junit5` naming convention, this module provides first-class support for both **JUnit 5** and **JUnit 6**.
-The module name reflects the integration origin rather than a version limitation.
+This module supports both **JUnit 5** and **JUnit 6** as they share compatible JUnit Jupiter API.
====
== JDK Compatibility
@@ -24,8 +23,8 @@ The minimum JDK requirement depends on the version of JUnit used:
[source,xml]
----
- org.jboss.arquillian.junit5
- arquillian-junit5-container
+ org.jboss.arquillian.jupiter
+ arquillian-junit-jupiter-container
${org.arquillian.version}
----
diff --git a/junit5/container/pom.xml b/junit-jupiter/container/pom.xml
similarity index 92%
rename from junit5/container/pom.xml
rename to junit-jupiter/container/pom.xml
index f683d072a..728f219c2 100644
--- a/junit5/container/pom.xml
+++ b/junit-jupiter/container/pom.xml
@@ -9,10 +9,10 @@
../../build/pom.xml
- org.jboss.arquillian.junit5
- arquillian-junit5-container
+ org.jboss.arquillian.jupiter
+ arquillian-junit-jupiter-container
- Arquillian TestRunner JUnit 5 Container
+ Arquillian TestRunner JUnit Jupiter Container
1.8
@@ -63,8 +63,8 @@
- org.jboss.arquillian.junit5
- arquillian-junit5-core
+ org.jboss.arquillian.jupiter
+ arquillian-junit-jupiter-core
${project.version}
diff --git a/junit5/container/src/main/java/org/jboss/arquillian/junit5/container/JUnitJupiterContainerExtension.java b/junit-jupiter/container/src/main/java/org/jboss/arquillian/junit5/container/JUnitJupiterContainerExtension.java
similarity index 100%
rename from junit5/container/src/main/java/org/jboss/arquillian/junit5/container/JUnitJupiterContainerExtension.java
rename to junit-jupiter/container/src/main/java/org/jboss/arquillian/junit5/container/JUnitJupiterContainerExtension.java
diff --git a/junit5/container/src/main/java/org/jboss/arquillian/junit5/container/JUnitJupiterDeploymentAppender.java b/junit-jupiter/container/src/main/java/org/jboss/arquillian/junit5/container/JUnitJupiterDeploymentAppender.java
similarity index 100%
rename from junit5/container/src/main/java/org/jboss/arquillian/junit5/container/JUnitJupiterDeploymentAppender.java
rename to junit-jupiter/container/src/main/java/org/jboss/arquillian/junit5/container/JUnitJupiterDeploymentAppender.java
diff --git a/junit5/container/src/main/java/org/jboss/arquillian/junit5/container/JUnitJupiterRemoteExtension.java b/junit-jupiter/container/src/main/java/org/jboss/arquillian/junit5/container/JUnitJupiterRemoteExtension.java
similarity index 100%
rename from junit5/container/src/main/java/org/jboss/arquillian/junit5/container/JUnitJupiterRemoteExtension.java
rename to junit-jupiter/container/src/main/java/org/jboss/arquillian/junit5/container/JUnitJupiterRemoteExtension.java
diff --git a/junit5/container/src/main/java/org/jboss/arquillian/junit5/container/JUnitJupiterTestRunner.java b/junit-jupiter/container/src/main/java/org/jboss/arquillian/junit5/container/JUnitJupiterTestRunner.java
similarity index 100%
rename from junit5/container/src/main/java/org/jboss/arquillian/junit5/container/JUnitJupiterTestRunner.java
rename to junit-jupiter/container/src/main/java/org/jboss/arquillian/junit5/container/JUnitJupiterTestRunner.java
diff --git a/junit5/container/src/main/java/org/jboss/arquillian/junit5/container/RunModeEventHandler.java b/junit-jupiter/container/src/main/java/org/jboss/arquillian/junit5/container/RunModeEventHandler.java
similarity index 100%
rename from junit5/container/src/main/java/org/jboss/arquillian/junit5/container/RunModeEventHandler.java
rename to junit-jupiter/container/src/main/java/org/jboss/arquillian/junit5/container/RunModeEventHandler.java
diff --git a/junit5/container/src/main/java/org/jboss/arquillian/junit5/container/annotation/ArquillianTest.java b/junit-jupiter/container/src/main/java/org/jboss/arquillian/junit5/container/annotation/ArquillianTest.java
similarity index 100%
rename from junit5/container/src/main/java/org/jboss/arquillian/junit5/container/annotation/ArquillianTest.java
rename to junit-jupiter/container/src/main/java/org/jboss/arquillian/junit5/container/annotation/ArquillianTest.java
diff --git a/junit5/container/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/junit-jupiter/container/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
similarity index 100%
rename from junit5/container/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
rename to junit-jupiter/container/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
diff --git a/junit5/container/src/test/java/org/jboss/arquillian/junit5/container/ClassWithArquillianExtensionAndParameterizedTest.java b/junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/ClassWithArquillianExtensionAndParameterizedTest.java
similarity index 100%
rename from junit5/container/src/test/java/org/jboss/arquillian/junit5/container/ClassWithArquillianExtensionAndParameterizedTest.java
rename to junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/ClassWithArquillianExtensionAndParameterizedTest.java
diff --git a/junit5/container/src/test/java/org/jboss/arquillian/junit5/container/ClassWithArquillianExtensionWithExtensions.java b/junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/ClassWithArquillianExtensionWithExtensions.java
similarity index 100%
rename from junit5/container/src/test/java/org/jboss/arquillian/junit5/container/ClassWithArquillianExtensionWithExtensions.java
rename to junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/ClassWithArquillianExtensionWithExtensions.java
diff --git a/junit5/container/src/test/java/org/jboss/arquillian/junit5/container/ExampleSuite.java b/junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/ExampleSuite.java
similarity index 100%
rename from junit5/container/src/test/java/org/jboss/arquillian/junit5/container/ExampleSuite.java
rename to junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/ExampleSuite.java
diff --git a/junit5/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitIntegrationTestCase.java b/junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitIntegrationTestCase.java
similarity index 100%
rename from junit5/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitIntegrationTestCase.java
rename to junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitIntegrationTestCase.java
diff --git a/junit5/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitJupiterDeploymentAppenderTestCase.java b/junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitJupiterDeploymentAppenderTestCase.java
similarity index 100%
rename from junit5/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitJupiterDeploymentAppenderTestCase.java
rename to junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitJupiterDeploymentAppenderTestCase.java
diff --git a/junit5/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitJupiterTestRunnerTestCase.java b/junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitJupiterTestRunnerTestCase.java
similarity index 100%
rename from junit5/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitJupiterTestRunnerTestCase.java
rename to junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitJupiterTestRunnerTestCase.java
diff --git a/junit5/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitParameterizedTestCase.java b/junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitParameterizedTestCase.java
similarity index 100%
rename from junit5/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitParameterizedTestCase.java
rename to junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitParameterizedTestCase.java
diff --git a/junit5/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitTestBaseClass.java b/junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitTestBaseClass.java
similarity index 100%
rename from junit5/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitTestBaseClass.java
rename to junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitTestBaseClass.java
diff --git a/junit5/container/src/test/java/org/jboss/arquillian/junit5/container/TestScenarios.java b/junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/TestScenarios.java
similarity index 100%
rename from junit5/container/src/test/java/org/jboss/arquillian/junit5/container/TestScenarios.java
rename to junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/TestScenarios.java
diff --git a/junit5/container/src/test/java/org/jboss/arquillian/junit5/container/TestsWithIncludesExcludes.java b/junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/TestsWithIncludesExcludes.java
similarity index 100%
rename from junit5/container/src/test/java/org/jboss/arquillian/junit5/container/TestsWithIncludesExcludes.java
rename to junit-jupiter/container/src/test/java/org/jboss/arquillian/junit5/container/TestsWithIncludesExcludes.java
diff --git a/junit5/core/pom.xml b/junit-jupiter/core/pom.xml
similarity index 89%
rename from junit5/core/pom.xml
rename to junit-jupiter/core/pom.xml
index 3cbbac9c0..23546d3bb 100644
--- a/junit5/core/pom.xml
+++ b/junit-jupiter/core/pom.xml
@@ -9,10 +9,10 @@
../../build/pom.xml
- org.jboss.arquillian.junit5
- arquillian-junit5-core
+ org.jboss.arquillian.jupiter
+ arquillian-junit-jupiter-core
- Arquillian TestRunner JUnit 5 Core
+ Arquillian TestRunner JUnit Jupiter Core
1.8
diff --git a/junit5/core/src/main/java/org/jboss/arquillian/junit5/ArquillianExtension.java b/junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/ArquillianExtension.java
similarity index 100%
rename from junit5/core/src/main/java/org/jboss/arquillian/junit5/ArquillianExtension.java
rename to junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/ArquillianExtension.java
diff --git a/junit5/core/src/main/java/org/jboss/arquillian/junit5/BeforeTestExecutionEvent.java b/junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/BeforeTestExecutionEvent.java
similarity index 100%
rename from junit5/core/src/main/java/org/jboss/arquillian/junit5/BeforeTestExecutionEvent.java
rename to junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/BeforeTestExecutionEvent.java
diff --git a/junit5/core/src/main/java/org/jboss/arquillian/junit5/ContextStore.java b/junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/ContextStore.java
similarity index 100%
rename from junit5/core/src/main/java/org/jboss/arquillian/junit5/ContextStore.java
rename to junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/ContextStore.java
diff --git a/junit5/core/src/main/java/org/jboss/arquillian/junit5/IdentifiedTestException.java b/junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/IdentifiedTestException.java
similarity index 100%
rename from junit5/core/src/main/java/org/jboss/arquillian/junit5/IdentifiedTestException.java
rename to junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/IdentifiedTestException.java
diff --git a/junit5/core/src/main/java/org/jboss/arquillian/junit5/JUnitJupiterTestClassLifecycleManager.java b/junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/JUnitJupiterTestClassLifecycleManager.java
similarity index 100%
rename from junit5/core/src/main/java/org/jboss/arquillian/junit5/JUnitJupiterTestClassLifecycleManager.java
rename to junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/JUnitJupiterTestClassLifecycleManager.java
diff --git a/junit5/core/src/main/java/org/jboss/arquillian/junit5/MethodParameterObserver.java b/junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/MethodParameterObserver.java
similarity index 100%
rename from junit5/core/src/main/java/org/jboss/arquillian/junit5/MethodParameterObserver.java
rename to junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/MethodParameterObserver.java
diff --git a/junit5/core/src/main/java/org/jboss/arquillian/junit5/MethodParameterProducerEvent.java b/junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/MethodParameterProducerEvent.java
similarity index 100%
rename from junit5/core/src/main/java/org/jboss/arquillian/junit5/MethodParameterProducerEvent.java
rename to junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/MethodParameterProducerEvent.java
diff --git a/junit5/core/src/main/java/org/jboss/arquillian/junit5/MethodParameters.java b/junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/MethodParameters.java
similarity index 100%
rename from junit5/core/src/main/java/org/jboss/arquillian/junit5/MethodParameters.java
rename to junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/MethodParameters.java
diff --git a/junit5/core/src/main/java/org/jboss/arquillian/junit5/extension/JUnitJupiterCoreExtension.java b/junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/extension/JUnitJupiterCoreExtension.java
similarity index 100%
rename from junit5/core/src/main/java/org/jboss/arquillian/junit5/extension/JUnitJupiterCoreExtension.java
rename to junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/extension/JUnitJupiterCoreExtension.java
diff --git a/junit5/core/src/main/java/org/jboss/arquillian/junit5/extension/RunModeEvent.java b/junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/extension/RunModeEvent.java
similarity index 100%
rename from junit5/core/src/main/java/org/jboss/arquillian/junit5/extension/RunModeEvent.java
rename to junit-jupiter/core/src/main/java/org/jboss/arquillian/junit5/extension/RunModeEvent.java
diff --git a/junit5/core/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/junit-jupiter/core/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
similarity index 100%
rename from junit5/core/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
rename to junit-jupiter/core/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
diff --git a/junit5/pom.xml b/junit-jupiter/pom.xml
similarity index 90%
rename from junit5/pom.xml
rename to junit-jupiter/pom.xml
index febc9bcee..ea01ff6b1 100644
--- a/junit5/pom.xml
+++ b/junit-jupiter/pom.xml
@@ -11,8 +11,8 @@
4.0.0
- org.jboss.arquillian.junit5
- arquillian-junit5-parent
+ org.jboss.arquillian.jupiter
+ arquillian-junit-jupiter-parent
pom
Arquillian TestRunner JUnit Jupiter Aggregator
diff --git a/pom.xml b/pom.xml
index ab742c982..682a5ed11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,9 +70,11 @@
container
junit
- junit5
+ junit-jupiter
testng
+ relocations
+
testenrichers
protocols
diff --git a/relocations/arquillian-junit5-container/pom.xml b/relocations/arquillian-junit5-container/pom.xml
new file mode 100644
index 000000000..16ce9d9f5
--- /dev/null
+++ b/relocations/arquillian-junit5-container/pom.xml
@@ -0,0 +1,26 @@
+
+
+ 4.0.0
+
+
+ org.jboss.arquillian
+ arquillian-relocations-parent
+ 1.10.1.Final-SNAPSHOT
+
+
+ org.jboss.arquillian.junit5
+ arquillian-junit5-container
+ pom
+
+ Arquillian JUnit 5 Container (Relocated)
+ This artifact has been relocated to org.jboss.arquillian.jupiter:arquillian-junit-jupiter-container
+
+
+
+ org.jboss.arquillian.jupiter
+ arquillian-junit-jupiter-container
+ This artifact has been relocated to org.jboss.arquillian.jupiter:arquillian-junit-jupiter-container
+
+
+
+
diff --git a/relocations/arquillian-junit5-core/pom.xml b/relocations/arquillian-junit5-core/pom.xml
new file mode 100644
index 000000000..ea68f7373
--- /dev/null
+++ b/relocations/arquillian-junit5-core/pom.xml
@@ -0,0 +1,26 @@
+
+
+ 4.0.0
+
+
+ org.jboss.arquillian
+ arquillian-relocations-parent
+ 1.10.1.Final-SNAPSHOT
+
+
+ org.jboss.arquillian.junit5
+ arquillian-junit5-core
+ pom
+
+ Arquillian JUnit 5 Core (Relocated)
+ This artifact has been relocated to org.jboss.arquillian.jupiter:arquillian-junit-jupiter-core
+
+
+
+ org.jboss.arquillian.jupiter
+ arquillian-junit-jupiter-core
+ This artifact has been relocated to org.jboss.arquillian.jupiter:arquillian-junit-jupiter-core
+
+
+
+
diff --git a/relocations/pom.xml b/relocations/pom.xml
new file mode 100644
index 000000000..fda3db076
--- /dev/null
+++ b/relocations/pom.xml
@@ -0,0 +1,22 @@
+
+
+ 4.0.0
+
+
+ org.jboss.arquillian
+ arquillian-parent
+ 1.10.1.Final-SNAPSHOT
+
+
+ arquillian-relocations-parent
+ pom
+
+ Arquillian Relocations Aggregator
+ Relocation POMs for renamed Arquillian artifacts
+
+
+ arquillian-junit5-core
+ arquillian-junit5-container
+
+
+