Relocate arquillian-junit-5-* to arquillian-junit-jupiter and add JUnit 6.x testing

.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

bom/pom.xml

@@ -130,7 +130,7 @@
         <version>${project.version}</version>
       </dependency>
 
-      <!-- JUnit -->
+      <!-- JUnit 4.x -->
       <dependency>
         <groupId>org.jboss.arquillian.junit</groupId>
         <artifactId>arquillian-junit-core</artifactId>
@@ -147,7 +147,19 @@
         <version>${project.version}</version>
       </dependency>
 
-      <!-- JUnit5 -->
+      <!-- JUnit Jupiter -->
+      <dependency>
+        <groupId>org.jboss.arquillian.jupiter</groupId>
+        <artifactId>arquillian-junit-jupiter-core</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.arquillian.jupiter</groupId>
+        <artifactId>arquillian-junit-jupiter-container</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <!-- JUnit 5.x (relocated to arquillian-junit-jupiter-*) -->
       <dependency>
         <groupId>org.jboss.arquillian.junit5</groupId>
         <artifactId>arquillian-junit5-core</artifactId>

build/pom.xml

@@ -25,7 +25,7 @@
     <!-- Arquillian Core common Deps, Test related -->
     <version.javax.inject>1</version.javax.inject>
     <version.junit>4.13.2</version.junit>
-    <version.junit5>5.14.3</version.junit5>
+    <version.junit-jupiter>5.14.3</version.junit-jupiter>
     <version.mockito>4.11.0</version.mockito>
     <version.testng>7.5</version.testng>
     <version.assertj>3.27.7</version.assertj>
@@ -68,7 +68,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>${version.junit5}</version>
+        <version>${version.junit-jupiter}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -121,4 +121,15 @@
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <!-- Profile to test with JUnit 6 (requires Java 17+) -->
+    <profile>
+      <id>junit6</id>
+      <properties>
+        <version.junit-jupiter>6.0.2</version.junit-jupiter>
+      </properties>
+    </profile>
+  </profiles>
+
 </project>

integration-tests/junit5-tests/pom.xml

@@ -43,8 +43,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jboss.arquillian.junit5</groupId>
-      <artifactId>arquillian-junit5-container</artifactId>
+      <groupId>org.jboss.arquillian.jupiter</groupId>
+      <artifactId>arquillian-junit-jupiter-container</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

junit5/README.adoc → 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]
 ----
 <dependency>
-    <groupId>org.jboss.arquillian.junit5</groupId>
-    <artifactId>arquillian-junit5-container</artifactId>
+    <groupId>org.jboss.arquillian.jupiter</groupId>
+    <artifactId>arquillian-junit-jupiter-container</artifactId>
     <version>${org.arquillian.version}</version>
 </dependency>
 ----

junit5/container/pom.xml → junit-jupiter/container/pom.xml

@@ -9,10 +9,10 @@
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 
-  <groupId>org.jboss.arquillian.junit5</groupId>
-  <artifactId>arquillian-junit5-container</artifactId>
+  <groupId>org.jboss.arquillian.jupiter</groupId>
+  <artifactId>arquillian-junit-jupiter-container</artifactId>
 
-  <name>Arquillian TestRunner JUnit 5 Container</name>
+  <name>Arquillian TestRunner JUnit Jupiter Container</name>
 
   <properties>
     <maven.compiler.target>1.8</maven.compiler.target>
@@ -63,8 +63,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.jboss.arquillian.junit5</groupId>
-      <artifactId>arquillian-junit5-core</artifactId>
+      <groupId>org.jboss.arquillian.jupiter</groupId>
+      <artifactId>arquillian-junit-jupiter-core</artifactId>
       <version>${project.version}</version>
     </dependency>
 

junit5/core/pom.xml → junit-jupiter/core/pom.xml

@@ -9,10 +9,10 @@
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 
-  <groupId>org.jboss.arquillian.junit5</groupId>
-  <artifactId>arquillian-junit5-core</artifactId>
+  <groupId>org.jboss.arquillian.jupiter</groupId>
+  <artifactId>arquillian-junit-jupiter-core</artifactId>
 
-  <name>Arquillian TestRunner JUnit 5 Core</name>
+  <name>Arquillian TestRunner JUnit Jupiter Core</name>
 
   <properties>
     <maven.compiler.target>1.8</maven.compiler.target>

junit5/pom.xml → junit-jupiter/pom.xml

@@ -11,8 +11,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <!-- Artifact Information -->
-  <groupId>org.jboss.arquillian.junit5</groupId>
-  <artifactId>arquillian-junit5-parent</artifactId>
+  <groupId>org.jboss.arquillian.jupiter</groupId>
+  <artifactId>arquillian-junit-jupiter-parent</artifactId>
   <packaging>pom</packaging>
 
   <name>Arquillian TestRunner JUnit Jupiter Aggregator</name>

pom.xml

@@ -70,9 +70,11 @@
     <module>container</module>
 
     <module>junit</module>
-    <module>junit5</module>
+    <module>junit-jupiter</module>
     <module>testng</module>
 
+    <module>relocations</module>
+
     <module>testenrichers</module>
     <module>protocols</module>
 

relocations/arquillian-junit5-container/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.jboss.arquillian</groupId>
+    <artifactId>arquillian-relocations-parent</artifactId>
+    <version>1.10.1.Final-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.jboss.arquillian.junit5</groupId>
+  <artifactId>arquillian-junit5-container</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Arquillian JUnit 5 Container (Relocated)</name>
+  <description>This artifact has been relocated to org.jboss.arquillian.jupiter:arquillian-junit-jupiter-container</description>
+
+  <distributionManagement>
+    <relocation>
+      <groupId>org.jboss.arquillian.jupiter</groupId>
+      <artifactId>arquillian-junit-jupiter-container</artifactId>
+      <message>This artifact has been relocated to org.jboss.arquillian.jupiter:arquillian-junit-jupiter-container</message>
+    </relocation>
+  </distributionManagement>
+
+</project>

relocations/arquillian-junit5-core/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.jboss.arquillian</groupId>
+    <artifactId>arquillian-relocations-parent</artifactId>
+    <version>1.10.1.Final-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.jboss.arquillian.junit5</groupId>
+  <artifactId>arquillian-junit5-core</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Arquillian JUnit 5 Core (Relocated)</name>
+  <description>This artifact has been relocated to org.jboss.arquillian.jupiter:arquillian-junit-jupiter-core</description>
+
+  <distributionManagement>
+    <relocation>
+      <groupId>org.jboss.arquillian.jupiter</groupId>
+      <artifactId>arquillian-junit-jupiter-core</artifactId>
+      <message>This artifact has been relocated to org.jboss.arquillian.jupiter:arquillian-junit-jupiter-core</message>
+    </relocation>
+  </distributionManagement>
+
+</project>

relocations/pom.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.jboss.arquillian</groupId>
+    <artifactId>arquillian-parent</artifactId>
+    <version>1.10.1.Final-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>arquillian-relocations-parent</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Arquillian Relocations Aggregator</name>
+  <description>Relocation POMs for renamed Arquillian artifacts</description>
+
+  <modules>
+    <module>arquillian-junit5-core</module>
+    <module>arquillian-junit5-container</module>
+  </modules>
+
+</project>