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

This commit is contained in:
William Cheng
2022-11-01 21:01:06 +08:00
1977 changed files with 36993 additions and 6648 deletions

View File

@@ -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:

View File

@@ -102,8 +102,8 @@ test {
ext {
swagger_annotations_version = "1.5.24"
jackson_version = "2.12.6.1"
jackson_databind_version = "2.12.6.1"
jackson_version = "2.13.4"
jackson_databind_version = "2.13.4.2"
jakarta_annotation_version = "1.3.5"
feign_version = "10.11"
feign_form_version = "3.8.0"

View File

@@ -16,9 +16,9 @@ lazy val root = (project in file(".")).
"io.github.openfeign" % "feign-slf4j" % "10.11" % "compile",
"io.github.openfeign.form" % "feign-form" % "3.8.0" % "compile",
"io.github.openfeign" % "feign-okhttp" % "10.11" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.12.6.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.12.6.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.13.4" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.13.4" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.13.4.2" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
"com.github.scribejava" % "scribejava-core" % "8.0.0" % "compile",

View File

@@ -325,8 +325,8 @@
<swagger-annotations-version>1.5.24</swagger-annotations-version>
<feign-version>10.11</feign-version>
<feign-form-version>3.8.0</feign-form-version>
<jackson-version>2.12.5</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>
<junit-version>5.7.0</junit-version>
<maven-plugin-version>1.0.0</maven-plugin-version>

View File

@@ -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;
}