From 492a58330c3d5d39fbe907e9a7736837aaf38a95 Mon Sep 17 00:00:00 2001
From: Stephan Schnabel <stephan.schnabel@posteo.de>
Date: Mon, 15 May 2023 08:40:42 +0200
Subject: [PATCH] Fix deprecated imports

---
 pom.xml                                          | 16 ++++++++++++++++
 .../io/kokuwa/micronaut/logging/LogbackUtil.java |  2 --
 .../logging/http/level/LogLevelServerFilter.java |  5 ++---
 .../logging/mdc/MDCTurboFilterConfigurer.java    |  2 --
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 84fa2ee..ba4deeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,12 +163,28 @@
 			<artifactId>micronaut-runtime</artifactId>
 			<version>${version.io.micronaut}</version>
 			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.annotation</groupId>
+					<artifactId>javax.annotation-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>io.micronaut.security</groupId>
 			<artifactId>micronaut-security</artifactId>
 			<version>${version.io.micronaut}</version>
 			<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>
 			<groupId>io.micronaut.test</groupId>
diff --git a/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java b/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java
index df1d6ab..f02ee78 100644
--- a/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java
+++ b/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java
@@ -10,7 +10,6 @@ import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.turbo.TurboFilter;
 import io.micronaut.context.annotation.BootstrapContextCompatible;
 import io.micronaut.context.annotation.Requires;
-import io.micronaut.core.annotation.Internal;
 import jakarta.inject.Singleton;
 
 /**
@@ -21,7 +20,6 @@ import jakarta.inject.Singleton;
 @Requires(classes = LoggerContext.class)
 @BootstrapContextCompatible
 @Singleton
-@Internal
 public class LogbackUtil {
 
 	private final LoggerContext context;
diff --git a/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilter.java b/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilter.java
index 0e5d07a..ae8475b 100644
--- a/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilter.java
+++ b/src/main/java/io/kokuwa/micronaut/logging/http/level/LogLevelServerFilter.java
@@ -3,9 +3,6 @@ package io.kokuwa.micronaut.logging.http.level;
 import java.util.Map;
 import java.util.Optional;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
 import org.reactivestreams.Publisher;
 
 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.ServerFilterPhase;
 import io.micronaut.runtime.context.scope.Refreshable;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
 /**
  * Http request logging filter.
diff --git a/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java b/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java
index e3abfb4..5dfab9a 100644
--- a/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java
+++ b/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilterConfigurer.java
@@ -11,7 +11,6 @@ import io.micronaut.context.annotation.BootstrapContextCompatible;
 import io.micronaut.context.annotation.Context;
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.env.Environment;
-import io.micronaut.core.annotation.Internal;
 import io.micronaut.core.type.Argument;
 import io.micronaut.core.util.StringUtils;
 
@@ -25,7 +24,6 @@ import io.micronaut.core.util.StringUtils;
 @Requires(property = MDCTurboFilterConfigurer.PREFIX + ".enabled", notEquals = StringUtils.FALSE)
 @BootstrapContextCompatible
 @Context
-@Internal
 public class MDCTurboFilterConfigurer {
 
 	public static final String PREFIX = "logger.mdc";