Skip to content

Commit fd3513c

Browse files
HugoMarioHugoMario
authored
Merge pull request #1148 from swagger-api/Fyro-Ing-issues/1145
Generators Tweaks for Jakarta Option
2 parents 052c5c2 + d20045f commit fd3513c

File tree

23 files changed

+353
-52
lines changed

23 files changed

+353
-52
lines changed

‎src/main/java/io/swagger/codegen/v3/generators/handlebars/java/JavaHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public CharSequence getModelImports(Map<String, Object> templateData, Options op
8989
if (withXml && jakarta) {
9090
builder.append("import jakarta.xml.bind.annotation.*;\n");
9191
} else if (withXml) {
92-
builder.append("import jakarta.xml.bind.annotation.*;\n");
92+
builder.append("import javax.xml.bind.annotation.*;\n");
9393
}
9494
if (parcelableModel) {
9595
builder.append("import android.os.Parcelable;\n");

‎src/main/java/io/swagger/codegen/v3/generators/java/AbstractJavaJAXRSServerCodegen.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ public CodegenType getTag() {
7676
public void processOpts() {
7777
super.processOpts();
7878

79+
if (java11Mode) {
80+
additionalProperties.put(JAKARTA, jakarta = true);
81+
}
82+
7983
if (additionalProperties.containsKey(CodegenConstants.IMPL_FOLDER)) {
8084
implFolder = (String) additionalProperties.get(CodegenConstants.IMPL_FOLDER);
8185
}

‎src/main/resources/handlebars/Java/build.gradle.mustache

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,12 @@ if(hasProperty('target') && target == 'android') {
5454
}
5555

5656
dependencies {
57-
provided 'jakarta.annotation:jakarta.annotation-api:{{#jakarta}}2.1.1{{/jakarta}}{{^jakarta}}1.3.5{{/jakarta}}'
57+
{{#jakarta}}
58+
provided 'jakarta.annotation:jakarta.annotation-api:2.1.1'
59+
{{/jakarta}}
60+
{{^jakarta}}
61+
provided 'javax.annotation:jsr250-api:1.0'
62+
{{/jakarta}}
5863
}
5964
}
6065

‎src/main/resources/handlebars/Java/libraries/feign/build.gradle.mustache

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,12 @@ if(hasProperty('target') && target == 'android') {
5454
}
5555

5656
dependencies {
57-
provided 'jakarta.annotation:jakarta.annotation-api:{{#jakarta}}2.1.1{{/jakarta}}{{^jakarta}}1.3.5{{/jakarta}}'
57+
{{#jakarta}}
58+
provided 'jakarta.annotation:jakarta.annotation-api:2.1.1'
59+
{{/jakarta}}
60+
{{^jakarta}}
61+
provided 'javax.annotation:jsr250-api:1.0'
62+
{{/jakarta}}
5863
}
5964
}
6065

‎src/main/resources/handlebars/Java/libraries/jersey2/build.gradle.mustache

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,12 @@ if(hasProperty('target') && target == 'android') {
5454
}
5555

5656
dependencies {
57-
provided 'jakarta.annotation:jakarta.annotation-api:{{#jakarta}}2.1.1{{/jakarta}}{{^jakarta}}1.3.5{{/jakarta}}'
57+
{{#jakarta}}
58+
provided 'jakarta.annotation:jakarta.annotation-api:2.1.1'
59+
{{/jakarta}}
60+
{{^jakarta}}
61+
provided 'javax.annotation:jsr250-api:1.0'
62+
{{/jakarta}}
5863
}
5964
}
6065

‎src/main/resources/handlebars/Java/libraries/jersey2/pom.mustache

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,12 +289,22 @@
289289
{{/supportJava6}}
290290
{{#useBeanValidation}}
291291
<!-- Bean Validation API support -->
292+
{{#jakarta}}
292293
<dependency>
293294
<groupId>jakarta.validation</groupId>
294295
<artifactId>jakarta.validation-api</artifactId>
295-
<version>{{#jakarta}}3.0.2{{/jakarta}}{{^jakarta}}2.0.2{{/jakarta}}</version>
296+
<version>3.0.2</version>
296297
<scope>provided</scope>
297298
</dependency>
299+
{{/jakarta}}
300+
{{^jakarta}}
301+
<dependency>
302+
<groupId>javax.validation</groupId>
303+
<artifactId>validation-api</artifactId>
304+
<version>1.1.0.Final</version>
305+
<scope>provided</scope>
306+
</dependency>
307+
{{/jakarta}}
298308
{{/useBeanValidation}}
299309
<!-- test dependencies -->
300310
<dependency>

‎src/main/resources/handlebars/Java/libraries/okhttp-gson/build.gradle.mustache

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,12 @@ if(hasProperty('target') && target == 'android') {
5454
}
5555

5656
dependencies {
57-
provided 'jakarta.annotation:jakarta.annotation-api:{{#jakarta}}2.1.1{{/jakarta}}{{^jakarta}}1.3.5{{/jakarta}}'
57+
{{#jakarta}}
58+
provided 'jakarta.annotation:jakarta.annotation-api:2.1.1'
59+
{{/jakarta}}
60+
{{^jakarta}}
61+
provided 'javax.annotation:jsr250-api:1.0'
62+
{{/jakarta}}
5863
}
5964
}
6065

‎src/main/resources/handlebars/Java/libraries/okhttp-gson/pom.mustache

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,22 @@
254254
{{/supportJava6}}
255255
{{#useBeanValidation}}
256256
<!-- Bean Validation API support -->
257+
{{#jakarta}}
257258
<dependency>
258259
<groupId>jakarta.validation</groupId>
259260
<artifactId>jakarta.validation-api</artifactId>
260-
<version>{{#jakarta}}3.0.2{{/jakarta}}{{^jakarta}}2.0.2{{/jakarta}}</version>
261+
<version>3.0.2</version>
261262
<scope>provided</scope>
262263
</dependency>
264+
{{/jakarta}}
265+
{{^jakarta}}
266+
<dependency>
267+
<groupId>javax.validation</groupId>
268+
<artifactId>validation-api</artifactId>
269+
<version>1.1.0.Final</version>
270+
<scope>provided</scope>
271+
</dependency>
272+
{{/jakarta}}
263273
{{/useBeanValidation}}
264274
{{#performBeanValidation}}
265275
<!-- Bean Validation Impl. used to perform BeanValidation -->

‎src/main/resources/handlebars/Java/libraries/resttemplate/build.gradle.mustache

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,12 @@ if(hasProperty('target') && target == 'android') {
5454
}
5555

5656
dependencies {
57-
provided 'jakarta.annotation:jakarta.annotation-api:{{#jakarta}}2.1.1{{/jakarta}}{{^jakarta}}1.3.5{{/jakarta}}'
57+
{{#jakarta}}
58+
provided 'jakarta.annotation:jakarta.annotation-api:2.1.1'
59+
{{/jakarta}}
60+
{{^jakarta}}
61+
provided 'javax.annotation:jsr250-api:1.0'
62+
{{/jakarta}}
5863
}
5964
}
6065

‎src/main/resources/handlebars/Java/libraries/retrofit/build.gradle.mustache

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,12 @@ if(hasProperty('target') && target == 'android') {
5454
}
5555

5656
dependencies {
57-
provided 'jakarta.annotation:jakarta.annotation-api:{{#jakarta}}2.1.1{{/jakarta}}{{^jakarta}}1.3.5{{/jakarta}}'
57+
{{#jakarta}}
58+
provided 'jakarta.annotation:jakarta.annotation-api:2.1.1'
59+
{{/jakarta}}
60+
{{^jakarta}}
61+
provided 'javax.annotation:jsr250-api:1.0'
62+
{{/jakarta}}
5863
}
5964
}
6065

0 commit comments

Comments
 (0)