diff --git a/pom.xml b/pom.xml index 5e92f3d..f19a08a 100644 --- a/pom.xml +++ b/pom.xml @@ -103,9 +103,10 @@ 1.4.7 2.15.0 4.0.0-SNAPSHOT - 3.9.1 - 3.11.0 + 4.0.0-M3 + 4.0.0-M3 2.0.7 + 2.0 @@ -155,8 +156,12 @@ provided - javax.annotation - javax.annotation-api + io.micronaut + micronaut-discovery-core + + + io.micronaut + micronaut-retry @@ -171,7 +176,11 @@ micronaut-http-server - io.micronaut + io.micronaut.serde + micronaut-serde-jackson + + + io.micronaut.validation micronaut-validation @@ -200,6 +209,12 @@ ${version.io.micronaut} test + + org.yaml + snakeyaml + ${version.org.yaml.snakeyaml} + test + @@ -209,7 +224,6 @@ com.fasterxml.jackson.core jackson-databind - provided diff --git a/src/it/pom.xml b/src/it/pom.xml index 0641bc1..e0a4bee 100644 --- a/src/it/pom.xml +++ b/src/it/pom.xml @@ -61,6 +61,8 @@ pom import + + + io.micronaut + micronaut-runtime + ${version.io.micronaut} + + + io.micronaut.test + micronaut-test-junit5 + ${version.io.micronaut} + diff --git a/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java b/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java index ab31e47..b7c89cc 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java @@ -20,6 +20,7 @@ import com.nimbusds.jwt.JWTClaimsSet; import ch.qos.logback.classic.Level; import io.kokuwa.micronaut.logging.AbstractTest; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.util.CollectionUtils; import io.micronaut.http.HttpHeaderValues; import io.micronaut.http.HttpRequest; @@ -34,6 +35,7 @@ import io.micronaut.runtime.server.EmbeddedServer; import io.micronaut.security.annotation.Secured; import io.micronaut.security.rules.SecurityRule; import io.micronaut.security.token.jwt.signature.SignatureGeneratorConfiguration; +import io.micronaut.serde.annotation.Serdeable; import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; @@ -118,6 +120,7 @@ public abstract class AbstractFilterTest extends AbstractTest { } } + @Serdeable public static class TestResponse { private final String path; @@ -128,7 +131,7 @@ public abstract class AbstractFilterTest extends AbstractTest { public TestResponse( @JsonProperty("path") String path, @JsonProperty("level") String level, - @JsonProperty("context") Map context) { + @Nullable @JsonProperty("context") Map context) { this.path = path; this.level = level; this.context = context == null ? Map.of() : context;