Merge remote-tracking branch 'origin/master' into 7.0.x

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/apache-httpclient/build.gradle

@@ -114,9 +114,9 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     swagger_annotations_version = "1.5.22"
-    jackson_version = "2.12.6"
-    jackson_databind_version = "2.12.6.1"
-    jackson_databind_nullable_version = "0.2.3"
+    jackson_version = "2.13.4"
+    jackson_databind_version = "2.13.4.2"
+    jackson_databind_nullable_version = "0.2.4"
     jakarta_annotation_version = "1.3.5"
     httpclient_version = "4.5.13"
     jodatime_version = "2.9.9"

samples/client/petstore/java/apache-httpclient/pom.xml

@@ -277,8 +277,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <httpclient-version>4.5.13</httpclient-version>
-        <jackson-version>2.12.6</jackson-version>
-        <jackson-databind-version>2.12.6.1</jackson-databind-version>
+        <jackson-version>2.13.4</jackson-version>
+        <jackson-databind-version>2.13.4.2</jackson-databind-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.13.2</junit-version>

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ServerConfiguration.java

@@ -42,7 +42,7 @@ public class ServerConfiguration {
                     throw new IllegalArgumentException("The variable " + name + " in the server URL has invalid value " + value + ".");
                 }
             }
-            url = url.replaceAll("\\{" + name + "\\}", value);
+            url = url.replace("{" + name + "}", value);
         }
         return url;
     }