From 0a18e140e3a321097d50d3f7d823e784c13526b5 Mon Sep 17 00:00:00 2001
From: Bipin kumar <sayy2bipin@gmail.com>
Date: Sat, 6 Jan 2024 16:51:26 +0530
Subject: [PATCH] JAVA-26758: Upgrade openapi-generator-maven-plugin  (#15257)

---
 lombok-modules/lombok-2/pom.xml               | 27 ++++++++++++++-----
 .../lombok-2/src/main/resources/bookapi.yml   |  4 ---
 .../spring-boot-libraries-2/pom.xml           |  2 +-
 .../spring-boot-swagger-2/pom.xml             |  8 +++++-
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/lombok-modules/lombok-2/pom.xml b/lombok-modules/lombok-2/pom.xml
index ea562ad896..9e1191afaa 100644
--- a/lombok-modules/lombok-2/pom.xml
+++ b/lombok-modules/lombok-2/pom.xml
@@ -35,15 +35,25 @@
             <artifactId>javax.annotation-api</artifactId>
             <version>${javax.annotation}</version>
         </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger.annotation}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-annotations.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openapitools</groupId>
+            <artifactId>jackson-databind-nullable</artifactId>
+            <version>${jackson-databind-nullable.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>${validation-api.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -58,7 +68,7 @@
                         </goals>
                         <configuration>
                             <inputSpec>${project.basedir}/src/main/resources/bookapi.yml</inputSpec>
-                            <generatorName>java</generatorName>
+                            <generatorName>spring</generatorName>
                             <modelPackage>com.baeldung.openapi.model</modelPackage>
                             <configOptions>
                                 <additionalModelTypeAnnotations>@lombok.Data @lombok.NoArgsConstructor @lombok.AllArgsConstructor</additionalModelTypeAnnotations>
@@ -73,10 +83,13 @@
         </plugins>
     </build>
     <properties>
-        <openapi.version>4.2.3</openapi.version>
+        <openapi.version>7.1.0</openapi.version>
         <gson.version>2.10.1</gson.version>
         <javax.annotation>1.3.2</javax.annotation>
         <swagger.annotation>1.6.2</swagger.annotation>
+        <swagger-annotations.version>2.2.19</swagger-annotations.version>
+        <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
+        <validation-api.version>2.0.1.Final</validation-api.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/lombok-modules/lombok-2/src/main/resources/bookapi.yml b/lombok-modules/lombok-2/src/main/resources/bookapi.yml
index e9b63b2f85..cb6e7ad644 100644
--- a/lombok-modules/lombok-2/src/main/resources/bookapi.yml
+++ b/lombok-modules/lombok-2/src/main/resources/bookapi.yml
@@ -25,10 +25,6 @@ components:
   schemas:
     Book:
       type: object
-      required:
-        - id
-        - name
-        - author
       properties:
         id:
           type: integer
diff --git a/spring-boot-modules/spring-boot-libraries-2/pom.xml b/spring-boot-modules/spring-boot-libraries-2/pom.xml
index 1734a7d5ac..497972d85a 100644
--- a/spring-boot-modules/spring-boot-libraries-2/pom.xml
+++ b/spring-boot-modules/spring-boot-libraries-2/pom.xml
@@ -166,7 +166,7 @@
         <spring-modulith-bom.version>0.5.1</spring-modulith-bom.version>
         <jobrunr-spring-boot-starter.version>3.1.1</jobrunr-spring-boot-starter.version>
         <awaitility.version>4.0.3</awaitility.version>
-        <openapi-generator.version>5.3.0</openapi-generator.version>
+        <openapi-generator.version>7.1.0</openapi-generator.version>
         <spring.data.version>2.4.5</spring.data.version>
         <jackson-databind-nullable.version>0.2.1</jackson-databind-nullable.version>
         <reflections.version>0.10.2</reflections.version>
diff --git a/spring-boot-modules/spring-boot-swagger-2/pom.xml b/spring-boot-modules/spring-boot-swagger-2/pom.xml
index 12b9bf664b..870477f51d 100644
--- a/spring-boot-modules/spring-boot-swagger-2/pom.xml
+++ b/spring-boot-modules/spring-boot-swagger-2/pom.xml
@@ -43,6 +43,11 @@
             <artifactId>springfox-swagger2</artifactId>
             <version>${springfox.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-annotations.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -133,11 +138,12 @@
     </build>
 
     <properties>
-        <openapi-generator.version>6.2.1</openapi-generator.version>
+        <openapi-generator.version>7.1.0</openapi-generator.version>
         <springfox.version>3.0.0</springfox.version>
         <swagger-codegen-maven-plugin.version>3.0.34</swagger-codegen-maven-plugin.version>
         <springdoc.version>1.6.10</springdoc.version>
         <swagger-maven-plugin.version>3.1.1</swagger-maven-plugin.version>
+        <swagger-annotations.version>2.2.19</swagger-annotations.version>
         <start-class>com.baeldung.tworesponses.Application</start-class>
     </properties>