Update dependecies for CVE (#13834)

* Update dependecies for CVE

fix #13772

* Fix schemas

Author: Zomzog

modules/openapi-generator/pom.xml

@@ -377,7 +377,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
+            <version>${jackson-databind.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/helidon/functional/FunctionalHelidonClientBase.java

@@ -16,6 +16,7 @@
  */
 package org.openapitools.codegen.java.helidon.functional;
 
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import java.nio.file.Files;
@@ -26,6 +27,12 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 
 public class FunctionalHelidonClientBase extends FunctionalBase {
+
+    @BeforeClass
+    public void setup() {
+        generatorName("java-helidon-client");
+    }
+
     @Test
     void buildPetstore() {
         generate("src/test/resources/3_0/petstore.yaml");

modules/openapi-generator/src/test/resources/3_0/helidon/petstore-for-testing.yaml

@@ -72,7 +72,10 @@ paths:
             - 'write:pets'
             - 'read:pets'
       requestBody:
-        $ref: '#/components/schemas/Pet'
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Pet'
   /pet/findByStatus:
     get:
       tags:

modules/openapi-generator/src/test/resources/3_0/helidon/petstore-no-multipart-for-testing.yaml

@@ -72,7 +72,10 @@ paths:
             - 'write:pets'
             - 'read:pets'
       requestBody:
-        $ref: '#/components/schemas/Pet'
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Pet'
   /pet/findByStatus:
     get:
       tags:

modules/openapi-generator/src/test/resources/3_0/petstore-with-complex-headers.yaml

@@ -36,13 +36,13 @@ paths:
         - name: header1
           in: header
           schema:
-            $ref: '#/components/requestBodies/Pet'
+            $ref: '#/components/schemas/Pet'
         - name: header2
           in: header
           schema:
             type: array
             items:
-              $ref: '#/components/requestBodies/Pet'
+              $ref: '#/components/schemas/Pet'
         - name: Accept
           in: header
           schema:

pom.xml

@@ -1488,14 +1488,15 @@
         <commons-cli.version>1.4</commons-cli.version>
         <commons-io.version>2.11.0</commons-io.version>
         <commons-lang.version>3.12.0</commons-lang.version>
-        <commons-text.version>1.9</commons-text.version>
+        <commons-text.version>1.10.0</commons-text.version>
         <diffutils.version>1.3.0</diffutils.version>
         <generex.version>1.0.2</generex.version>
         <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
         <groovy.version>3.0.9</groovy.version>
         <guava.version>30.1.1-jre</guava.version>
         <handlebars-java.version>4.2.1</handlebars-java.version>
         <jackson-threetenbp.version>2.10.0</jackson-threetenbp.version>
+        <jackson-databind.version>2.13.4.2</jackson-databind.version>
         <jackson.version>2.13.4</jackson.version>
         <jacoco.version>0.8.7</jacoco.version>
         <jmustache.version>1.14</jmustache.version>
@@ -1517,7 +1518,7 @@
         <maven-surefire-plugin.version>3.0.0-M6</maven-surefire-plugin.version>
         <openrewrite.version>7.22.0</openrewrite.version>
         <swagger-parser-groupid.version>io.swagger.parser.v3</swagger-parser-groupid.version>
-        <swagger-parser.version>2.1.1</swagger-parser.version>
+        <swagger-parser.version>2.1.6</swagger-parser.version>
         <testng.version>7.5</testng.version>
         <violations-maven-plugin.version>1.34</violations-maven-plugin.version>
         <wagon-ssh-external.version>3.4.3</wagon-ssh-external.version>

samples/client/petstore/go/go-petstore/api/openapi.yaml

@@ -1976,6 +1976,7 @@ components:
         status:
           description: Updated status of the pet
           type: string
+      type: object
     uploadFile_request:
       properties:
         additionalMetadata:
@@ -1985,6 +1986,7 @@ components:
           description: file to upload
           format: binary
           type: string
+      type: object
     testEnumParameters_request:
       properties:
         enum_form_string_array:
@@ -2004,6 +2006,7 @@ components:
           - -efg
           - (xyz)
           type: string
+      type: object
     testEndpointParameters_request:
       properties:
         integer:
@@ -2076,6 +2079,7 @@ components:
       - double
       - number
       - pattern_without_delimiter
+      type: object
     testJsonFormData_request:
       properties:
         param:
@@ -2087,6 +2091,7 @@ components:
       required:
       - param
       - param2
+      type: object
     uploadFileWithRequiredFile_request:
       properties:
         additionalMetadata:
@@ -2098,6 +2103,7 @@ components:
           type: string
       required:
       - requiredFile
+      type: object
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/haskell-http-client/openapi.yaml

@@ -1976,6 +1976,7 @@ components:
         status:
           description: Updated status of the pet
           type: string
+      type: object
     uploadFile_request:
       properties:
         additionalMetadata:
@@ -1985,6 +1986,7 @@ components:
           description: file to upload
           format: binary
           type: string
+      type: object
     testEnumParameters_request:
       properties:
         enum_form_string_array:
@@ -2004,6 +2006,7 @@ components:
           - -efg
           - (xyz)
           type: string
+      type: object
     testEndpointParameters_request:
       properties:
         integer:
@@ -2076,6 +2079,7 @@ components:
       - double
       - number
       - pattern_without_delimiter
+      type: object
     testJsonFormData_request:
       properties:
         param:
@@ -2087,6 +2091,7 @@ components:
       required:
       - param
       - param2
+      type: object
     uploadFileWithRequiredFile_request:
       properties:
         additionalMetadata:
@@ -2098,6 +2103,7 @@ components:
           type: string
       required:
       - requiredFile
+      type: object
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/apache-httpclient/api/openapi.yaml

@@ -2037,6 +2037,7 @@ components:
         status:
           description: Updated status of the pet
           type: string
+      type: object
     uploadFile_request:
       properties:
         additionalMetadata:
@@ -2046,6 +2047,7 @@ components:
           description: file to upload
           format: binary
           type: string
+      type: object
     testEnumParameters_request:
       properties:
         enum_form_string_array:
@@ -2065,6 +2067,7 @@ components:
           - -efg
           - (xyz)
           type: string
+      type: object
     testEndpointParameters_request:
       properties:
         integer:
@@ -2137,6 +2140,7 @@ components:
       - double
       - number
       - pattern_without_delimiter
+      type: object
     testJsonFormData_request:
       properties:
         param:
@@ -2148,6 +2152,7 @@ components:
       required:
       - param
       - param2
+      type: object
     uploadFileWithRequiredFile_request:
       properties:
         additionalMetadata:
@@ -2159,6 +2164,7 @@ components:
           type: string
       required:
       - requiredFile
+      type: object
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/feign-no-nullable/api/openapi.yaml

@@ -2037,6 +2037,7 @@ components:
         status:
           description: Updated status of the pet
           type: string
+      type: object
     uploadFile_request:
       properties:
         additionalMetadata:
@@ -2046,6 +2047,7 @@ components:
           description: file to upload
           format: binary
           type: string
+      type: object
     testEnumParameters_request:
       properties:
         enum_form_string_array:
@@ -2065,6 +2067,7 @@ components:
           - -efg
           - (xyz)
           type: string
+      type: object
     testEndpointParameters_request:
       properties:
         integer:
@@ -2137,6 +2140,7 @@ components:
       - double
       - number
       - pattern_without_delimiter
+      type: object
     testJsonFormData_request:
       properties:
         param:
@@ -2148,6 +2152,7 @@ components:
       required:
       - param
       - param2
+      type: object
     uploadFileWithRequiredFile_request:
       properties:
         additionalMetadata:
@@ -2159,6 +2164,7 @@ components:
           type: string
       required:
       - requiredFile
+      type: object
     Dog_allOf:
       properties:
         breed: