kokuwaio/micronaut-logging
1
0
Fork 0
Code Issues 1 Pull requests Releases 6 Activity

Bump micronaut to 4.x

Browse source
This commit is contained in:
Stephan Schnabel 2023-05-17 14:47:26 +02:00
parent 1d5156a3d8
commit dfc8a7aeeb
Signed by: stephan.schnabel
GPG key ID: E07AF5BA239FE543
3 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
pom.xml
View file

@ -103,9 +103,10 @@
<version.ch.qos.logback>1.4.7</version.ch.qos.logback>
<version.com.fasterxml.jackson>2.15.0</version.com.fasterxml.jackson>
<version.io.kokuwa.micronaut.logging>4.0.0-SNAPSHOT</version.io.kokuwa.micronaut.logging>
<version.io.micronaut>3.9.1</version.io.micronaut>
<version.io.micronaut.security> 3.11.0</version.io.micronaut.security>
<version.io.micronaut>4.0.0-M3</version.io.micronaut>
<version.io.micronaut.security>4.0.0-M3</version.io.micronaut.security>
<version.org.slf4j.api>2.0.7</version.org.slf4j.api>
<version.org.yaml.snakeyaml>2.0</version.org.yaml.snakeyaml>
</properties>
@ -155,8 +156,12 @@
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-discovery-core</artifactId>
</exclusion>
<exclusion>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-retry</artifactId>
</exclusion>
</exclusions>
</dependency>
@ -171,7 +176,11 @@
<artifactId>micronaut-http-server</artifactId>
</exclusion>
<exclusion>
<groupId>io.micronaut</groupId>
<groupId>io.micronaut.serde</groupId>
<artifactId>micronaut-serde-jackson</artifactId>
</exclusion>
<exclusion>
<groupId>io.micronaut.validation</groupId>
<artifactId>micronaut-validation</artifactId>
</exclusion>
</exclusions>
@ -200,6 +209,12 @@
<version>${version.io.micronaut}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${version.org.yaml.snakeyaml}</version>
<scope>test</scope>
</dependency>
<!-- logback -->
<dependency>
@ -209,7 +224,6 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

13
src/it/pom.xml
View file

@ -61,6 +61,8 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!--
not yet released
<dependency>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-bom</artifactId>
@ -68,6 +70,17 @@
<type>pom</type>
<scope>import</scope>
</dependency>
-->
<dependency>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-runtime</artifactId>
<version>${version.io.micronaut}</version>
</dependency>
<dependency>
<groupId>io.micronaut.test</groupId>
<artifactId>micronaut-test-junit5</artifactId>
<version>${version.io.micronaut}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>

5
src/test/java/io/kokuwa/micronaut/logging/http/AbstractFilterTest.java
View file

@ -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<String, String> context) {
@Nullable @JsonProperty("context") Map<String, String> context) {
this.path = path;
this.level = level;
this.context = context == null ? Map.of() : context;