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-07-19 14:52:12 +02:00
parent 8043c3eb6d
commit 071fcd969b
Signed by: stephan.schnabel
GPG key ID: E07AF5BA239FE543
3 changed files with 26 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

43
pom.xml
View file

@ -69,7 +69,7 @@
<!-- ============================= Versions ============================== -->
<!-- ===================================================================== -->
<version.io.micronaut>3.9.4</version.io.micronaut>
<version.io.micronaut>4.0.0</version.io.micronaut>
<version.org.slf4j>2.0.7</version.org.slf4j>
<version.ch.qos.logback>1.4.8</version.ch.qos.logback>
@ -78,8 +78,8 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-bom</artifactId>
<groupId>io.micronaut.platform</groupId>
<artifactId>micronaut-platform</artifactId>
<version>${version.io.micronaut}</version>
<type>pom</type>
<scope>import</scope>
@ -106,29 +106,13 @@
<!-- micronaut -->
<dependency>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-runtime</artifactId>
<artifactId>micronaut-http</artifactId>
<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>
<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>
@ -150,6 +134,22 @@
<artifactId>micronaut-security-jwt</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.micronaut.serde</groupId>
<artifactId>micronaut-serde-jackson</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<scope>test</scope>
</dependency>
<!-- library -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<!-- slf4j/logback -->
<dependency>
@ -198,9 +198,6 @@
</goals>
<configuration>
<parallelThreads>0.5C</parallelThreads>
<!-- logback 1.3+ is not supported by micronaut-->
<!-- https://github.com/micronaut-projects/micronaut-core/issues/8810 -->
<pomExcludes>level-from-micronaut/pom.xml</pomExcludes>
</configuration>
</execution>
</executions>

21
src/it/pom.xml
View file

@ -49,8 +49,6 @@
<version.io.kokuwa.micronaut.logging>@project.version@</version.io.kokuwa.micronaut.logging>
<version.io.micronaut>@version.io.micronaut@</version.io.micronaut>
<version.org.slf4j>@version.org.slf4j@</version.org.slf4j>
<version.ch.qos.logback>@version.ch.qos.logback@</version.ch.qos.logback>
</properties>
@ -62,27 +60,12 @@
<version>${version.io.kokuwa.micronaut.logging}</version>
</dependency>
<dependency>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-bom</artifactId>
<groupId>io.micronaut.platform</groupId>
<artifactId>micronaut-platform</artifactId>
<version>${version.io.micronaut}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${version.org.slf4j}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${version.ch.qos.logback}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${version.ch.qos.logback}</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;