Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chore: Upgrade Mockito and surefire plugin (#31073)

Browse Source 
Upgrading Mockito ahead of upgrading Spring itself.
This commit is contained in:
Shrikant Sharat Kandula 2024-02-25 00:24:51 +05:30 committed by GitHub
parent 30300bb6a4
commit 5647916478
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/server/appsmith-plugins/pom.xml
View File

@ -211,16 +211,6 @@
</dependency> </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/mockwebserver3 --> <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/mockwebserver3 -->
<dependency> <dependency>

5
app/server/appsmith-server/pom.xml
View File

@ -368,11 +368,6 @@
<artifactId>sentry-spring-boot-starter-jakarta</artifactId> <artifactId>sentry-spring-boot-starter-jakarta</artifactId>
<version>6.23.0</version> <version>6.23.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>

2
app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/EnvManagerTest.java
View File

@ -324,7 +324,7 @@ public class EnvManagerTest {
file.deleteOnExit(); file.deleteOnExit();
Mockito.when(commonConfig.getEnvFilePath()).thenReturn(file.getAbsolutePath()); 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); ServerWebExchange exchange = Mockito.mock(ServerWebExchange.class);
ServerHttpResponse response = Mockito.mock(ServerHttpResponse.class); ServerHttpResponse response = Mockito.mock(ServerHttpResponse.class);

4
app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java
View File

@ -165,9 +165,7 @@ class ActionExecutionSolutionCEImplTest {
configService, configService,
tenantService); tenantService);
ObservationRegistry.ObservationConfig mockObservationConfig = Mockito.when(observationRegistry.isNoop()).thenReturn(true);
Mockito.mock(ObservationRegistry.ObservationConfig.class);
Mockito.when(observationRegistry.observationConfig()).thenReturn(mockObservationConfig);
} }
@BeforeEach @BeforeEach

17
app/server/pom.xml
View File

@ -32,7 +32,7 @@
<logback.version>1.4.14</logback.version> <logback.version>1.4.14</logback.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<mockito.version>4.4.0</mockito.version> <mockito.version>5.10.0</mockito.version>
<mockwebserver.version>5.0.0-alpha.2</mockwebserver.version> <mockwebserver.version>5.0.0-alpha.2</mockwebserver.version>
<okhttp3.version>4.10.0</okhttp3.version> <okhttp3.version>4.10.0</okhttp3.version>
<org.pf4j.version>3.10.0</org.pf4j.version> <org.pf4j.version>3.10.0</org.pf4j.version>
@ -77,7 +77,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version> <version>3.2.3</version>
<configuration> <configuration>
<printSummary>true</printSummary> <printSummary>true</printSummary>
<!-- Allow JUnit to access the test classes --> <!-- Allow JUnit to access the test classes -->
@ -85,19 +85,6 @@
--add-opens java.base/java.time=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED
--add-opens java.base/java.util=ALL-UNNAMED</argLine> --add-opens java.base/java.util=ALL-UNNAMED</argLine>
</configuration> </configuration>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.6.2</version>
<exclusions>
<exclusion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>