Skip to content

Commit 4f30310

Browse files
ulisseslimaulisseslima
authored
Merge pull request #18299 from panos-kakos/JAVA-42060
[JAVA-42060]
2 parents bc1b217 + 98e5e93 commit 4f30310

File tree

4 files changed

+21
-28
lines changed

4 files changed

+21
-28
lines changed

‎pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1419,7 +1419,6 @@
14191419
<module>quarkus-modules/consume-rest-api/consume-api</module>
14201420
<module>maven-modules/maven-exec-plugin</module> <!-- JAVA-42059 -->
14211421
<module>maven-modules/dependencygraph</module> <!-- JAVA-42057 -->
1422-
<module>spring-boot-modules/spring-boot-swagger-2</module> <!-- JAVA-42060 -->
14231422
<module>spring-boot-modules/spring-boot-groovy</module> <!-- JAVA-42052 -->
14241423
<module>spring-boot-modules/spring-boot-data-3</module> <!-- JAVA-42051 -->
14251424
<module>spring-reactive-modules/spring-reactive-performance</module> <!-- JAVA-42050 -->
@@ -1492,7 +1491,6 @@
14921491
<module>quarkus-modules/consume-rest-api/consume-api</module>
14931492
<module>maven-modules/maven-exec-plugin</module> <!-- JAVA-42059 -->
14941493
<module>maven-modules/dependencygraph</module> <!-- JAVA-42057 -->
1495-
<module>spring-boot-modules/spring-boot-swagger-2</module> <!-- JAVA-42060 -->
14961494
<module>spring-boot-modules/spring-boot-groovy</module> <!-- JAVA-42052 -->
14971495
<module>spring-boot-modules/spring-boot-data-3</module> <!-- JAVA-42051 -->
14981496
<module>spring-reactive-modules/spring-reactive-performance</module> <!-- JAVA-42050 -->

‎spring-boot-modules/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@
8282
<module>spring-boot-telegram</module>
8383
<module>spring-boot-springdoc</module>
8484
<module>spring-boot-swagger</module>
85-
<!-- <module>spring-boot-swagger-2</module>--> <!-- failing after upgrading to spring boot 3. Swagger codegen yet not
86-
compatible?!--> <!-- JAVA-42060 -->
85+
<module>spring-boot-swagger-2</module>
8786
<module>spring-boot-swagger-jwt</module>
8887
<module>spring-boot-swagger-keycloak</module>
8988
<module>spring-boot-swagger-springfox</module>

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

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,16 @@
2929
<artifactId>springdoc-openapi-ui</artifactId>
3030
<version>${springdoc.version}</version>
3131
</dependency>
32-
<dependency>
33-
<groupId>io.springfox</groupId>
34-
<artifactId>springfox-oas</artifactId>
35-
<version>${springfox.version}</version>
36-
</dependency>
37-
<dependency>
38-
<groupId>javax.validation</groupId>
39-
<artifactId>validation-api</artifactId>
40-
</dependency>
41-
<dependency>
42-
<groupId>io.springfox</groupId>
43-
<artifactId>springfox-swagger2</artifactId>
44-
<version>${springfox.version}</version>
45-
</dependency>
4632
<dependency>
4733
<groupId>io.swagger.core.v3</groupId>
4834
<artifactId>swagger-annotations</artifactId>
4935
<version>${swagger-annotations.version}</version>
5036
</dependency>
37+
<dependency>
38+
<groupId>org.openapitools</groupId>
39+
<artifactId>jackson-databind-nullable</artifactId>
40+
<version>${jackson-databind-nullable}</version>
41+
</dependency>
5142
</dependencies>
5243

5344
<build>
@@ -66,8 +57,10 @@
6657
<inputSpec>${project.basedir}/src/main/resources/static/api_3.yaml</inputSpec>
6758
<language>spring</language>
6859
<configOptions>
69-
<java8>true</java8>
7060
<interfaceOnly>true</interfaceOnly>
61+
<jakarta>true</jakarta>
62+
<java8>true</java8>
63+
<useSpringBoot3>true</useSpringBoot3>
7164
</configOptions>
7265
</configuration>
7366
</execution>
@@ -82,6 +75,8 @@
8275
<configOptions>
8376
<java8>true</java8>
8477
<dateLibrary>custom</dateLibrary>
78+
<jakarta>true</jakarta>
79+
<useSpringBoot3>true</useSpringBoot3>
8580
</configOptions>
8681
<typeMappings>
8782
<typeMapping>DateTime=Instant</typeMapping>
@@ -114,6 +109,8 @@
114109
<dateLibrary>custom</dateLibrary>
115110
<openApiNullable>false</openApiNullable>
116111
<interfaceOnly>true</interfaceOnly>
112+
<useSpringBoot3>true</useSpringBoot3>
113+
<useJakarta>true</useJakarta>
117114
</configOptions>
118115
<typeMappings>
119116
<typeMapping>DateTime=Instant</typeMapping>
@@ -138,12 +135,11 @@
138135
</build>
139136

140137
<properties>
141-
<openapi-generator.version>7.1.0</openapi-generator.version>
142-
<springfox.version>3.0.0</springfox.version>
143-
<swagger-codegen-maven-plugin.version>3.0.34</swagger-codegen-maven-plugin.version>
144-
<springdoc.version>1.6.10</springdoc.version>
145-
<swagger-maven-plugin.version>3.1.1</swagger-maven-plugin.version>
146-
<swagger-annotations.version>2.2.19</swagger-annotations.version>
138+
<openapi-generator.version>7.11.0</openapi-generator.version>
139+
<jackson-databind-nullable>0.2.6</jackson-databind-nullable>
140+
<swagger-codegen-maven-plugin.version>3.0.67</swagger-codegen-maven-plugin.version>
141+
<springdoc.version>1.8.0</springdoc.version>
142+
<swagger-annotations.version>2.2.28</swagger-annotations.version>
147143
<start-class>com.baeldung.tworesponses.Application</start-class>
148144
</properties>
149145

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
import java.util.Set;
77

8-
import javax.validation.ConstraintViolation;
9-
import javax.validation.Validation;
10-
import javax.validation.Validator;
8+
import jakarta.validation.ConstraintViolation;
9+
import jakarta.validation.Validation;
10+
import jakarta.validation.Validator;
1111

1212
import org.junit.jupiter.api.Test;
1313

0 commit comments

Comments
 (0)