Skip to content

Commit

Permalink
Bump micronaut from 3.x to 4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@sschnabe
sschnabe committed Aug 9, 2023
1 parent 3a138e2 commit 6c38032
Show file tree
Hide file tree
Showing 32 changed files with 220 additions and 204 deletions.
1 change: 0 additions & 1 deletion gen/main/java/testapi/async/reactor/MediatypeApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ reactor.core.publisher.Mono<io.micronaut.http.HttpResponse<Multipart>> mediatype
@io.micronaut.http.annotation.Part(value = "userId")
java.lang.Integer userId,
@io.micronaut.core.annotation.NonNull
@io.micronaut.http.annotation.Part(value = "file")
io.micronaut.http.multipart.StreamingFileUpload file);

@io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload")
Expand Down
1 change: 0 additions & 1 deletion gen/main/java/testapi/async/simple/MediatypeApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ reactor.core.publisher.Mono<Multipart> mediatypeConsumesMultipartWithFileUpload(
@io.micronaut.http.annotation.Part(value = "userId")
java.lang.Integer userId,
@io.micronaut.core.annotation.NonNull
@io.micronaut.http.annotation.Part(value = "file")
io.micronaut.http.multipart.StreamingFileUpload file);

@io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload")
Expand Down
1 change: 0 additions & 1 deletion gen/main/java/testapi/defaults/MediatypeApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ io.micronaut.http.HttpResponse<Multipart> mediatypeConsumesMultipartWithFileUplo
@io.micronaut.http.annotation.Part(value = "userId")
java.lang.Integer userId,
@io.micronaut.core.annotation.NonNull
@io.micronaut.http.annotation.Part(value = "file")
io.micronaut.http.multipart.CompletedFileUpload file);

@io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload")
Expand Down
1 change: 0 additions & 1 deletion gen/main/java/testapi/modelsuffix/MediatypeApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ io.micronaut.http.HttpResponse<MultipartVO> mediatypeConsumesMultipartWithFileUp
@io.micronaut.http.annotation.Part(value = "userId")
java.lang.Integer userId,
@io.micronaut.core.annotation.NonNull
@io.micronaut.http.annotation.Part(value = "file")
io.micronaut.http.multipart.CompletedFileUpload file);

@io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload")
Expand Down
1 change: 0 additions & 1 deletion gen/main/java/testapi/nogeneric/MediatypeApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ Multipart mediatypeConsumesMultipartWithFileUpload(
@io.micronaut.http.annotation.Part(value = "userId")
java.lang.Integer userId,
@io.micronaut.core.annotation.NonNull
@io.micronaut.http.annotation.Part(value = "file")
io.micronaut.http.multipart.CompletedFileUpload file);

@io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload")
Expand Down
1 change: 0 additions & 1 deletion gen/main/java/testapi/nooptional/MediatypeApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ io.micronaut.http.HttpResponse<Multipart> mediatypeConsumesMultipartWithFileUplo
@io.micronaut.http.annotation.Part(value = "userId")
java.lang.Integer userId,
@io.micronaut.core.annotation.NonNull
@io.micronaut.http.annotation.Part(value = "file")
io.micronaut.http.multipart.CompletedFileUpload file);

@io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload")
Expand Down
1 change: 0 additions & 1 deletion gen/main/java/testapi/novalidation/MediatypeApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ io.micronaut.http.HttpResponse<Multipart> mediatypeConsumesMultipartWithFileUplo
@io.micronaut.http.annotation.Part(value = "userId")
java.lang.Integer userId,
@io.micronaut.core.annotation.NonNull
@io.micronaut.http.annotation.Part(value = "file")
io.micronaut.http.multipart.CompletedFileUpload file);

@io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload")
Expand Down
1 change: 0 additions & 1 deletion gen/main/java/testapi/packages/api/MediatypeApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ io.micronaut.http.HttpResponse<Multipart> mediatypeConsumesMultipartWithFileUplo
@io.micronaut.http.annotation.Part(value = "userId")
java.lang.Integer userId,
@io.micronaut.core.annotation.NonNull
@io.micronaut.http.annotation.Part(value = "file")
io.micronaut.http.multipart.CompletedFileUpload file);

@io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload")
Expand Down
1 change: 0 additions & 1 deletion gen/main/java/testapi/types/MediatypeApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ io.micronaut.http.HttpResponse<Multipart> mediatypeConsumesMultipartWithFileUplo
@io.micronaut.http.annotation.Part(value = "userId")
java.lang.Integer userId,
@io.micronaut.core.annotation.NonNull
@io.micronaut.http.annotation.Part(value = "file")
io.micronaut.http.multipart.CompletedFileUpload file);

@io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload")
Expand Down
179 changes: 54 additions & 125 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,31 +67,56 @@

<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.compilerArgument>-Xlint:all,-processing,-unchecked,-rawtypes,-serial</maven.compiler.compilerArgument>

<!-- ===================================================================== -->
<!-- ============================= Versions ============================== -->
<!-- ===================================================================== -->

<version.io.micronaut>3.10.0</version.io.micronaut>
<version.io.micronaut.security>3.11.1</version.io.micronaut.security>
<version.org.junit.jupiter>5.10.0</version.org.junit.jupiter>
<version.io.micronaut.platform>4.0.3</version.io.micronaut.platform>
<version.org.openapitools.generator>7.0.0-beta</version.org.openapitools.generator>
<version.org.openapitools.jackson.nullable>0.2.6</version.org.openapitools.jackson.nullable>

</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.micronaut.platform</groupId>
<artifactId>micronaut-platform</artifactId>
<version>${version.io.micronaut.platform}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>

<!-- openapi -->
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator</artifactId>
<version>${version.org.openapitools.generator}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>jackson-databind-nullable</artifactId>
<version>${version.org.openapitools.jackson.nullable}</version>
<scope>test</scope>
</dependency>

<!-- micronaut -->
<dependency>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-http</artifactId>
<version>${version.io.micronaut}</version>
<exclusions>
<exclusion>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-inject</artifactId>
<artifactId>micronaut-context</artifactId>
</exclusion>
<exclusion>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-context-propagation</artifactId>
</exclusion>
<exclusion>
<groupId>io.micronaut</groupId>
Expand All @@ -110,7 +135,6 @@
<dependency>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-core</artifactId>
<version>${version.io.micronaut}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand All @@ -119,150 +143,54 @@
</exclusion>
</exclusions>
</dependency>

<!-- test -->
<dependency>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-http-client-core</artifactId>
<version>${version.io.micronaut}</version>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-core-reactive</artifactId>
</exclusion>
<exclusion>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-runtime</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- generated sources -->
<dependency>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-inject</artifactId>
<version>${version.io.micronaut}</version>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-validation</artifactId>
<version>${version.io.micronaut}</version>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-core-reactive</artifactId>
</exclusion>
<exclusion>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-inject</artifactId>
</exclusion>
<exclusion>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.micronaut.security</groupId>
<artifactId>micronaut-security</artifactId>
<version>${version.io.micronaut.security}</version>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-inject</artifactId>
</exclusion>
<exclusion>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-http-server</artifactId>
</exclusion>
<exclusion>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-validation</artifactId>
</exclusion>
<exclusion>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-http</artifactId>
</exclusion>
<exclusion>
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- openapi -->
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator</artifactId>
<version>${version.org.openapitools.generator}</version>
<scope>provided</scope>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>jackson-databind-nullable</artifactId>
<version>${version.org.openapitools.jackson.nullable}</version>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-http-client-core</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- test -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${version.org.junit.jupiter}</version>
<groupId>io.micronaut.security</groupId>
<artifactId>micronaut-security</artifactId>
<scope>test</scope>
</dependency>

<!-- generated sources -->
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.0.2</version>
<groupId>io.micronaut.serde</groupId>
<artifactId>micronaut-serde-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>5.3.25</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -318,6 +246,7 @@
<goal>testCompile</goal>
</goals>
<configuration>
<compilerArgument>-Xlint:none</compilerArgument>
<skip>${skipTests}</skip>
</configuration>
</execution>
Expand Down
22 changes: 14 additions & 8 deletions src/it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@

<!-- dependencies -->

<version.io.micronaut>@version.io.micronaut@</version.io.micronaut>
<version.io.micronaut.platform>@version.io.micronaut.platform@</version.io.micronaut.platform>
<version.io.micronaut.serde>2.2.0</version.io.micronaut.serde>
<version.org.openapitools.generator>@version.org.openapitools.generator@</version.org.openapitools.generator>
<version.org.openapitools.jackson.nullable>@version.org.openapitools.jackson.nullable@</version.org.openapitools.jackson.nullable>

Expand All @@ -48,9 +49,9 @@

<!-- micronaut -->
<dependency>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-bom</artifactId>
<version>${version.io.micronaut}</version>
<groupId>io.micronaut.platform</groupId>
<artifactId>micronaut-platform</artifactId>
<version>${version.io.micronaut.platform}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -64,11 +65,16 @@
</dependencyManagement>
<dependencies>

<!-- avoid compiler warning, see https://docs.micronaut.io/latest/guide/#_nullable_annotations -->
<!-- test -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<scope>provided</scope>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<scope>test</scope>
</dependency>

</dependencies>
Expand Down
11 changes: 10 additions & 1 deletion src/it/test-api-async-reactor-generic/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
<artifactId>micronaut-http-server-netty</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.micronaut.serde</groupId>
<artifactId>micronaut-serde-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.micronaut.xml</groupId>
<artifactId>micronaut-jackson-xml</artifactId>
Expand Down Expand Up @@ -81,7 +85,12 @@
<path>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-inject-java</artifactId>
<version>${version.io.micronaut}</version>
<version>${version.io.micronaut.platform}</version>
</path>
<path>
<groupId>io.micronaut.serde</groupId>
<artifactId>micronaut-serde-processor</artifactId>
<version>${version.io.micronaut.serde}</version>
</path>
</annotationProcessorPaths>
</configuration>
Expand Down
Loading

0 comments on commit 6c38032

Please sign in to comment.