From 69af0ef8e6fd4b77250e2fc508c4145acc290c64 Mon Sep 17 00:00:00 2001
From: Stephan Schnabel <spampot+github@posteo.eu>
Date: Fri, 29 Oct 2021 09:24:33 +0200
Subject: [PATCH] Bump to Micronaut 3.x

---
 pom.xml                                               | 11 +++++++++--
 .../java/io/kokuwa/micronaut/logging/LogbackUtil.java |  3 +--
 .../micronaut/logging/request/CompositeTest.java      |  3 +--
 .../micronaut/logging/request/RequestHeaderTest.java  |  3 +--
 .../logging/request/RequestPrincipalTest.java         |  3 +--
 .../kokuwa/micronaut/logging/request/TestClient.java  |  5 ++---
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 54a0b8f..de101f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>io.kokuwa.micronaut</groupId>
 	<artifactId>micronaut-logging</artifactId>
-	<version>0.1.3-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 
 	<name>Logging support for Micronaut</name>
 	<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.io.micronaut>2.5.13</version.io.micronaut>
+		<version.io.micronaut>3.1.3</version.io.micronaut>
 
 	</properties>
 
@@ -113,6 +113,13 @@
 			<scope>test</scope>
 		</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 -->
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
diff --git a/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java b/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java
index 625191e..df1d6ab 100644
--- a/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java
+++ b/src/main/java/io/kokuwa/micronaut/logging/LogbackUtil.java
@@ -4,8 +4,6 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import javax.inject.Singleton;
-
 import org.slf4j.LoggerFactory;
 
 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.Requires;
 import io.micronaut.core.annotation.Internal;
+import jakarta.inject.Singleton;
 
 /**
  * Utility class for Logback operations.
diff --git a/src/test/java/io/kokuwa/micronaut/logging/request/CompositeTest.java b/src/test/java/io/kokuwa/micronaut/logging/request/CompositeTest.java
index c0bd1d8..2c69814 100644
--- a/src/test/java/io/kokuwa/micronaut/logging/request/CompositeTest.java
+++ b/src/test/java/io/kokuwa/micronaut/logging/request/CompositeTest.java
@@ -1,13 +1,12 @@
 package io.kokuwa.micronaut.logging.request;
 
-import javax.inject.Inject;
-
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 import ch.qos.logback.classic.Level;
 import io.kokuwa.micronaut.logging.AbstractTest;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import jakarta.inject.Inject;
 
 /**
  * Test for MDC and request filter combined.
diff --git a/src/test/java/io/kokuwa/micronaut/logging/request/RequestHeaderTest.java b/src/test/java/io/kokuwa/micronaut/logging/request/RequestHeaderTest.java
index 2b7ee19..476e976 100644
--- a/src/test/java/io/kokuwa/micronaut/logging/request/RequestHeaderTest.java
+++ b/src/test/java/io/kokuwa/micronaut/logging/request/RequestHeaderTest.java
@@ -1,12 +1,11 @@
 package io.kokuwa.micronaut.logging.request;
 
-import javax.inject.Inject;
-
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 import ch.qos.logback.classic.Level;
 import io.kokuwa.micronaut.logging.AbstractTest;
+import jakarta.inject.Inject;
 
 /**
  * Test for {@link HeaderLoggingServerHttpFilter}.
diff --git a/src/test/java/io/kokuwa/micronaut/logging/request/RequestPrincipalTest.java b/src/test/java/io/kokuwa/micronaut/logging/request/RequestPrincipalTest.java
index f8f1fcc..9a60d7c 100644
--- a/src/test/java/io/kokuwa/micronaut/logging/request/RequestPrincipalTest.java
+++ b/src/test/java/io/kokuwa/micronaut/logging/request/RequestPrincipalTest.java
@@ -2,12 +2,11 @@ package io.kokuwa.micronaut.logging.request;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import javax.inject.Inject;
-
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 import io.kokuwa.micronaut.logging.AbstractTest;
+import jakarta.inject.Inject;
 
 /**
  * Test for {@link PrincipalHttpFilter}.
diff --git a/src/test/java/io/kokuwa/micronaut/logging/request/TestClient.java b/src/test/java/io/kokuwa/micronaut/logging/request/TestClient.java
index 669e907..edebb40 100644
--- a/src/test/java/io/kokuwa/micronaut/logging/request/TestClient.java
+++ b/src/test/java/io/kokuwa/micronaut/logging/request/TestClient.java
@@ -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.fail;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 import com.nimbusds.jose.JOSEException;
 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.annotation.Client;
 import io.micronaut.security.token.jwt.signature.SignatureGeneratorConfiguration;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 /**
  * Contoller for testing {@link HeaderLoggingServerHttpFilter} and {@link PrincipalHttpFilter}.