Skip to content

Commit 563ac28

Browse files
committed
Cleanup
1 parent 99baf63 commit 563ac28

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

docs/generators/java.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
7272
|microprofileMutiny|Whether to use async types for microprofile (currently only Smallrye Mutiny is supported).| |null|
7373
|microprofileRegisterExceptionMapper|Should generated API Clients be annotated with @RegisterProvider(ApiExceptionMapper.class).| |true|
7474
|microprofileRestClientVersion|Version of MicroProfile Rest Client API.| |null|
75+
|useSpring7|Generate code and provide dependencies for use with Spring 7.x. (Use jackson 3)| |false|
7576
|modelPackage|package for generated models| |org.openapitools.client.model|
7677
|openApiNullable|Enable OpenAPI Jackson Nullable library. Not supported by `microprofile` library.| |true|
7778
|parcelableModel|Whether to generate models for Android that implement Parcelable with the okhttp-gson library.| |false|
@@ -85,7 +86,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
8586
|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
8687
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
8788
|serializationLibrary|Serialization library, default depends on value of the option library|<dl><dt>**jsonb**</dt><dd>Use JSON-B as serialization library</dd><dt>**jackson**</dt><dd>Use Jackson as serialization library</dd><dt>**gson**</dt><dd>Use Gson as serialization library</dd></dl>|null|
88-
|useJackson3|Set it in order to use jackson 3 dependencies (only allowed when `serializationLibrary` is set to `jackson`).| |false|
8989
|snapshotVersion|Uses a SNAPSHOT version.|<dl><dt>**true**</dt><dd>Use a SnapShot Version</dd><dt>**false**</dt><dd>Use a Release Version</dd></dl>|null|
9090
|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
9191
|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ public JavaClientCodegen() {
305305
serializationLibrary.setEnum(serializationOptions);
306306
cliOptions.add(serializationLibrary);
307307
cliOptions.add(CliOption.newBoolean(USE_SPRING_7,
308-
"Generate code and provide dependencies for use with Spring Boot 4.x. (Use jakarta instead of javax in imports). Enabling this option will also enable `useJakartaEe`.",
308+
"Generate code and provide dependencies for use with Spring 7.x. (Use jackson 3).",
309309
useSpring7));
310310
// Ensure the OAS 3.x discriminator mappings include any descendent schemas that allOf
311311
// inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,17 +304,17 @@
304304
<swagger-annotations-version>1.6.6</swagger-annotations-version>
305305
{{/swagger1AnnotationLibrary}}
306306
{{#swagger2AnnotationLibrary}}
307-
<swagger-annotations-version>2.2.43</swagger-annotations-version>
307+
<swagger-annotations-version>2.2.15</swagger-annotations-version>
308308
{{/swagger2AnnotationLibrary}}
309-
<jackson-version>2.21.0</jackson-version>
310-
<jackson-databind>2.21.0</jackson-databind>
309+
<jackson-version>2.19.2</jackson-version>
310+
<jackson-databind>2.19.2</jackson-databind>
311311
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
312312
{{#useJakartaEe}}
313313
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
314314
{{/useJakartaEe}}
315315
{{^useJakartaEe}}
316316
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
317317
{{/useJakartaEe}}
318-
<junit-version>5.14.3</junit-version>
318+
<junit-version>5.10.3</junit-version>
319319
</properties>
320320
</project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@
167167
{{#swagger2AnnotationLibrary}}
168168
<swagger-annotations-version>2.2.15</swagger-annotations-version>
169169
{{/swagger2AnnotationLibrary}}
170-
<jackson-version>2.21.0</jackson-version>
171-
<jackson-databind-version>2.21.0</jackson-databind-version>
170+
<jackson-version>2.19.2</jackson-version>
171+
<jackson-databind-version>2.19.2</jackson-databind-version>
172172
{{#openApiNullable}}
173173
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
174174
{{/openApiNullable}}

0 commit comments

Comments
 (0)