chore: upgrade Mockito to 5.18.0

dhis-2/dhis-services/dhis-service-analytics/pom.xml

@@ -201,11 +201,6 @@
       <artifactId>dhis-support-test</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

dhis-2/dhis-services/dhis-service-dxf2/pom.xml

@@ -230,11 +230,6 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

dhis-2/dhis-services/dhis-service-reporting/pom.xml

@@ -217,11 +217,6 @@
       <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

dhis-2/dhis-support/dhis-support-sql/pom.xml

@@ -80,11 +80,6 @@
       <artifactId>junit-jupiter-params</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/SqlViewControllerTest.java

@@ -53,11 +53,13 @@
 import org.hisp.dhis.test.webapi.H2ControllerIntegrationTestBase;
 import org.hisp.dhis.webapi.service.ContextService;
 import org.hisp.dhis.webapi.utils.ContextUtils;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -80,6 +82,14 @@ class SqlViewControllerTest extends H2ControllerIntegrationTestBase {
 
   @InjectMocks private SqlViewController controller;
 
+  @BeforeEach
+  void injectInheritedMocks() {
+    // contextService is an inherited @Autowired field on AbstractCrudController, not a
+    // constructor argument, so Mockito's @InjectMocks (which uses constructor injection here)
+    // does not populate it. Set it explicitly for the tests that call the controller directly.
+    ReflectionTestUtils.setField(controller, "contextService", contextService);
+  }
+
   @Test
   void testExecuteView_NoSuchView() {
     assertWebMessage(

dhis-2/dhis-web-api/src/test/java/org/hisp/dhis/webapi/controller/AnalyticsControllerTest.java

@@ -64,7 +64,10 @@
 import org.hisp.dhis.period.PeriodDimension;
 import org.hisp.dhis.system.grid.ListGrid;
 import org.hisp.dhis.test.TestBase;
+import org.hisp.dhis.user.CurrentUserUtil;
+import org.hisp.dhis.user.UserDetails;
 import org.hisp.dhis.webapi.utils.ContextUtils;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -97,9 +100,16 @@ class AnalyticsControllerTest {
 
   @Mock private DhisConfigurationProvider dhisConfigurationProvider;
 
+  @AfterEach
+  void tearDown() {
+    CurrentUserUtil.clearSecurityContext();
+  }
+
   @BeforeEach
   @SuppressWarnings("unchecked")
-  public void setUp() {
+  void setUp() {
+    CurrentUserUtil.injectUserInSecurityContext(UserDetails.empty().username("testuser").build());
+
     DataQueryService dataQueryService =
         new DefaultDataQueryService(
             dimensionalObjectProducer,

dhis-2/pom.xml

@@ -81,7 +81,9 @@
     <sonar.issue.ignore.multicriteria.S1117.ruleKey>java:S1117</sonar.issue.ignore.multicriteria.S1117.ruleKey>
     <sonar.issue.ignore.multicriteria.S1117.resourceKey>**/src/test/**/*.java</sonar.issue.ignore.multicriteria.S1117.resourceKey>
 
-    <surefireArgLine>-Xmx2024m</surefireArgLine>
+    <byte-buddy.version>1.17.5</byte-buddy.version>
+    <byte-buddy-agent.version>1.17.5</byte-buddy-agent.version>
+    <surefireArgLine>-Xmx2024m -Xshare:off -javaagent:${settings.localRepository}/net/bytebuddy/byte-buddy-agent/${byte-buddy-agent.version}/byte-buddy-agent-${byte-buddy-agent.version}.jar</surefireArgLine>
 
     <jrebel-maven-plugin.version>1.1.6</jrebel-maven-plugin.version>
     <maven-war-plugin.version>3.5.1</maven-war-plugin.version>
@@ -221,7 +223,7 @@
 
     <!-- Test -->
     <junit.version>5.12.2</junit.version>
-    <mockito.version>5.2.0</mockito.version>
+    <mockito.version>5.18.0</mockito.version>
     <powermock.version>2.0.9</powermock.version>
     <hamcrest.version>3.0</hamcrest.version>
     <testcontainers.version>1.21.4</testcontainers.version>
@@ -1620,17 +1622,18 @@
         <scope>import</scope>
       </dependency>
       <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-core</artifactId>
-        <version>${mockito.version}</version>
-        <scope>test</scope>
+        <groupId>net.bytebuddy</groupId>
+        <artifactId>byte-buddy</artifactId>
+        <version>${byte-buddy.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>net.bytebuddy</groupId>
+        <artifactId>byte-buddy-agent</artifactId>
+        <version>${byte-buddy-agent.version}</version>
       </dependency>
-      <!-- Depend only on mockito-inline (includes mockito-core already)
-        if you must use mockStatic (can you rewrite your code, so it's not necessary
-        ;)), otherwise depend on mockito-core only -->
       <dependency>
         <groupId>org.mockito</groupId>
-        <artifactId>mockito-inline</artifactId>
+        <artifactId>mockito-core</artifactId>
         <version>${mockito.version}</version>
         <scope>test</scope>
       </dependency>
@@ -1937,6 +1940,7 @@
           <version>${maven-surefire-plugin.version}</version>
           <configuration>
             <excludedGroups>benchmark</excludedGroups>
+            <argLine>@{argLine} ${surefireArgLine}</argLine>
           </configuration>
         </plugin>
         <plugin>
@@ -2102,7 +2106,6 @@ jasperreports.version=${jasperreports.version}
               <ignoredUnusedDeclaredDependency>org.junit.jupiter:junit-jupiter</ignoredUnusedDeclaredDependency>
               <ignoredUnusedDeclaredDependency>net.sf.jasperreports:jasperreports</ignoredUnusedDeclaredDependency>
               <ignoredUnusedDeclaredDependency>net.sf.jasperreports:jasperreports-fonts</ignoredUnusedDeclaredDependency>
-              <ignoredUnusedDeclaredDependency>org.mockito:mockito-inline</ignoredUnusedDeclaredDependency>
               <ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j-impl</ignoredUnusedDeclaredDependency>
               <ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-layout-template-json</ignoredUnusedDeclaredDependency>
               <ignoredUnusedDeclaredDependency>jakarta.servlet:jakarta.servlet-api</ignoredUnusedDeclaredDependency>