Skip to content

Commit 7032c40

Browse files
wing328wing328
authored
[Spring Boot] update dependencies, mark java8 option as deprecated (#7306)
* update springboot dependencies * update doc * update samples
1 parent 15de43f commit 7032c40

File tree

12 files changed

+41
-41
lines changed

12 files changed

+41
-41
lines changed

‎docs/generators/spring.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ sidebar_label: spring
3535
|implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false|
3636
|interfaceOnly|Whether to generate only API interface stubs without the server files.| |false|
3737
|invokerPackage|root package for generated code| |org.openapitools.api|
38-
|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64. Use java8 default interface when a responseWrapper is used</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
38+
|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64. Use java8 default interface when a responseWrapper is used. IMPORTANT: This option has been deprecated as Java 8 is the default.</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
3939
|legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
4040
|library|library template (sub-template)|<dl><dt>**spring-boot**</dt><dd>Spring-boot Server application using the SpringFox integration.</dd><dt>**spring-mvc**</dt><dd>Spring-MVC Server application using the SpringFox integration.</dd><dt>**spring-cloud**</dt><dd>Spring-Cloud-Feign client with Spring-Boot auto-configured settings.</dd></dl>|spring-boot|
4141
|licenseName|The name of the license| |Unlicense|

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ private void updateJava8CliOptions() {
186186
CliOption option = cliOptions.stream().filter(o -> JAVA_8.equals(o.getOpt())).findFirst()
187187
.orElseThrow(() -> new RuntimeException("Missing java8 option"));
188188
Map<String, String> java8ModeOptions = option.getEnum();
189-
java8ModeOptions.put("true", "Use Java 8 classes such as Base64. Use java8 default interface when a responseWrapper is used");
189+
java8ModeOptions.put("true", "Use Java 8 classes such as Base64. Use java8 default interface when a responseWrapper is used. IMPORTANT: This option has been deprecated as Java 8 is the default.");
190190
}
191191

192192
@Override
@@ -217,9 +217,9 @@ public void processOpts() {
217217
// Process java8 option before common java ones to change the default dateLibrary to java8.
218218
LOGGER.info("----------------------------------");
219219
if (additionalProperties.containsKey(JAVA_8)) {
220-
LOGGER.info("has JAVA8");
221220
this.setJava8(Boolean.valueOf(additionalProperties.get(JAVA_8).toString()));
222221
additionalProperties.put(JAVA_8, java8);
222+
LOGGER.warn("java8 option has been deprecated as it's set to true by default (JDK7 support has been deprecated)");
223223
}
224224
if (this.java8 && !additionalProperties.containsKey(DATE_LIBRARY)) {
225225
setDateLibrary("java8");

‎modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<maven.compiler.source>${java.version}</maven.compiler.source>
1111
<maven.compiler.target>${java.version}</maven.compiler.target>
1212
{{#useSpringfox}}
13-
<springfox-version>2.8.0</springfox-version>
13+
<springfox-version>2.9.2</springfox-version>
1414
{{/useSpringfox}}
1515
</properties>
1616
{{#parentOverridden}}
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.springframework.boot</groupId>
2626
<artifactId>spring-boot-starter-parent</artifactId>
27-
<version>{{#java8}}2.0.1.RELEASE{{/java8}}{{^java8}}1.5.12.RELEASE{{/java8}}</version>
27+
<version>{{#java8}}2.3.3.RELEASE{{/java8}}{{^java8}}1.5.12.RELEASE{{/java8}}</version>
2828
</parent>
2929
{{/parentOverridden}}
3030
<build>
@@ -97,7 +97,7 @@
9797
<dependency>
9898
<groupId>javax.xml.bind</groupId>
9999
<artifactId>jaxb-api</artifactId>
100-
<version>2.2.11</version>
100+
<version>2.3.1</version>
101101
</dependency>
102102
{{/useSpringfox}}
103103
{{^useSpringfox}}
@@ -151,7 +151,7 @@
151151
<dependency>
152152
<groupId>org.openapitools</groupId>
153153
<artifactId>jackson-databind-nullable</artifactId>
154-
<version>0.1.0</version>
154+
<version>0.2.1</version>
155155
</dependency>
156156
{{#useBeanValidation}}
157157
<!-- Bean Validation API support -->

‎samples/client/petstore/spring-stubs/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<java.version>1.8</java.version>
1010
<maven.compiler.source>${java.version}</maven.compiler.source>
1111
<maven.compiler.target>${java.version}</maven.compiler.target>
12-
<springfox-version>2.8.0</springfox-version>
12+
<springfox-version>2.9.2</springfox-version>
1313
</properties>
1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>2.0.1.RELEASE</version>
17+
<version>2.3.3.RELEASE</version>
1818
</parent>
1919
<build>
2020
<sourceDirectory>src/main/java</sourceDirectory>
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>javax.xml.bind</groupId>
4040
<artifactId>jaxb-api</artifactId>
41-
<version>2.2.11</version>
41+
<version>2.3.1</version>
4242
</dependency>
4343
<dependency>
4444
<groupId>com.fasterxml.jackson.datatype</groupId>
@@ -47,7 +47,7 @@
4747
<dependency>
4848
<groupId>org.openapitools</groupId>
4949
<artifactId>jackson-databind-nullable</artifactId>
50-
<version>0.1.0</version>
50+
<version>0.2.1</version>
5151
</dependency>
5252
<!-- Bean Validation API support -->
5353
<dependency>

‎samples/server/petstore/springboot-beanvalidation/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<java.version>1.8</java.version>
1010
<maven.compiler.source>${java.version}</maven.compiler.source>
1111
<maven.compiler.target>${java.version}</maven.compiler.target>
12-
<springfox-version>2.8.0</springfox-version>
12+
<springfox-version>2.9.2</springfox-version>
1313
</properties>
1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>2.0.1.RELEASE</version>
17+
<version>2.3.3.RELEASE</version>
1818
</parent>
1919
<build>
2020
<sourceDirectory>src/main/java</sourceDirectory>
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>javax.xml.bind</groupId>
5353
<artifactId>jaxb-api</artifactId>
54-
<version>2.2.11</version>
54+
<version>2.3.1</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>com.fasterxml.jackson.datatype</groupId>
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>org.openapitools</groupId>
6262
<artifactId>jackson-databind-nullable</artifactId>
63-
<version>0.1.0</version>
63+
<version>0.2.1</version>
6464
</dependency>
6565
<!-- Bean Validation API support -->
6666
<dependency>

‎samples/server/petstore/springboot-delegate-j8/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<java.version>1.8</java.version>
1010
<maven.compiler.source>${java.version}</maven.compiler.source>
1111
<maven.compiler.target>${java.version}</maven.compiler.target>
12-
<springfox-version>2.8.0</springfox-version>
12+
<springfox-version>2.9.2</springfox-version>
1313
</properties>
1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>2.0.1.RELEASE</version>
17+
<version>2.3.3.RELEASE</version>
1818
</parent>
1919
<build>
2020
<sourceDirectory>src/main/java</sourceDirectory>
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>javax.xml.bind</groupId>
5353
<artifactId>jaxb-api</artifactId>
54-
<version>2.2.11</version>
54+
<version>2.3.1</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>com.fasterxml.jackson.datatype</groupId>
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>org.openapitools</groupId>
6262
<artifactId>jackson-databind-nullable</artifactId>
63-
<version>0.1.0</version>
63+
<version>0.2.1</version>
6464
</dependency>
6565
<!-- Bean Validation API support -->
6666
<dependency>

‎samples/server/petstore/springboot-delegate/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<java.version>1.8</java.version>
1010
<maven.compiler.source>${java.version}</maven.compiler.source>
1111
<maven.compiler.target>${java.version}</maven.compiler.target>
12-
<springfox-version>2.8.0</springfox-version>
12+
<springfox-version>2.9.2</springfox-version>
1313
</properties>
1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>2.0.1.RELEASE</version>
17+
<version>2.3.3.RELEASE</version>
1818
</parent>
1919
<build>
2020
<sourceDirectory>src/main/java</sourceDirectory>
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>javax.xml.bind</groupId>
5353
<artifactId>jaxb-api</artifactId>
54-
<version>2.2.11</version>
54+
<version>2.3.1</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>com.fasterxml.jackson.datatype</groupId>
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>org.openapitools</groupId>
6262
<artifactId>jackson-databind-nullable</artifactId>
63-
<version>0.1.0</version>
63+
<version>0.2.1</version>
6464
</dependency>
6565
<!-- Bean Validation API support -->
6666
<dependency>

‎samples/server/petstore/springboot-implicitHeaders/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<java.version>1.8</java.version>
1010
<maven.compiler.source>${java.version}</maven.compiler.source>
1111
<maven.compiler.target>${java.version}</maven.compiler.target>
12-
<springfox-version>2.8.0</springfox-version>
12+
<springfox-version>2.9.2</springfox-version>
1313
</properties>
1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>2.0.1.RELEASE</version>
17+
<version>2.3.3.RELEASE</version>
1818
</parent>
1919
<build>
2020
<sourceDirectory>src/main/java</sourceDirectory>
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>javax.xml.bind</groupId>
5353
<artifactId>jaxb-api</artifactId>
54-
<version>2.2.11</version>
54+
<version>2.3.1</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>com.fasterxml.jackson.datatype</groupId>
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>org.openapitools</groupId>
6262
<artifactId>jackson-databind-nullable</artifactId>
63-
<version>0.1.0</version>
63+
<version>0.2.1</version>
6464
</dependency>
6565
<!-- Bean Validation API support -->
6666
<dependency>

‎samples/server/petstore/springboot-reactive/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>2.0.1.RELEASE</version>
16+
<version>2.3.3.RELEASE</version>
1717
</parent>
1818
<build>
1919
<sourceDirectory>src/main/java</sourceDirectory>
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>org.openapitools</groupId>
6565
<artifactId>jackson-databind-nullable</artifactId>
66-
<version>0.1.0</version>
66+
<version>0.2.1</version>
6767
</dependency>
6868
<!-- Bean Validation API support -->
6969
<dependency>

‎samples/server/petstore/springboot-useoptional/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<java.version>1.8</java.version>
1010
<maven.compiler.source>${java.version}</maven.compiler.source>
1111
<maven.compiler.target>${java.version}</maven.compiler.target>
12-
<springfox-version>2.8.0</springfox-version>
12+
<springfox-version>2.9.2</springfox-version>
1313
</properties>
1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>2.0.1.RELEASE</version>
17+
<version>2.3.3.RELEASE</version>
1818
</parent>
1919
<build>
2020
<sourceDirectory>src/main/java</sourceDirectory>
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>javax.xml.bind</groupId>
5353
<artifactId>jaxb-api</artifactId>
54-
<version>2.2.11</version>
54+
<version>2.3.1</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>com.fasterxml.jackson.datatype</groupId>
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>org.openapitools</groupId>
6262
<artifactId>jackson-databind-nullable</artifactId>
63-
<version>0.1.0</version>
63+
<version>0.2.1</version>
6464
</dependency>
6565
<!-- Bean Validation API support -->
6666
<dependency>

0 commit comments

Comments
 (0)