Skip to content

Commit 9e3a107

Browse files
committed
fixed errors related to jakarta option in java templates
1 parent 5d6f16f commit 9e3a107

File tree

10 files changed

+1384
-16
lines changed

10 files changed

+1384
-16
lines changed

modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ import javax.ws.rs.core.Response.Status.Family;
3838
import javax.ws.rs.core.MediaType;
3939
{{/jakarta}}
4040

41-
import javax.ws.rs.core.Response.Status.Family;
42-
import javax.ws.rs.core.MediaType;
43-
4441
import java.util.Collection;
4542
import java.util.Collections;
4643
import java.util.Map;

modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,12 +301,22 @@
301301
{{/supportJava6}}
302302
{{#useBeanValidation}}
303303
<!-- Bean Validation API support -->
304+
{{#jakarta}}
304305
<dependency>
305306
<groupId>jakarta.validation</groupId>
306307
<artifactId>jakarta.validation-api</artifactId>
307-
<version>{{#jakarta}}3.0.2{{/jakarta}}{{^jakarta}}2.0.2{{/jakarta}}</version>
308+
<version>3.0.2</version>
308309
<scope>provided</scope>
309310
</dependency>
311+
{{/jakarta}}
312+
{{^jakarta}}
313+
<dependency>
314+
<groupId>javax.validation</groupId>
315+
<artifactId>validation-api</artifactId>
316+
<version>1.1.0.Final</version>
317+
<scope>provided</scope>
318+
</dependency>
319+
{{/jakarta}}
310320
{{/useBeanValidation}}
311321
<!-- test dependencies -->
312322
<dependency>

0 commit comments

Comments
 (0)