From 21ffba058da45f5e9e0f2e5f9d9de54a8d5ee309 Mon Sep 17 00:00:00 2001
From: Guo XIn <371864209@qq.com>
Date: Fri, 12 Jan 2024 18:31:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Ajunit-jupiter?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                            | 67 +++++++++++++++++++++++++++---
 sonar-keyware-plugins-cxx/pom.xml  |  3 --
 sonar-keyware-plugins-java/pom.xml | 16 +++++--
 3 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7f122fe..5a2e5f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,14 +36,33 @@
     </scm>
 
     <developers>
-        <developer><id>guoxin</id><name>GuoXin</name><organization>Keyware</organization></developer>
-        <developer><id>renfengjiang</id><name>RenFengJiang</name><organization>Keyware</organization></developer>
-        <developer><id>renfengshan</id><name>RenFengShan</name><organization>Keyware</organization></developer>
-        <developer><id>wuhaoyang</id><name>WuHaoYang</name><organization>Keyware</organization></developer>
-        <developer><id>zhangchenbao</id><name>ZhangChenBao</name><organization>Keyware</organization></developer>
+        <developer>
+            <id>guoxin</id>
+            <name>GuoXin</name>
+            <organization>Keyware</organization>
+        </developer>
+        <developer>
+            <id>renfengjiang</id>
+            <name>RenFengJiang</name>
+            <organization>Keyware</organization>
+        </developer>
+        <developer>
+            <id>renfengshan</id>
+            <name>RenFengShan</name>
+            <organization>Keyware</organization>
+        </developer>
+        <developer>
+            <id>wuhaoyang</id>
+            <name>WuHaoYang</name>
+            <organization>Keyware</organization>
+        </developer>
+        <developer>
+            <id>zhangchenbao</id>
+            <name>ZhangChenBao</name>
+            <organization>Keyware</organization>
+        </developer>
     </developers>
 
-
     <properties>
         <java.version>11</java.version>
         <jdk.min.version>11</jdk.min.version>
@@ -52,6 +71,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <sonar.java.version>7.24.0.32100</sonar.java.version>
         <version.jacoco.plugin>0.8.10</version.jacoco.plugin>
+        <junit.jupiter.version>5.9.1</junit.jupiter.version>
         <aggregate.report.dir>integration-tests/target/site/jacoco-aggregate/jacoco.xml</aggregate.report.dir>
     </properties>
 
@@ -76,6 +96,41 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter</artifactId>
+                <version>${junit.jupiter.version}</version>
+                <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                    </exclusion>
+                </exclusions>
+            </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.jupiter</groupId>
+                <artifactId>junit-jupiter-migrationsupport</artifactId>
+                <version>${junit.jupiter.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
\ No newline at end of file
diff --git a/sonar-keyware-plugins-cxx/pom.xml b/sonar-keyware-plugins-cxx/pom.xml
index c31dce9..7baecb8 100644
--- a/sonar-keyware-plugins-cxx/pom.xml
+++ b/sonar-keyware-plugins-cxx/pom.xml
@@ -44,7 +44,6 @@
         <mockito-all.version>1.10.19</mockito-all.version>
         <mockito-core.version>5.8.0</mockito-core.version>
         <assertj-core.version>3.24.2</assertj-core.version>
-        <junit-jupiter.version>5.9.1</junit-jupiter.version>
     </properties>
 
     <dependencies>
@@ -114,13 +113,11 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit-jupiter.version}</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>
     </dependencies>
diff --git a/sonar-keyware-plugins-java/pom.xml b/sonar-keyware-plugins-java/pom.xml
index a4af77f..5beff37 100644
--- a/sonar-keyware-plugins-java/pom.xml
+++ b/sonar-keyware-plugins-java/pom.xml
@@ -50,6 +50,11 @@
             <version>${sonar.java.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
@@ -57,12 +62,17 @@
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-migrationsupport</artifactId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-migrationsupport</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>