[JAVA][KOTLIN][SPRING] upgrade dependencies (#16759)

* upgrade spring-boot-starter-parent * upgrade springdoc and swagger-ui * upgrade v3 swagger-annotations * generate samples * upgrade jackson * fix spring cloud, remove temp comment Putting "8" instead of "1.8" should be ok, because Spring Boot 3 requires Java 17 anyway, so it should be able to understand that 8 is the same as 1.8. * generate samples * upgrade JUnit 5, remove commons-io dependency, remove outdated samples/client/petstore/java/feign/feign10x/ files, generate samples commons-io dependency was introduced in #8484, but I don't see why it would be needed now or back then. * update gson, generate samples * update logback * update feign * update scribejava * generate samples * update httpmime * okhttp-gson: update commons-lang & okhttp & junit-platform, remove mockito; generate samples It seems Mockito is not used at all there. * okhttp-gson: remove unnecessary sample files, generate sample files * upgrade google-api-client & jersey-common, restore ClientTest, generate samples * misc. upgrades in jersey2 and jersey3 jersey 3.1.3 is available already, but IntelliJ reports security problems in 3.1.3 and 3.1.2, so I used 3.1.1 instead. * align some gradle&sbt files with poms, generate samples * whitespace fix
OpenAPITools · Oct 9, 2023 · e3db882 · e3db882
1 parent 48f454c
commit e3db882
Show file tree

Hide file tree

Showing 468 changed files with 1,003 additions and 21,791 deletions.
diff --git a/modules/openapi-generator-maven-plugin/examples/camel.xml b/modules/openapi-generator-maven-plugin/examples/camel.xml
@@ -137,12 +137,12 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-jsr310</artifactId>
-			<version>2.13.0</version>
+			<version>2.15.2</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-jdk8</artifactId>
-			<version>2.13.0</version>
+			<version>2.15.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.camel</groupId>

diff --git a/modules/openapi-generator-maven-plugin/examples/java-client.xml b/modules/openapi-generator-maven-plugin/examples/java-client.xml
@@ -193,11 +193,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-annotations-version>2.2.16</swagger-annotations-version>
         <jersey-version>2.35</jersey-version>
-        <jackson-version>2.13.0</jackson-version>
-        <jackson-databind-version>2.13.0</jackson-databind-version>
+        <jackson-version>2.15.2</jackson-version>
+        <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
         <junit-version>4.13.2</junit-version>
-        <scribejava-apis-version>8.3.1</scribejava-apis-version>
+        <scribejava-apis-version>8.3.3</scribejava-apis-version>
     </properties>
 </project>
diff --git a/modules/openapi-generator-maven-plugin/examples/kotlin.xml b/modules/openapi-generator-maven-plugin/examples/kotlin.xml
@@ -232,7 +232,7 @@
 	<properties>
 		<swagger-annotations-version>1.5.8</swagger-annotations-version>
 		<jersey-version>2.27</jersey-version>
-		<jackson-version>2.9.10</jackson-version>
+		<jackson-version>2.15.2</jackson-version>
 		<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
 		<jodatime-version>2.7</jodatime-version>
 		<maven-plugin-version>1.0.0</maven-plugin-version>

diff --git a/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml b/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml
@@ -147,7 +147,7 @@
         <dependency>
             <groupId>com.github.scribejava</groupId>
             <artifactId>scribejava-apis</artifactId>
-            <version>8.3.1</version>
+            <version>8.3.3</version>
         </dependency>
         <dependency>
             <groupId>org.tomitribe</groupId>

diff --git a/modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml b/modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml
@@ -15,7 +15,7 @@
     <properties>
         <swagger-annotations-version>1.5.8</swagger-annotations-version>
         <jersey-version>2.35</jersey-version>
-        <jackson-version>2.13.0</jackson-version>
+        <jackson-version>2.15.2</jackson-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
         <jodatime-version>2.7</jodatime-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>

diff --git a/modules/openapi-generator-maven-plugin/examples/spring.xml b/modules/openapi-generator-maven-plugin/examples/spring.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.6</version>
+        <version>2.7.15</version>
     </parent>
     <build>
         <plugins>
@@ -71,7 +71,7 @@
         </pluginRepository>
     </pluginRepositories>
     <dependencies>
-       <dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache
@@ -340,11 +340,11 @@
         <swagger-annotations-version>1.6.6</swagger-annotations-version>
         {{/swagger1AnnotationLibrary}}
         {{#swagger2AnnotationLibrary}}
-        <swagger-annotations-version>2.2.9</swagger-annotations-version>
+        <swagger-annotations-version>2.2.15</swagger-annotations-version>
         {{/swagger2AnnotationLibrary}}
-        <httpclient-version>5.1.3</httpclient-version>
-        <jackson-version>2.14.1</jackson-version>
-        <jackson-databind-version>2.14.1</jackson-databind-version>
+        <httpclient-version>5.2.1</httpclient-version>
+        <jackson-version>2.15.2</jackson-version>
+        <jackson-databind-version>2.15.2</jackson-databind-version>
         {{#openApiNullable}}
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         {{/openApiNullable}}

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache
@@ -341,7 +341,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.10</version>
+            <version>1.2.12</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -368,12 +368,6 @@
             <version>2.35.1</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.8.0</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -386,26 +380,26 @@
         {{#swagger2AnnotationLibrary}}
         <swagger-annotations-version>2.2.15</swagger-annotations-version>
         {{/swagger2AnnotationLibrary}}
-        <feign-version>10.12</feign-version>
+        <feign-version>12.5</feign-version>
         <feign-form-version>3.8.0</feign-form-version>
         {{#jackson}}
-        <jackson-version>2.14.3</jackson-version>
+        <jackson-version>2.15.2</jackson-version>
         {{/jackson}}
         {{#gson}}
-        <gson-version>2.8.6</gson-version>
+        <gson-version>2.10.1</gson-version>
         {{/gson}}
         {{#openApiNullable}}
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         {{/openApiNullable}}
-        <jackson-databind-version>2.14.3</jackson-databind-version>
+        <jackson-databind-version>2.15.2</jackson-databind-version>
         {{#useJakartaEe}}
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
         {{/useJakartaEe}}
         {{^useJakartaEe}}
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
         {{/useJakartaEe}}
-        <junit-version>5.7.0</junit-version>
+        <junit-version>5.10.0</junit-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
-        <scribejava-version>8.0.0</scribejava-version>
+        <scribejava-version>8.3.3</scribejava-version>
     </properties>
 </project>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache
@@ -307,12 +307,12 @@
         <swagger-annotations-version>1.6.6</swagger-annotations-version>
         {{/swagger1AnnotationLibrary}}
         {{#swagger2AnnotationLibrary}}
-        <swagger-annotations-version>2.2.9</swagger-annotations-version>
+        <swagger-annotations-version>2.2.15</swagger-annotations-version>
         {{/swagger2AnnotationLibrary}}
-        <google-api-client-version>1.32.2</google-api-client-version>
-        <jersey-common-version>2.25.1</jersey-common-version>
-        <jackson-version>2.13.4</jackson-version>
-        <jackson-databind-version>2.13.4.2</jackson-databind-version>
+        <google-api-client-version>2.2.0</google-api-client-version>
+        <jersey-common-version>2.40</jersey-common-version>
+        <jackson-version>2.15.2</jackson-version>
+        <jackson-databind-version>2.15.2</jackson-databind-version>
         {{#openApiNullable}}
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         {{/openApiNullable}}

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache
@@ -393,11 +393,11 @@
         <swagger-annotations-version>1.6.6</swagger-annotations-version>
         {{/swagger1AnnotationLibrary}}
         {{#swagger2AnnotationLibrary}}
-        <swagger-annotations-version>2.2.9</swagger-annotations-version>
+        <swagger-annotations-version>2.2.15</swagger-annotations-version>
         {{/swagger2AnnotationLibrary}}
-        <jersey-version>2.35</jersey-version>
-        <jackson-version>2.13.4</jackson-version>
-        <jackson-databind-version>2.13.4.2</jackson-databind-version>
+        <jersey-version>2.37</jersey-version>
+        <jackson-version>2.15.2</jackson-version>
+        <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         {{#useJakartaEe}}
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
@@ -408,12 +408,12 @@
         {{#useBeanValidation}}
         <beanvalidation-version>2.0.2</beanvalidation-version>
         {{/useBeanValidation}}
-        <junit-version>5.8.2</junit-version>
+        <junit-version>5.10.0</junit-version>
         {{#hasHttpSignatureMethods}}
-        <http-signature-version>1.7</http-signature-version>
+        <http-signature-version>1.8</http-signature-version>
         {{/hasHttpSignatureMethods}}
         {{#hasOAuthMethods}}
-        <scribejava-apis-version>8.3.1</scribejava-apis-version>
+        <scribejava-apis-version>8.3.3</scribejava-apis-version>
         {{/hasOAuthMethods}}
         <spotless.version>2.21.0</spotless.version>
     </properties>

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache
@@ -393,22 +393,22 @@
         <swagger-annotations-version>1.6.6</swagger-annotations-version>
         {{/swagger1AnnotationLibrary}}
         {{#swagger2AnnotationLibrary}}
-        <swagger-annotations-version>2.2.9</swagger-annotations-version>
+        <swagger-annotations-version>2.2.15</swagger-annotations-version>
         {{/swagger2AnnotationLibrary}}
-        <jersey-version>3.0.4</jersey-version>
-        <jackson-version>2.13.4</jackson-version>
-        <jackson-databind-version>2.13.4.2</jackson-databind-version>
+        <jersey-version>3.1.1</jersey-version>
+        <jackson-version>2.15.2</jackson-version>
+        <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
-        <jakarta-annotation-version>2.1.0</jakarta-annotation-version>
+        <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
         {{#useBeanValidation}}
         <beanvalidation-version>2.0.2</beanvalidation-version>
         {{/useBeanValidation}}
-        <junit-version>5.8.2</junit-version>
+        <junit-version>5.10.0</junit-version>
         {{#hasHttpSignatureMethods}}
-        <http-signature-version>1.7</http-signature-version>
+        <http-signature-version>1.8</http-signature-version>
         {{/hasHttpSignatureMethods}}
         {{#hasOAuthMethods}}
-        <scribejava-apis-version>8.3.1</scribejava-apis-version>
+        <scribejava-apis-version>8.3.3</scribejava-apis-version>
         {{/hasOAuthMethods}}
         <spotless.version>2.21.0</spotless.version>
     </properties>

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
@@ -213,14 +213,14 @@
     <swagger.core.version>1.5.18</swagger.core.version>
     <jetty.version>9.2.9.v20150224</jetty.version>
     <junit.version>4.13.2</junit.version>
-    <logback.version>1.2.10</logback.version>
+    <logback.version>1.2.12</logback.version>
 {{#useBeanValidation}}
     <beanvalidation.version>2.0.2</beanvalidation.version>
 {{/useBeanValidation}}
     <cxf.version>3.2.7</cxf.version>
-    <jackson.jaxrs.version>2.9.7</jackson.jaxrs.version>
+    <jackson.jaxrs.version>2.15.2</jackson.jaxrs.version>
 {{#jackson}}
-    <jackson.version>2.14.1</jackson.version>
+    <jackson.version>2.15.2</jackson.version>
 {{/jackson}}
     <jakarta.activation.version>1.2.2</jakarta.activation.version>
     <jakarta.annotation.version>1.3.5</jakarta.annotation.version>

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache
@@ -206,14 +206,14 @@
     <swagger.core.version>1.5.18</swagger.core.version>
     <jetty.version>9.2.9.v20150224</jetty.version>
     <junit.version>4.13.2</junit.version>
-    <logback.version>1.2.10</logback.version>
+    <logback.version>1.2.12</logback.version>
 {{#useBeanValidation}}
     <beanvalidation.version>3.0.1</beanvalidation.version>
 {{/useBeanValidation}}
     <cxf.version>3.2.7</cxf.version>
-    <jackson.jaxrs.version>2.13.2</jackson.jaxrs.version>
+    <jackson.jaxrs.version>2.15.2</jackson.jaxrs.version>
 {{#jackson}}
-    <jackson.version>2.14.1</jackson.version>
+    <jackson.version>2.15.2</jackson.version>
 {{/jackson}}
     <jakarta.activation.version>2.1.0</jakarta.activation.version>
     <jakarta.annotation.version>2.0.0</jakarta.annotation.version>

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache
@@ -278,11 +278,11 @@
         <swagger-annotations-version>1.6.9</swagger-annotations-version>
         {{/swagger1AnnotationLibrary}}
         {{#swagger2AnnotationLibrary}}
-        <swagger-annotations-version>2.2.9</swagger-annotations-version>
+        <swagger-annotations-version>2.2.15</swagger-annotations-version>
         {{/swagger2AnnotationLibrary}}
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
-        <jackson-version>2.14.1</jackson-version>
+        <jackson-version>2.15.2</jackson-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         {{#useJakartaEe}}
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
@@ -291,7 +291,7 @@
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
         {{/useJakartaEe}}
         {{#hasFormParamsInSpec}}
-        <httpmime-version>4.5.13</httpmime-version>
+        <httpmime-version>4.5.14</httpmime-version>
         {{/hasFormParamsInSpec}}
         <junit-version>4.13.2</junit-version>
         <spotless.version>2.27.2</spotless.version>

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
@@ -405,12 +405,6 @@
             <version>${junit-platform-runner.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${mockito-core-version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <properties>
         <java.version>1.8</java.version>
@@ -421,11 +415,11 @@
         <swagger-annotations-version>1.6.6</swagger-annotations-version>
         {{/swagger1AnnotationLibrary}}
         {{#swagger2AnnotationLibrary}}
-        <swagger-annotations-version>2.2.9</swagger-annotations-version>
+        <swagger-annotations-version>2.2.15</swagger-annotations-version>
         {{/swagger2AnnotationLibrary}}
-        <okhttp-version>4.10.0</okhttp-version>
-        <gson-version>2.9.1</gson-version>
-        <commons-lang3-version>3.12.0</commons-lang3-version>
+        <okhttp-version>4.11.0</okhttp-version>
+        <gson-version>2.10.1</gson-version>
+        <commons-lang3-version>3.13.0</commons-lang3-version>
         {{#openApiNullable}}
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         {{/openApiNullable}}
@@ -444,9 +438,8 @@
 {{#useBeanValidation}}
         <beanvalidation-version>2.0.2</beanvalidation-version>
 {{/useBeanValidation}}
-        <junit-version>5.9.1</junit-version>
-        <junit-platform-runner.version>1.9.1</junit-platform-runner.version>
-        <mockito-core-version>3.12.4</mockito-core-version>
+        <junit-version>5.10.0</junit-version>
+        <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
@@ -343,17 +343,17 @@
         <swagger-annotations-version>1.6.6</swagger-annotations-version>
         {{/swagger1AnnotationLibrary}}
         {{#swagger2AnnotationLibrary}}
-        <swagger-annotations-version>2.2.9</swagger-annotations-version>
+        <swagger-annotations-version>2.2.15</swagger-annotations-version>
         {{/swagger2AnnotationLibrary}}
         <rest-assured.version>4.5.1</rest-assured.version>
-        <gson-version>2.8.9</gson-version>
+        <gson-version>2.10.1</gson-version>
         <gson-fire-version>1.8.5</gson-fire-version>
         {{#joda}}
         <jodatime-version>2.10.5</jodatime-version>
         {{/joda}}
         {{#jackson}}
-        <jackson-version>2.13.4</jackson-version>
-        <jackson-databind-version>2.13.4.2</jackson-databind-version>
+        <jackson-version>2.15.2</jackson-version>
+        <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         {{/jackson}}
         {{#useJakartaEe}}

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
@@ -290,11 +290,11 @@
         <swagger-annotations-version>1.6.6</swagger-annotations-version>
         {{/swagger1AnnotationLibrary}}
         {{#swagger2AnnotationLibrary}}
-        <swagger-annotations-version>2.2.9</swagger-annotations-version>
+        <swagger-annotations-version>2.2.15</swagger-annotations-version>
         {{/swagger2AnnotationLibrary}}
         <resteasy-version>4.7.6.Final</resteasy-version>
-        <jackson-version>2.13.4</jackson-version>
-        <jackson-databind-version>2.13.4.2</jackson-databind-version>
+        <jackson-version>2.15.2</jackson-version>
+        <jackson-databind-version>2.15.2</jackson-databind-version>
         {{#openApiNullable}}
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         {{/openApiNullable}}

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache
@@ -325,16 +325,16 @@
         <swagger-annotations-version>1.6.9</swagger-annotations-version>
         {{/swagger1AnnotationLibrary}}
         {{#swagger2AnnotationLibrary}}
-        <swagger-annotations-version>2.2.9</swagger-annotations-version>
+        <swagger-annotations-version>2.2.15</swagger-annotations-version>
         {{/swagger2AnnotationLibrary}}
         {{#useJakartaEe}}
         <spring-web-version>6.0.3</spring-web-version>
         {{/useJakartaEe}}
         {{^useJakartaEe}}
         <spring-web-version>5.3.24</spring-web-version>
         {{/useJakartaEe}}
-        <jackson-version>2.14.2</jackson-version>
-        <jackson-databind-version>2.15.1</jackson-databind-version>
+        <jackson-version>2.15.2</jackson-version>
+        <jackson-databind-version>2.15.2</jackson-databind-version>
         {{#openApiNullable}}
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         {{/openApiNullable}}

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache
@@ -275,7 +275,7 @@
         <swagger-annotations-version>1.6.6</swagger-annotations-version>
         {{/swagger1AnnotationLibrary}}
         {{#swagger2AnnotationLibrary}}
-        <swagger-annotations-version>2.2.9</swagger-annotations-version>
+        <swagger-annotations-version>2.2.15</swagger-annotations-version>
         {{/swagger2AnnotationLibrary}}
         <retrofit-version>1.9.0</retrofit-version>
         <okhttp-version>2.7.5</okhttp-version>