Fix deprecated imports

This commit is contained in:
Stephan Schnabel 2023-05-15 08:40:42 +02:00
parent 7fd8989011
commit 492a58330c
Signed by: stephan.schnabel
GPG key ID: E07AF5BA239FE543
4 changed files with 18 additions and 7 deletions

16
pom.xml
View file

@ -163,12 +163,28 @@
<artifactId>micronaut-runtime</artifactId> <artifactId>micronaut-runtime</artifactId>
<version>${version.io.micronaut}</version> <version>${version.io.micronaut}</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micronaut.security</groupId> <groupId>io.micronaut.security</groupId>
<artifactId>micronaut-security</artifactId> <artifactId>micronaut-security</artifactId>
<version>${version.io.micronaut}</version> <version>${version.io.micronaut}</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-http-server</artifactId>
</exclusion>
<exclusion>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-validation</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micronaut.test</groupId> <groupId>io.micronaut.test</groupId>

View file

@ -10,7 +10,6 @@ import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.turbo.TurboFilter; 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 jakarta.inject.Singleton; import jakarta.inject.Singleton;
/** /**
@ -21,7 +20,6 @@ import jakarta.inject.Singleton;
@Requires(classes = LoggerContext.class) @Requires(classes = LoggerContext.class)
@BootstrapContextCompatible @BootstrapContextCompatible
@Singleton @Singleton
@Internal
public class LogbackUtil { public class LogbackUtil {
private final LoggerContext context; private final LoggerContext context;

View file

@ -3,9 +3,6 @@ package io.kokuwa.micronaut.logging.http.level;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import org.reactivestreams.Publisher; import org.reactivestreams.Publisher;
import ch.qos.logback.classic.turbo.TurboFilter; import ch.qos.logback.classic.turbo.TurboFilter;
@ -20,6 +17,8 @@ import io.micronaut.http.annotation.Filter;
import io.micronaut.http.filter.ServerFilterChain; import io.micronaut.http.filter.ServerFilterChain;
import io.micronaut.http.filter.ServerFilterPhase; import io.micronaut.http.filter.ServerFilterPhase;
import io.micronaut.runtime.context.scope.Refreshable; import io.micronaut.runtime.context.scope.Refreshable;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
/** /**
* Http request logging filter. * Http request logging filter.

View file

@ -11,7 +11,6 @@ import io.micronaut.context.annotation.BootstrapContextCompatible;
import io.micronaut.context.annotation.Context; import io.micronaut.context.annotation.Context;
import io.micronaut.context.annotation.Requires; import io.micronaut.context.annotation.Requires;
import io.micronaut.context.env.Environment; import io.micronaut.context.env.Environment;
import io.micronaut.core.annotation.Internal;
import io.micronaut.core.type.Argument; import io.micronaut.core.type.Argument;
import io.micronaut.core.util.StringUtils; import io.micronaut.core.util.StringUtils;
@ -25,7 +24,6 @@ import io.micronaut.core.util.StringUtils;
@Requires(property = MDCTurboFilterConfigurer.PREFIX + ".enabled", notEquals = StringUtils.FALSE) @Requires(property = MDCTurboFilterConfigurer.PREFIX + ".enabled", notEquals = StringUtils.FALSE)
@BootstrapContextCompatible @BootstrapContextCompatible
@Context @Context
@Internal
public class MDCTurboFilterConfigurer { public class MDCTurboFilterConfigurer {
public static final String PREFIX = "logger.mdc"; public static final String PREFIX = "logger.mdc";