Upgrade spring-boot to 2.4.5 and swagger-core to 2.1.8

springdoc · Apr 18, 2021 · cfe86b6 · cfe86b6
1 parent ab424eb
commit cfe86b6
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 25 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.4.3</version>
+ <version>2.4.5</version>
  </parent>
 
  <licenses>
@@ -66,7 +66,7 @@
  <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
  <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
  <nexus-staging-maven-plugin>1.6.8</nexus-staging-maven-plugin>
- <swagger-api.version>2.1.7</swagger-api.version>
+ <swagger-api.version>2.1.8</swagger-api.version>
  <swagger-ui.version>3.46.0</swagger-ui.version>
  <spring-security-oauth2.version>2.3.8.RELEASE</spring-security-oauth2.version>
  <classgraph.version>4.8.69</classgraph.version>

diff --git a/springdoc-openapi-data-rest/src/test/resources/results/app23.json b/springdoc-openapi-data-rest/src/test/resources/results/app23.json
@@ -854,6 +854,9 @@
  }
  },
  "EntityModelClinic": {
+ "required": [
+ "name"
+ ],
  "type": "object",
  "properties": {
  "name": {
@@ -910,16 +913,16 @@
  }
  }
  },
- "CollectionModelClinic": {
+ "CollectionModelObject": {
  "type": "object",
  "properties": {
  "_embedded": {
  "type": "object",
  "properties": {
- "clinics": {
+ "objects": {
  "type": "array",
  "items": {
- "$ref": "#/components/schemas/ClinicResponse"
+ "type": "object"
  }
  }
  }
@@ -929,16 +932,16 @@
  }
  }
  },
- "CollectionModelObject": {
+ "CollectionModelClinic": {
  "type": "object",
  "properties": {
  "_embedded": {
  "type": "object",
  "properties": {
- "objects": {
+ "clinics": {
  "type": "array",
  "items": {
- "type": "object"
+ "$ref": "#/components/schemas/ClinicResponse"
  }
  }
  }

diff --git a/springdoc-openapi-data-rest/src/test/resources/results/app25.json b/springdoc-openapi-data-rest/src/test/resources/results/app25.json
@@ -2027,6 +2027,9 @@
  }
  },
  "EntityModelClinic": {
+ "required": [
+ "name"
+ ],
  "type": "object",
  "properties": {
  "name": {
@@ -2066,6 +2069,10 @@
  }
  },
  "EntityModelPet": {
+ "required": [
+ "_type",
+ "name"
+ ],
  "type": "object",
  "properties": {
  "name": {
@@ -2122,23 +2129,6 @@
  }
  }
  },
- "EntityModelOwner": {
- "type": "object",
- "properties": {
- "firstname": {
- "type": "string"
- },
- "lastname": {
- "type": "string"
- },
- "addresses": {
- "$ref": "#/components/schemas/Address"
- },
- "_links": {
- "$ref": "#/components/schemas/Links"
- }
- }
- },
  "CollectionModelObject": {
  "type": "object",
  "properties": {
@@ -2158,7 +2148,32 @@
  }
  }
  },
+ "EntityModelOwner": {
+ "required": [
+ "addresses",
+ "lastname"
+ ],
+ "type": "object",
+ "properties": {
+ "firstname": {
+ "type": "string"
+ },
+ "lastname": {
+ "type": "string"
+ },
+ "addresses": {
+ "$ref": "#/components/schemas/Address"
+ },
+ "_links": {
+ "$ref": "#/components/schemas/Links"
+ }
+ }
+ },
  "EntityModelDoctor": {
+ "required": [
+ "firstname",
+ "lastname"
+ ],
  "type": "object",
  "properties": {
  "firstname": {