Bump to Micronaut 3.x
This commit is contained in:
parent
0cb980d695
commit
69af0ef8e6
6 changed files with 15 additions and 13 deletions
11
pom.xml
11
pom.xml
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
<groupId>io.kokuwa.micronaut</groupId>
|
<groupId>io.kokuwa.micronaut</groupId>
|
||||||
<artifactId>micronaut-logging</artifactId>
|
<artifactId>micronaut-logging</artifactId>
|
||||||
<version>0.1.3-SNAPSHOT</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
|
|
||||||
<name>Logging support for Micronaut</name>
|
<name>Logging support for Micronaut</name>
|
||||||
<description>Enhanced logging using MDC or request header.</description>
|
<description>Enhanced logging using MDC or request header.</description>
|
||||||
|
@ -49,7 +49,7 @@
|
||||||
<!-- ===================================================================== -->
|
<!-- ===================================================================== -->
|
||||||
|
|
||||||
<version.ch.qos.logback.contrib>0.1.5</version.ch.qos.logback.contrib>
|
<version.ch.qos.logback.contrib>0.1.5</version.ch.qos.logback.contrib>
|
||||||
<version.io.micronaut>2.5.13</version.io.micronaut>
|
<version.io.micronaut>3.1.3</version.io.micronaut>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -113,6 +113,13 @@
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- avoid compiler warning, see https://docs.micronaut.io/latest/guide/#_nullable_annotations -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.google.code.findbugs</groupId>
|
||||||
|
<artifactId>jsr305</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>ch.qos.logback</groupId>
|
<groupId>ch.qos.logback</groupId>
|
||||||
|
|
|
@ -4,8 +4,6 @@ import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
import javax.inject.Singleton;
|
|
||||||
|
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import ch.qos.logback.classic.LoggerContext;
|
import ch.qos.logback.classic.LoggerContext;
|
||||||
|
@ -13,6 +11,7 @@ import ch.qos.logback.classic.turbo.TurboFilter;
|
||||||
import io.micronaut.context.annotation.BootstrapContextCompatible;
|
import io.micronaut.context.annotation.BootstrapContextCompatible;
|
||||||
import io.micronaut.context.annotation.Requires;
|
import io.micronaut.context.annotation.Requires;
|
||||||
import io.micronaut.core.annotation.Internal;
|
import io.micronaut.core.annotation.Internal;
|
||||||
|
import jakarta.inject.Singleton;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Utility class for Logback operations.
|
* Utility class for Logback operations.
|
||||||
|
|
|
@ -1,13 +1,12 @@
|
||||||
package io.kokuwa.micronaut.logging.request;
|
package io.kokuwa.micronaut.logging.request;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import org.junit.jupiter.api.DisplayName;
|
import org.junit.jupiter.api.DisplayName;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
import ch.qos.logback.classic.Level;
|
import ch.qos.logback.classic.Level;
|
||||||
import io.kokuwa.micronaut.logging.AbstractTest;
|
import io.kokuwa.micronaut.logging.AbstractTest;
|
||||||
import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
|
import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test for MDC and request filter combined.
|
* Test for MDC and request filter combined.
|
||||||
|
|
|
@ -1,12 +1,11 @@
|
||||||
package io.kokuwa.micronaut.logging.request;
|
package io.kokuwa.micronaut.logging.request;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import org.junit.jupiter.api.DisplayName;
|
import org.junit.jupiter.api.DisplayName;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
import ch.qos.logback.classic.Level;
|
import ch.qos.logback.classic.Level;
|
||||||
import io.kokuwa.micronaut.logging.AbstractTest;
|
import io.kokuwa.micronaut.logging.AbstractTest;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test for {@link HeaderLoggingServerHttpFilter}.
|
* Test for {@link HeaderLoggingServerHttpFilter}.
|
||||||
|
|
|
@ -2,12 +2,11 @@ package io.kokuwa.micronaut.logging.request;
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import org.junit.jupiter.api.DisplayName;
|
import org.junit.jupiter.api.DisplayName;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
import io.kokuwa.micronaut.logging.AbstractTest;
|
import io.kokuwa.micronaut.logging.AbstractTest;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test for {@link PrincipalHttpFilter}.
|
* Test for {@link PrincipalHttpFilter}.
|
||||||
|
|
|
@ -4,9 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
import static org.junit.jupiter.api.Assertions.fail;
|
import static org.junit.jupiter.api.Assertions.fail;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
import javax.inject.Singleton;
|
|
||||||
|
|
||||||
import com.nimbusds.jose.JOSEException;
|
import com.nimbusds.jose.JOSEException;
|
||||||
import com.nimbusds.jwt.JWTClaimsSet;
|
import com.nimbusds.jwt.JWTClaimsSet;
|
||||||
|
|
||||||
|
@ -17,6 +14,8 @@ import io.micronaut.http.HttpStatus;
|
||||||
import io.micronaut.http.client.HttpClient;
|
import io.micronaut.http.client.HttpClient;
|
||||||
import io.micronaut.http.client.annotation.Client;
|
import io.micronaut.http.client.annotation.Client;
|
||||||
import io.micronaut.security.token.jwt.signature.SignatureGeneratorConfiguration;
|
import io.micronaut.security.token.jwt.signature.SignatureGeneratorConfiguration;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
import jakarta.inject.Singleton;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Contoller for testing {@link HeaderLoggingServerHttpFilter} and {@link PrincipalHttpFilter}.
|
* Contoller for testing {@link HeaderLoggingServerHttpFilter} and {@link PrincipalHttpFilter}.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue