diff --git a/pom.xml b/pom.xml index e305f70..005e3a9 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ - 3.9.4 + 4.0.0 2.0.7 1.4.8 @@ -78,8 +78,8 @@ - io.micronaut - micronaut-bom + io.micronaut.platform + micronaut-platform ${version.io.micronaut} pom import @@ -106,29 +106,13 @@ io.micronaut - micronaut-runtime + micronaut-http provided - - - javax.annotation - javax.annotation-api - - io.micronaut.security micronaut-security provided - - - io.micronaut - micronaut-http-server - - - io.micronaut - micronaut-validation - - io.micronaut.test @@ -150,6 +134,22 @@ micronaut-security-jwt test + + io.micronaut.serde + micronaut-serde-jackson + test + + + org.yaml + snakeyaml + test + + + + + com.fasterxml.jackson.core + jackson-databind + @@ -198,9 +198,6 @@ 0.5C - - - level-from-micronaut/pom.xml diff --git a/src/it/pom.xml b/src/it/pom.xml index e03c4d5..07f915c 100644 --- a/src/it/pom.xml +++ b/src/it/pom.xml @@ -49,8 +49,6 @@ @project.version@ @version.io.micronaut@ - @version.org.slf4j@ - @version.ch.qos.logback@ @@ -62,27 +60,12 @@ ${version.io.kokuwa.micronaut.logging} - io.micronaut - micronaut-bom + io.micronaut.platform + micronaut-platform ${version.io.micronaut} pom import - - org.slf4j - slf4j-api - ${version.org.slf4j} - - - ch.qos.logback - logback-classic - ${version.ch.qos.logback} - - - ch.qos.logback - logback-core - ${version.ch.qos.logback} - 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;