From 9a6e3981c7a541303910771c96b64c1335c2b0a5 Mon Sep 17 00:00:00 2001
From: Tomasz Tylenda <tomasz.tylenda@sonarsource.com>
Date: Tue, 19 May 2026 16:15:28 +0200
Subject: [PATCH 1/2] Add jupiter to dependencyManagement

---
 its/plugin/tests/pom.xml                      | 19 ++++++++++---
 .../java/com/sonar/it/java/suite/NewTest.java | 28 +++++++++++++++++++
 pom.xml                                       | 20 +++++++++++++
 3 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 its/plugin/tests/src/test/java/com/sonar/it/java/suite/NewTest.java

diff --git a/its/plugin/tests/pom.xml b/its/plugin/tests/pom.xml
index 7746fa75d69..667d17a2590 100644
--- a/its/plugin/tests/pom.xml
+++ b/its/plugin/tests/pom.xml
@@ -54,6 +54,21 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
@@ -104,10 +119,6 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <configuration>
             <argLine>-server</argLine>
-            <includes>
-              <include>com/sonar/it/java/suite/*TestSuite.java</include>
-              <include>com/sonar/it/java/*Test.java</include>
-            </includes>
           </configuration>
         </plugin>
         <plugin>
diff --git a/its/plugin/tests/src/test/java/com/sonar/it/java/suite/NewTest.java b/its/plugin/tests/src/test/java/com/sonar/it/java/suite/NewTest.java
new file mode 100644
index 00000000000..df3e92f4450
--- /dev/null
+++ b/its/plugin/tests/src/test/java/com/sonar/it/java/suite/NewTest.java
@@ -0,0 +1,28 @@
+/*
+ * SonarQube Java
+ * Copyright (C) SonarSource Sàrl
+ * mailto:info AT sonarsource DOT com
+ *
+ * You can redistribute and/or modify this program under the terms of
+ * the Sonar Source-Available License Version 1, as published by SonarSource Sàrl.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the Sonar Source-Available License for more details.
+ *
+ * You should have received a copy of the Sonar Source-Available License
+ * along with this program; if not, see https://sonarsource.com/license/ssal/
+ */
+package com.sonar.it.java.suite;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+class NewTest {
+  @Test
+  void test() {
+    fail("fail() in 5.");
+  }
+}
diff --git a/pom.xml b/pom.xml
index 0d14f365ebf..2cd1e0bf279 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,6 +115,8 @@
     <mockito-agent-jar>mockito-core-${mockito-core.version}.jar</mockito-agent-jar>
 
     <slf4j.version>1.7.30</slf4j.version>
+
+    <junit-jupiter.version>5.14.3</junit-jupiter.version>
   </properties>
 
   <distributionManagement>
@@ -246,6 +248,24 @@
         <version>4.13.2</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-api</artifactId>
+        <version>${junit-jupiter.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-engine</artifactId>
+        <version>${junit-jupiter.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.vintage</groupId>
+        <artifactId>junit-vintage-engine</artifactId>
+        <version>${junit-jupiter.version}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>

From d6f257445181e7a0cd9a9c70f6bc3e03f65525a0 Mon Sep 17 00:00:00 2001
From: Tomasz Tylenda <tomasz.tylenda@sonarsource.com>
Date: Tue, 19 May 2026 17:02:11 +0200
Subject: [PATCH 2/2] Add <includes>

---
 its/plugin/tests/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/its/plugin/tests/pom.xml b/its/plugin/tests/pom.xml
index 667d17a2590..575c38c55f8 100644
--- a/its/plugin/tests/pom.xml
+++ b/its/plugin/tests/pom.xml
@@ -119,6 +119,11 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <configuration>
             <argLine>-server</argLine>
+            <includes>
+              <include>com/sonar/it/java/suite/*TestSuite.java</include>
+              <include>com/sonar/it/java/suite/NewTest.java</include>
+              <include>com/sonar/it/java/*Test.java</include>
+            </includes>
           </configuration>
         </plugin>
         <plugin>