Full compatibility with micronaut openapi 6.13.0

micronaut-projects · Oct 19, 2024 · 6631274 · 6631274
1 parent 86a1373
commit 6631274
Show file tree

Hide file tree

Showing 20 changed files with 420 additions and 108 deletions.
diff --git a/examples/groovy/pom.xml b/examples/groovy/pom.xml
@@ -14,8 +14,8 @@
  </parent>
  <properties>
  <packaging>jar</packaging>
- <micronaut.version>4.0.0-SNAPSHOT</micronaut.version>
- <micronaut-maven-plugin.version>4.0.0-SNAPSHOT</micronaut-maven-plugin.version>
+ <micronaut.version>4.6.3</micronaut.version>
+ <micronaut-maven-plugin.version>4.6.3</micronaut-maven-plugin.version>
  <micronaut.runtime>netty</micronaut.runtime>
  <exec.mainClass>io.micronaut.maven.examples.Application</exec.mainClass>
  <groovyVersion>4.0.12</groovyVersion>

diff --git a/examples/java/pom.xml b/examples/java/pom.xml
@@ -13,8 +13,8 @@
  </parent>
 
  <properties>
- <micronaut.version>4.0.0-M1</micronaut.version>
- <micronaut-maven-plugin.version>4.0.0-SNAPSHOT</micronaut-maven-plugin.version>
+ <micronaut.version>4.6.3</micronaut.version>
+ <micronaut-maven-plugin.version>4.6.3</micronaut-maven-plugin.version>
  <exec.mainClass>io.micronaut.maven.examples.Application</exec.mainClass>
  <packaging>jar</packaging>
  <micronaut.runtime>netty</micronaut.runtime>

diff --git a/examples/kotlin/pom.xml b/examples/kotlin/pom.xml
@@ -14,10 +14,10 @@
  </parent>
  <properties>
  <packaging>jar</packaging>
- <micronaut.version>4.0.0-SNAPSHOT</micronaut.version>
- <micronaut-maven-plugin.version>4.0.0-SNAPSHOT</micronaut-maven-plugin.version>
+ <micronaut.version>4.6.3</micronaut.version>
+ <micronaut-maven-plugin.version>4.6.3</micronaut-maven-plugin.version>
  <micronaut.runtime>netty</micronaut.runtime>
- <kotlinVersion>1.8.22</kotlinVersion>
+ <kotlinVersion>1.9.25</kotlinVersion>
  <exec.mainClass>io.micronaut.maven.examples.ApplicationKt</exec.mainClass>
  </properties>
 

diff --git a/examples/multi-project/pom.xml b/examples/multi-project/pom.xml
@@ -15,8 +15,8 @@
  <packaging>pom</packaging>
 
  <properties>
- <micronaut.version>4.0.0-SNAPSHOT</micronaut.version>
- <micronaut-maven-plugin.version>4.0.0-SNAPSHOT</micronaut-maven-plugin.version>
+ <micronaut.version>4.6.3</micronaut.version>
+ <micronaut-maven-plugin.version>4.6.3</micronaut-maven-plugin.version>
  <micronaut.runtime>netty</micronaut.runtime>
  <exec.mainClass>io.micronaut.build.examples.Application</exec.mainClass>
  </properties>

diff --git a/micronaut-maven-enforcer-rules/pom.xml b/micronaut-maven-enforcer-rules/pom.xml
@@ -16,9 +16,8 @@
  <description>Custom Enforcer rules for Micronaut applications</description>
 
  <properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
  </properties>
 
  <dependencies>
@@ -30,13 +29,13 @@
  <dependency>
  <groupId>org.apache.maven.enforcer</groupId>
  <artifactId>enforcer-api</artifactId>
- <version>${maven-enforcer-plugin.version}</version>
+ <version>${maven.enforcer-plugin.version}</version>
  <scope>provided</scope>
  </dependency>
  <dependency>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-enforcer-plugin</artifactId>
- <version>${maven-enforcer-plugin.version}</version>
+ <version>${maven.enforcer-plugin.version}</version>
  <scope>provided</scope>
  </dependency>
  </dependencies>

diff --git a/micronaut-maven-integration-tests/pom.xml b/micronaut-maven-integration-tests/pom.xml
@@ -19,7 +19,8 @@
  <maven.deploy.skip>true</maven.deploy.skip>
  <maven.javadoc.skip>true</maven.javadoc.skip>
 
- <it.micronaut.version>4.6.2</it.micronaut.version>
+ <it.micronaut.core.version>4.7.0</it.micronaut.core.version>
+ <it.micronaut.version>4.6.3</it.micronaut.version>
 
  <!-- Enable recording of coverage during execution of maven-invoker-plugin -->
  <jacoco.propertyName>invoker.mavenOpts</jacoco.propertyName>
@@ -74,7 +75,7 @@
  <dependency>
  <groupId>org.apache.groovy</groupId>
  <artifactId>groovy</artifactId>
- <version>4.0.23</version>
+ <version>${groovy.version}</version>
  </dependency>
  </dependencies>
  <configuration>

diff --git a/micronaut-maven-integration-tests/src/it/multi-project-multi-runnable-error/lib/pom.xml b/micronaut-maven-integration-tests/src/it/multi-project-multi-runnable-error/lib/pom.xml
@@ -14,6 +14,7 @@
 
  <properties>
  <micronaut.version>@it.micronaut.version@</micronaut.version>
+ <micronaut.core.version>@it.micronaut.core.version@</micronaut.core.version>
  </properties>
 
  <dependencies>
@@ -90,7 +91,7 @@
  <path>
  <groupId>io.micronaut</groupId>
  <artifactId>micronaut-http-validation</artifactId>
- <version>${micronaut.version}</version>
+ <version>${micronaut.core.version}</version>
  </path>
  </annotationProcessorPaths>
  <compilerArgs>

diff --git a/micronaut-maven-integration-tests/src/it/multi-project-multi-runnable/lib/pom.xml b/micronaut-maven-integration-tests/src/it/multi-project-multi-runnable/lib/pom.xml
@@ -14,6 +14,7 @@
 
  <properties>
  <micronaut.version>@it.micronaut.version@</micronaut.version>
+ <micronaut.core.version>@it.micronaut.core.version@</micronaut.core.version>
  </properties>
 
  <dependencies>
@@ -90,7 +91,7 @@
  <path>
  <groupId>io.micronaut</groupId>
  <artifactId>micronaut-http-validation</artifactId>
- <version>${micronaut.version}</version>
+ <version>${micronaut.core.version}</version>
  </path>
  </annotationProcessorPaths>
  <compilerArgs>

diff --git a/micronaut-maven-integration-tests/src/it/multi-project/lib/pom.xml b/micronaut-maven-integration-tests/src/it/multi-project/lib/pom.xml
@@ -14,6 +14,7 @@
 
  <properties>
  <micronaut.version>@it.micronaut.version@</micronaut.version>
+ <micronaut.core.version>@it.micronaut.core.version@</micronaut.core.version>
  </properties>
 
  <dependencies>
@@ -90,7 +91,7 @@
  <path>
  <groupId>io.micronaut</groupId>
  <artifactId>micronaut-http-validation</artifactId>
- <version>${micronaut.version}</version>
+ <version>${micronaut.core.version}</version>
  </path>
  </annotationProcessorPaths>
  <compilerArgs>

diff --git a/micronaut-maven-integration-tests/src/it/openapi-generate-server-mapped-types/pom.xml b/micronaut-maven-integration-tests/src/it/openapi-generate-server-mapped-types/pom.xml
@@ -165,7 +165,11 @@
  <isListWrapper>true</isListWrapper>
  </responseBodyMapping>
  </responseBodyMappings>
-
+ <additionalProperties>
+ <lombok>true</lombok>
+ <additionalEnumTypeAnnotations>@io.micronaut.aot.core.AOTModule</additionalEnumTypeAnnotations>
+ <additionalEnumTypeAnnotations>@io.test.MyAnnotation</additionalEnumTypeAnnotations>
+ </additionalProperties>
  </configuration>
  </plugin>
  <plugin>

diff --git a/...e-server-mapped-types/src/main/java/io/micronaut/openapi/controller/MappedController.java b/...e-server-mapped-types/src/main/java/io/micronaut/openapi/controller/MappedController.java
@@ -1,6 +1,5 @@
 package io.micronaut.openapi.controller;
 
-
 import io.micronaut.http.annotation.*;
 import reactor.core.publisher.Mono;
 import io.micronaut.openapi.dated.DatedResponse;
@@ -25,7 +24,6 @@
 import io.micronaut.openapi.api.MappedApi;
 import java.time.ZonedDateTime;
 
-
 @Controller
 public class MappedController implements MappedApi {
 

diff --git a/micronaut-maven-integration-tests/src/it/openapi-generate-server/pom.xml b/micronaut-maven-integration-tests/src/it/openapi-generate-server/pom.xml
@@ -14,6 +14,7 @@
 
  <properties>
  <micronaut.version>@it.micronaut.version@</micronaut.version>
+ <lombok.version>1.18.34</lombok.version>
  <micronaut-maven-plugin.version>@project.version@</micronaut-maven-plugin.version>
  <packaging>jar</packaging>
  <micronaut.runtime>netty</micronaut.runtime>
@@ -24,6 +25,11 @@
  </properties>
 
  <dependencies>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
  <dependency>
  <groupId>io.micronaut</groupId>
  <artifactId>micronaut-inject</artifactId>
@@ -101,6 +107,12 @@
  <groupId>io.micronaut.maven</groupId>
  <artifactId>micronaut-maven-plugin</artifactId>
  <version>${micronaut-maven-plugin.version}</version>
+ <configuration>
+ <lombok>true</lombok>
+ <typeMapping>
+ <file>StreamingFileUpload</file>
+ </typeMapping>
+ </configuration>
  </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
@@ -109,6 +121,11 @@
  <!-- Uncomment to enable incremental compilation -->
  <!-- <useIncrementalCompilation>false</useIncrementalCompilation> -->
  <annotationProcessorPaths combine.children="append">
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </path>
  <path>
  <groupId>io.micronaut</groupId>
  <artifactId>micronaut-graal</artifactId>

diff --git a/micronaut-maven-integration-tests/src/it/openapi-generate-server/verify.groovy b/micronaut-maven-integration-tests/src/it/openapi-generate-server/verify.groovy
@@ -10,3 +10,10 @@ assert new File(basedir, "target/classes/io/micronaut/openapi/api/PetApi.class")
 assert new File(basedir, "target/classes/io/micronaut/openapi/model/Pet.class").exists()
 
 assert !petApi.text.contains("import jakarta.annotation.Generated;")
+
+def category = new File(basedir, "target/generated-sources/openapi/src/main/java/io/micronaut/openapi/model/Category.java")
+assert category.exists()
+assert category.text.contains("@Accessors(chain = true)")
+assert category.text.contains("@NoArgsConstructor")
+assert category.text.contains("@AllArgsConstructor")
+assert category.text.contains("@Data")
diff --git a/micronaut-maven-jib-integration/pom.xml b/micronaut-maven-jib-integration/pom.xml
@@ -32,17 +32,17 @@
  <dependency>
  <groupId>com.google.cloud.tools</groupId>
  <artifactId>jib-maven-plugin-extension-api</artifactId>
- <version>0.4.0</version>
+ <version>${jib.maven-plugin-extension-api.version}</version>
  </dependency>
  <dependency>
  <groupId>com.google.cloud.tools</groupId>
  <artifactId>jib-native-image-extension-maven</artifactId>
- <version>0.1.0</version>
+ <version>${jib.maven-native-image-extension.version}</version>
  </dependency>
  <dependency>
  <groupId>com.google.cloud.tools</groupId>
  <artifactId>jib-core</artifactId>
- <version>0.27.1</version>
+ <version>${jib.core.version}</version>
  </dependency>
  <dependency>
  <groupId>org.yaml</groupId>

diff --git a/micronaut-maven-plugin/pom.xml b/micronaut-maven-plugin/pom.xml
@@ -42,7 +42,7 @@
  <dependency>
  <groupId>org.apache.maven.shared</groupId>
  <artifactId>maven-invoker</artifactId>
- <version>3.3.0</version>
+ <version>${maven.invoker-plugin.version}</version>
  </dependency>
  <dependency>
  <groupId>org.apache.maven.plugin-tools</groupId>
@@ -56,7 +56,7 @@
  <dependency>
  <groupId>org.twdata.maven</groupId>
  <artifactId>mojo-executor</artifactId>
- <version>2.4.0</version>
+ <version>${mojo-executor.version}</version>
  </dependency>
  <dependency>
  <groupId>io.methvin</groupId>
@@ -71,12 +71,12 @@
  <dependency>
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-compress</artifactId>
- <version>1.26.2</version>
+ <version>${commons-compress.version}</version>
  </dependency>
  <dependency>
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-lang3</artifactId>
- <version>3.17.0</version>
+ <version>${commons-lang3.version}</version>
  </dependency>
 
  <dependency>
@@ -98,7 +98,7 @@
  <dependency>
  <groupId>org.fusesource.jansi</groupId>
  <artifactId>jansi</artifactId>
- <version>2.4.1</version>
+ <version>${jansi.version}</version>
  </dependency>
  <!-- JUnit -->
  <dependency>
@@ -114,13 +114,13 @@
  <dependency>
  <groupId>org.apache.maven.plugin-testing</groupId>
  <artifactId>maven-plugin-testing-harness</artifactId>
- <version>3.3.0</version>
+ <version>${maven.testing-harness-plugin.version}</version>
  <scope>test</scope>
  </dependency>
  <dependency>
  <groupId>org.mockito</groupId>
  <artifactId>mockito-core</artifactId>
- <version>5.12.0</version>
+ <version>${mockito.version}</version>
  <scope>test</scope>
  </dependency>