chore: merge main into release [skip ci]

Author: github-actions[bot]

microsphere-java-parent/pom.xml

@@ -24,19 +24,19 @@
         <jaxws-api.version>2.3.1</jaxws-api.version>
         <jsr305.version>3.0.2</jsr305.version>
         <apache.commons.logging.version>1.3.6</apache.commons.logging.version>
-        <spring.version>7.0.6</spring.version>
+        <spring-framework.version>7.0.6</spring-framework.version>
         <slf4j.version>2.0.17</slf4j.version>
         <logback.version>1.5.32</logback.version>
         <!-- Testing -->
-        <junit.version>6.0.3</junit.version>
+        <junit-jupiter.version>6.0.3</junit-jupiter.version>
         <mockito.version>5.23.0</mockito.version>
         <jmh.version>1.37</jmh.version>
     </properties>
 
     <dependencyManagement>
 
         <dependencies>
-
+            
             <!-- Java Commons Annotations API -->
             <dependency>
                 <groupId>javax.annotation</groupId>
@@ -88,16 +88,14 @@
             </dependency>
 
             <!-- Testing -->
+            
+            <!-- JUnit BOM -->
             <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter</artifactId>
-                <version>${junit.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-engine</artifactId>
-                <version>${junit.version}</version>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit-jupiter.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
             <!-- Mockito -->
@@ -124,7 +122,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-framework-bom</artifactId>
-                <version>${spring.version}</version>
+                <version>${spring-framework.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -151,8 +149,8 @@
                 <jdk>[1.8,17)</jdk>
             </activation>
             <properties>
-                <spring.version>5.3.39</spring.version>
-                <junit.version>5.14.3</junit.version>
+                <spring-framework.version>5.3.39</spring-framework.version>
+                <junit-jupiter.version>5.14.3</junit-jupiter.version>
                 <mockito.version>4.11.0</mockito.version>
             </properties>
         </profile>