Bump micronaut to 4.x
This commit is contained in:
parent
6de0f02d59
commit
d53a54b8c3
3 changed files with 26 additions and 43 deletions
43
pom.xml
43
pom.xml
|
@ -69,7 +69,7 @@
|
||||||
<!-- ============================= Versions ============================== -->
|
<!-- ============================= 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.org.slf4j>2.0.7</version.org.slf4j>
|
||||||
<version.ch.qos.logback>1.4.8</version.ch.qos.logback>
|
<version.ch.qos.logback>1.4.8</version.ch.qos.logback>
|
||||||
|
|
||||||
|
@ -78,8 +78,8 @@
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.micronaut</groupId>
|
<groupId>io.micronaut.platform</groupId>
|
||||||
<artifactId>micronaut-bom</artifactId>
|
<artifactId>micronaut-platform</artifactId>
|
||||||
<version>${version.io.micronaut}</version>
|
<version>${version.io.micronaut}</version>
|
||||||
<type>pom</type>
|
<type>pom</type>
|
||||||
<scope>import</scope>
|
<scope>import</scope>
|
||||||
|
@ -106,29 +106,13 @@
|
||||||
<!-- micronaut -->
|
<!-- micronaut -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.micronaut</groupId>
|
<groupId>io.micronaut</groupId>
|
||||||
<artifactId>micronaut-runtime</artifactId>
|
<artifactId>micronaut-http</artifactId>
|
||||||
<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>
|
||||||
<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>
|
||||||
|
@ -150,6 +134,22 @@
|
||||||
<artifactId>micronaut-security-jwt</artifactId>
|
<artifactId>micronaut-security-jwt</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</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 -->
|
<!-- slf4j/logback -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -198,9 +198,6 @@
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<parallelThreads>0.5C</parallelThreads>
|
<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>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
|
|
|
@ -49,8 +49,6 @@
|
||||||
|
|
||||||
<version.io.kokuwa.micronaut.logging>@project.version@</version.io.kokuwa.micronaut.logging>
|
<version.io.kokuwa.micronaut.logging>@project.version@</version.io.kokuwa.micronaut.logging>
|
||||||
<version.io.micronaut>@version.io.micronaut@</version.io.micronaut>
|
<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>
|
</properties>
|
||||||
|
|
||||||
|
@ -62,27 +60,12 @@
|
||||||
<version>${version.io.kokuwa.micronaut.logging}</version>
|
<version>${version.io.kokuwa.micronaut.logging}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.micronaut</groupId>
|
<groupId>io.micronaut.platform</groupId>
|
||||||
<artifactId>micronaut-bom</artifactId>
|
<artifactId>micronaut-platform</artifactId>
|
||||||
<version>${version.io.micronaut}</version>
|
<version>${version.io.micronaut}</version>
|
||||||
<type>pom</type>
|
<type>pom</type>
|
||||||
<scope>import</scope>
|
<scope>import</scope>
|
||||||
</dependency>
|
</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>
|
</dependencies>
|
||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
|
@ -20,6 +20,7 @@ import com.nimbusds.jwt.JWTClaimsSet;
|
||||||
|
|
||||||
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.core.annotation.Nullable;
|
||||||
import io.micronaut.core.util.CollectionUtils;
|
import io.micronaut.core.util.CollectionUtils;
|
||||||
import io.micronaut.http.HttpHeaderValues;
|
import io.micronaut.http.HttpHeaderValues;
|
||||||
import io.micronaut.http.HttpRequest;
|
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.annotation.Secured;
|
||||||
import io.micronaut.security.rules.SecurityRule;
|
import io.micronaut.security.rules.SecurityRule;
|
||||||
import io.micronaut.security.token.jwt.signature.SignatureGeneratorConfiguration;
|
import io.micronaut.security.token.jwt.signature.SignatureGeneratorConfiguration;
|
||||||
|
import io.micronaut.serde.annotation.Serdeable;
|
||||||
import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
|
import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
|
||||||
import jakarta.inject.Inject;
|
import jakarta.inject.Inject;
|
||||||
|
|
||||||
|
@ -118,6 +120,7 @@ public abstract class AbstractFilterTest extends AbstractTest {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Serdeable
|
||||||
public static class TestResponse {
|
public static class TestResponse {
|
||||||
|
|
||||||
private final String path;
|
private final String path;
|
||||||
|
@ -128,7 +131,7 @@ public abstract class AbstractFilterTest extends AbstractTest {
|
||||||
public TestResponse(
|
public TestResponse(
|
||||||
@JsonProperty("path") String path,
|
@JsonProperty("path") String path,
|
||||||
@JsonProperty("level") String level,
|
@JsonProperty("level") String level,
|
||||||
@JsonProperty("context") Map<String, String> context) {
|
@Nullable @JsonProperty("context") Map<String, String> context) {
|
||||||
this.path = path;
|
this.path = path;
|
||||||
this.level = level;
|
this.level = level;
|
||||||
this.context = context == null ? Map.of() : context;
|
this.context = context == null ? Map.of() : context;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue