Skip to content

Commit afb1a65

Browse files
committed
respect useJakartaEE in jersey3
1 parent 10fc9d0 commit afb1a65

6 files changed

Lines changed: 16 additions & 10 deletions

File tree

modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import {{javaxPackage}}.ws.rs.core.GenericType;
1212
{{/imports}}
1313

1414
{{#useBeanValidation}}
15-
import jakarta.validation.constraints.*;
16-
import jakarta.validation.Valid;
15+
import {{javaxPackage}}.validation.constraints.*;
16+
import {{javaxPackage}}.validation.Valid;
1717

1818
{{/useBeanValidation}}
1919
import java.util.ArrayList;

modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api_test.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import java.util.List;
1717
import java.util.Map;
1818

1919
{{#useBeanValidation}}
20-
import jakarta.validation.constraints.*;
21-
import jakarta.validation.Valid;
20+
import {{javaxPackage}}.validation.constraints.*;
21+
import {{javaxPackage}}.validation.Valid;
2222

2323
{{/useBeanValidation}}
2424
/**

modules/openapi-generator/src/main/resources/Java/libraries/jersey3/model.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ import android.os.Parcelable;
4242
import android.os.Parcel;
4343
{{/parcelableModel}}
4444
{{#useBeanValidation}}
45-
import jakarta.validation.constraints.*;
46-
import jakarta.validation.Valid;
45+
import {{javaxPackage}}.validation.constraints.*;
46+
import {{javaxPackage}}.validation.Valid;
4747
{{/useBeanValidation}}
4848
{{#performBeanValidation}}
4949
import org.hibernate.validator.constraints.*;

modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,8 +408,14 @@
408408
<jackson-version>2.17.1</jackson-version>
409409
<jackson-databind-version>2.17.1</jackson-databind-version>
410410
<jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
411+
{{#useJakartaEe}}
411412
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
412413
<beanvalidation-version>3.0.2</beanvalidation-version>
414+
{{/useJakartaEe}}
415+
{{^useJakartaEe}}
416+
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
417+
<beanvalidation-version>2.0.2</beanvalidation-version>
418+
{{/useJakartaEe}}
413419
<junit-version>5.10.0</junit-version>
414420
{{#hasHttpSignatureMethods}}
415421
<http-signature-version>1.8</http-signature-version>

samples/client/petstore/java/jersey3-oneOf/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,8 @@
333333
<jackson-version>2.17.1</jackson-version>
334334
<jackson-databind-version>2.17.1</jackson-databind-version>
335335
<jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
336-
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
337-
<beanvalidation-version>3.0.2</beanvalidation-version>
336+
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
337+
<beanvalidation-version>2.0.2</beanvalidation-version>
338338
<junit-version>5.10.0</junit-version>
339339
<spotless.version>2.21.0</spotless.version>
340340
</properties>

samples/client/petstore/java/jersey3/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,8 @@
356356
<jackson-version>2.17.1</jackson-version>
357357
<jackson-databind-version>2.17.1</jackson-databind-version>
358358
<jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
359-
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
360-
<beanvalidation-version>3.0.2</beanvalidation-version>
359+
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
360+
<beanvalidation-version>2.0.2</beanvalidation-version>
361361
<junit-version>5.10.0</junit-version>
362362
<http-signature-version>1.8</http-signature-version>
363363
<scribejava-apis-version>8.3.3</scribejava-apis-version>

0 commit comments

Comments
 (0)