diff --git a/app/server/appsmith-plugins/pom.xml b/app/server/appsmith-plugins/pom.xml index 4619d95277..50dc7e8cac 100644 --- a/app/server/appsmith-plugins/pom.xml +++ b/app/server/appsmith-plugins/pom.xml @@ -211,16 +211,6 @@ - - - org.mockito - - mockito-inline - - ${mockito.version} - - - diff --git a/app/server/appsmith-server/pom.xml b/app/server/appsmith-server/pom.xml index 30f1eda494..945380f1e3 100644 --- a/app/server/appsmith-server/pom.xml +++ b/app/server/appsmith-server/pom.xml @@ -368,11 +368,6 @@ sentry-spring-boot-starter-jakarta 6.23.0 - - org.mockito - mockito-inline - ${mockito.version} - org.mockito mockito-core diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/EnvManagerTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/EnvManagerTest.java index 3458e4610e..ef5ea866f1 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/EnvManagerTest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/EnvManagerTest.java @@ -324,7 +324,7 @@ public class EnvManagerTest { file.deleteOnExit(); Mockito.when(commonConfig.getEnvFilePath()).thenReturn(file.getAbsolutePath()); - Mockito.when(fileUtils.createZip(any())).thenReturn(new byte[1024]); + Mockito.when(fileUtils.createZip(any(FileUtils.ZipSourceFile[].class))).thenReturn(new byte[1024]); ServerWebExchange exchange = Mockito.mock(ServerWebExchange.class); ServerHttpResponse response = Mockito.mock(ServerHttpResponse.class); diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java index 555a610a9e..136b210460 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java @@ -165,9 +165,7 @@ class ActionExecutionSolutionCEImplTest { configService, tenantService); - ObservationRegistry.ObservationConfig mockObservationConfig = - Mockito.mock(ObservationRegistry.ObservationConfig.class); - Mockito.when(observationRegistry.observationConfig()).thenReturn(mockObservationConfig); + Mockito.when(observationRegistry.isNoop()).thenReturn(true); } @BeforeEach diff --git a/app/server/pom.xml b/app/server/pom.xml index f497c8a628..32cc2b88e6 100644 --- a/app/server/pom.xml +++ b/app/server/pom.xml @@ -32,7 +32,7 @@ 1.4.14 ${java.version} ${java.version} - 4.4.0 + 5.10.0 5.0.0-alpha.2 4.10.0 3.10.0 @@ -77,7 +77,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 3.2.3 true @@ -85,19 +85,6 @@ --add-opens java.base/java.time=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED - - - org.junit.jupiter - junit-jupiter-engine - 5.6.2 - - - org.junit.platform - junit-platform-commons - - - - org.apache.maven.plugins