Skip to content

Commit f34cbd4

Browse files
authored
Merge branch 'master' into feature/pom_improvements
2 parents 61de9a6 + b450d41 commit f34cbd4

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

kotlin/src/test/kotlin/org/axonframework/extensions/kotlin/QueryGatewayExtensionsTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ internal class QueryGatewayExtensionsTest {
113113
fun `Query without queryName should handle nullable responses`() {
114114
val nullInstanceReturnValue: CompletableFuture<String?> = CompletableFuture.completedFuture(null)
115115
val nullableQueryGateway = mockk<QueryGateway> {
116-
every { query(exampleQuery, match { i: AbstractResponseType<String?> -> i is InstanceResponseType }) } returns nullInstanceReturnValue
116+
every { query(exampleQuery, matchInstanceResponseType<String?>()) } returns nullInstanceReturnValue
117117
}
118118

119119
val queryResult = nullableQueryGateway.query<String?, ExampleQuery>(query = exampleQuery)
@@ -175,7 +175,7 @@ internal class QueryGatewayExtensionsTest {
175175
fun `Query should handle nullable responses`() {
176176
val nullInstanceReturnValue: CompletableFuture<String?> = CompletableFuture.completedFuture(null)
177177
val nullableQueryGateway = mockk<QueryGateway> {
178-
every { query(queryName, exampleQuery, match { i: AbstractResponseType<String?> -> i is InstanceResponseType }) } returns nullInstanceReturnValue
178+
every { query(queryName, exampleQuery, matchInstanceResponseType<String?>() ) } returns nullInstanceReturnValue
179179
}
180180

181181
val queryResult = nullableQueryGateway.query<String?, ExampleQuery>(queryName = queryName, query = exampleQuery)

pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
</modules>
3232

3333
<properties>
34-
<axon.version>4.4.2</axon.version>
34+
<axon.version>4.4.3</axon.version>
3535
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3636
<kotlin.version>1.4.10</kotlin.version>
3737
<kotlin-logging.version>1.12.0</kotlin-logging.version>
38-
<jackson-kotlin.version>2.10.0</jackson-kotlin.version>
38+
<jackson-kotlin.version>2.11.2</jackson-kotlin.version>
3939
<mockk.version>1.10.0</mockk.version>
40-
<junit.jupiter.version>5.5.2</junit.jupiter.version>
40+
<junit.jupiter.version>5.7.0</junit.jupiter.version>
4141
<slf4j.version>1.7.30</slf4j.version>
4242
<log4j.version>2.13.3</log4j.version>
4343
<dokka.version>1.4.10</dokka.version>
@@ -255,7 +255,7 @@
255255
</plugin>
256256
<plugin>
257257
<artifactId>maven-resources-plugin</artifactId>
258-
<version>3.0.2</version>
258+
<version>3.2.0</version>
259259
<configuration>
260260
<encoding>UTF-8</encoding>
261261
</configuration>
@@ -312,7 +312,7 @@
312312
<plugin>
313313
<groupId>org.apache.maven.plugins</groupId>
314314
<artifactId>maven-assembly-plugin</artifactId>
315-
<version>2.6</version>
315+
<version>3.3.0</version>
316316
<configuration>
317317
<descriptorSourceDirectory>assembly</descriptorSourceDirectory>
318318
<archiverConfig>
@@ -331,7 +331,7 @@
331331
</plugin>
332332
<plugin>
333333
<artifactId>maven-surefire-plugin</artifactId>
334-
<version>2.22.1</version>
334+
<version>2.22.2</version>
335335
<configuration>
336336
<includes>
337337
<include>**/*Test.java</include>
@@ -361,7 +361,7 @@
361361
</plugin>
362362
<plugin>
363363
<artifactId>maven-jar-plugin</artifactId>
364-
<version>3.0.2</version>
364+
<version>3.2.0</version>
365365
<configuration>
366366
<archive>
367367
<manifest>
@@ -372,7 +372,7 @@
372372
</plugin>
373373
<plugin>
374374
<artifactId>maven-source-plugin</artifactId>
375-
<version>3.0.1</version>
375+
<version>3.2.1</version>
376376
<executions>
377377
<execution>
378378
<id>attach-sources</id>

0 commit comments

Comments
 (0)