Merge pull request #18299 from panos-kakos/JAVA-42060

[JAVA-42060]

Author: ulisseslima

pom.xml

@@ -1419,7 +1419,6 @@
                 <module>quarkus-modules/consume-rest-api/consume-api</module>
                 <module>maven-modules/maven-exec-plugin</module> <!-- JAVA-42059 -->
                 <module>maven-modules/dependencygraph</module> <!-- JAVA-42057 -->
-                <module>spring-boot-modules/spring-boot-swagger-2</module> <!-- JAVA-42060 -->
                 <module>spring-boot-modules/spring-boot-groovy</module> <!-- JAVA-42052 -->
                 <module>spring-boot-modules/spring-boot-data-3</module> <!-- JAVA-42051 -->
                 <module>spring-reactive-modules/spring-reactive-performance</module> <!-- JAVA-42050 -->
@@ -1492,7 +1491,6 @@
                 <module>quarkus-modules/consume-rest-api/consume-api</module>
                 <module>maven-modules/maven-exec-plugin</module> <!-- JAVA-42059 -->
                 <module>maven-modules/dependencygraph</module> <!-- JAVA-42057 -->
-                <module>spring-boot-modules/spring-boot-swagger-2</module> <!-- JAVA-42060 -->
                 <module>spring-boot-modules/spring-boot-groovy</module> <!-- JAVA-42052 -->
                 <module>spring-boot-modules/spring-boot-data-3</module> <!-- JAVA-42051 -->
                 <module>spring-reactive-modules/spring-reactive-performance</module> <!-- JAVA-42050 -->

spring-boot-modules/pom.xml

@@ -82,8 +82,7 @@
         <module>spring-boot-telegram</module>
         <module>spring-boot-springdoc</module>
         <module>spring-boot-swagger</module>
-        <!--        <module>spring-boot-swagger-2</module>--> <!-- failing after upgrading to spring boot 3. Swagger codegen yet not
-        compatible?!--> <!-- JAVA-42060 -->
+        <module>spring-boot-swagger-2</module>
         <module>spring-boot-swagger-jwt</module>
         <module>spring-boot-swagger-keycloak</module>
         <module>spring-boot-swagger-springfox</module>

spring-boot-modules/spring-boot-swagger-2/pom.xml

@@ -29,25 +29,16 @@
             <artifactId>springdoc-openapi-ui</artifactId>
             <version>${springdoc.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-oas</artifactId>
-            <version>${springfox.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <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>
+        <dependency>
+            <groupId>org.openapitools</groupId>
+            <artifactId>jackson-databind-nullable</artifactId>
+            <version>${jackson-databind-nullable}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -66,8 +57,10 @@
                             <inputSpec>${project.basedir}/src/main/resources/static/api_3.yaml</inputSpec>
                             <language>spring</language>
                             <configOptions>
-                                <java8>true</java8>
                                 <interfaceOnly>true</interfaceOnly>
+                                <jakarta>true</jakarta>
+                                <java8>true</java8>
+                                <useSpringBoot3>true</useSpringBoot3>
                             </configOptions>
                         </configuration>
                     </execution>
@@ -82,6 +75,8 @@
                             <configOptions>
                                 <java8>true</java8>
                                 <dateLibrary>custom</dateLibrary>
+                                <jakarta>true</jakarta>
+                                <useSpringBoot3>true</useSpringBoot3>
                             </configOptions>
                             <typeMappings>
                                 <typeMapping>DateTime=Instant</typeMapping>
@@ -114,6 +109,8 @@
                                 <dateLibrary>custom</dateLibrary>
                                 <openApiNullable>false</openApiNullable>
                                 <interfaceOnly>true</interfaceOnly>
+                                <useSpringBoot3>true</useSpringBoot3>
+                                <useJakarta>true</useJakarta>
                             </configOptions>
                             <typeMappings>
                                 <typeMapping>DateTime=Instant</typeMapping>
@@ -138,12 +135,11 @@
     </build>
 
     <properties>
-        <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>
+        <openapi-generator.version>7.11.0</openapi-generator.version>
+        <jackson-databind-nullable>0.2.6</jackson-databind-nullable>
+        <swagger-codegen-maven-plugin.version>3.0.67</swagger-codegen-maven-plugin.version>
+        <springdoc.version>1.8.0</springdoc.version>
+        <swagger-annotations.version>2.2.28</swagger-annotations.version>
         <start-class>com.baeldung.tworesponses.Application</start-class>
     </properties>
 

spring-boot-modules/spring-boot-swagger-2/src/test/java/com/baeldung/dates/EventUnitTest.java

@@ -5,9 +5,9 @@
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
 
 import org.junit.jupiter.api.Test;