Skip to content

Commit cfe86b6

Browse files
committed
Upgrade spring-boot to 2.4.5 and swagger-core to 2.1.8
1 parent ab424eb commit cfe86b6

File tree

3 files changed

+43
-25
lines changed

3 files changed

+43
-25
lines changed

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>2.4.3</version>
14+
<version>2.4.5</version>
1515
</parent>
1616

1717
<licenses>
@@ -66,7 +66,7 @@
6666
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
6767
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
6868
<nexus-staging-maven-plugin>1.6.8</nexus-staging-maven-plugin>
69-
<swagger-api.version>2.1.7</swagger-api.version>
69+
<swagger-api.version>2.1.8</swagger-api.version>
7070
<swagger-ui.version>3.46.0</swagger-ui.version>
7171
<spring-security-oauth2.version>2.3.8.RELEASE</spring-security-oauth2.version>
7272
<classgraph.version>4.8.69</classgraph.version>

springdoc-openapi-data-rest/src/test/resources/results/app23.json

+9-6
Original file line numberDiff line numberDiff line change
@@ -854,6 +854,9 @@
854854
}
855855
},
856856
"EntityModelClinic": {
857+
"required": [
858+
"name"
859+
],
857860
"type": "object",
858861
"properties": {
859862
"name": {
@@ -910,16 +913,16 @@
910913
}
911914
}
912915
},
913-
"CollectionModelClinic": {
916+
"CollectionModelObject": {
914917
"type": "object",
915918
"properties": {
916919
"_embedded": {
917920
"type": "object",
918921
"properties": {
919-
"clinics": {
922+
"objects": {
920923
"type": "array",
921924
"items": {
922-
"$ref": "#/components/schemas/ClinicResponse"
925+
"type": "object"
923926
}
924927
}
925928
}
@@ -929,16 +932,16 @@
929932
}
930933
}
931934
},
932-
"CollectionModelObject": {
935+
"CollectionModelClinic": {
933936
"type": "object",
934937
"properties": {
935938
"_embedded": {
936939
"type": "object",
937940
"properties": {
938-
"objects": {
941+
"clinics": {
939942
"type": "array",
940943
"items": {
941-
"type": "object"
944+
"$ref": "#/components/schemas/ClinicResponse"
942945
}
943946
}
944947
}

springdoc-openapi-data-rest/src/test/resources/results/app25.json

+32-17
Original file line numberDiff line numberDiff line change
@@ -2027,6 +2027,9 @@
20272027
}
20282028
},
20292029
"EntityModelClinic": {
2030+
"required": [
2031+
"name"
2032+
],
20302033
"type": "object",
20312034
"properties": {
20322035
"name": {
@@ -2066,6 +2069,10 @@
20662069
}
20672070
},
20682071
"EntityModelPet": {
2072+
"required": [
2073+
"_type",
2074+
"name"
2075+
],
20692076
"type": "object",
20702077
"properties": {
20712078
"name": {
@@ -2122,23 +2129,6 @@
21222129
}
21232130
}
21242131
},
2125-
"EntityModelOwner": {
2126-
"type": "object",
2127-
"properties": {
2128-
"firstname": {
2129-
"type": "string"
2130-
},
2131-
"lastname": {
2132-
"type": "string"
2133-
},
2134-
"addresses": {
2135-
"$ref": "#/components/schemas/Address"
2136-
},
2137-
"_links": {
2138-
"$ref": "#/components/schemas/Links"
2139-
}
2140-
}
2141-
},
21422132
"CollectionModelObject": {
21432133
"type": "object",
21442134
"properties": {
@@ -2158,7 +2148,32 @@
21582148
}
21592149
}
21602150
},
2151+
"EntityModelOwner": {
2152+
"required": [
2153+
"addresses",
2154+
"lastname"
2155+
],
2156+
"type": "object",
2157+
"properties": {
2158+
"firstname": {
2159+
"type": "string"
2160+
},
2161+
"lastname": {
2162+
"type": "string"
2163+
},
2164+
"addresses": {
2165+
"$ref": "#/components/schemas/Address"
2166+
},
2167+
"_links": {
2168+
"$ref": "#/components/schemas/Links"
2169+
}
2170+
}
2171+
},
21612172
"EntityModelDoctor": {
2173+
"required": [
2174+
"firstname",
2175+
"lastname"
2176+
],
21622177
"type": "object",
21632178
"properties": {
21642179
"firstname": {

0 commit comments

Comments
 (0)