diff --git a/pom.xml b/pom.xml
index 094a4f7cf..70a4500fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
 		<central-publishing-maven-plugin.version>0.7.0
 		</central-publishing-maven-plugin.version>
 		<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
-		<swagger-api.version>2.2.36</swagger-api.version>
+		<swagger-api.version>2.2.38</swagger-api.version>
 		<swagger-ui.version>5.28.1</swagger-ui.version>
 		<gmavenplus-plugin.version>1.13.1</gmavenplus-plugin.version>
 		<jjwt.version>0.9.1</jjwt.version>
diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app26/MyModel.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app26/MyModel.java
index e2b15d437..ecf03653a 100644
--- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app26/MyModel.java
+++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app26/MyModel.java
@@ -28,7 +28,7 @@
 
 public class MyModel {
 
-	@Schema(description = "Hello", type = "object", oneOf = { Foo.class, Bar.class })
+	@Schema(description = "Hello", types = "object", oneOf = { Foo.class, Bar.class })
 	private Object thing;
 
 	public Object getThing() {
diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app29/TrackerData.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app29/TrackerData.java
index fb238b51d..b8ae9d058 100644
--- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app29/TrackerData.java
+++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app29/TrackerData.java
@@ -40,7 +40,7 @@ public class TrackerData {
 	@JsonProperty("timestamp")
 	Instant timestamp;
 
-	@Schema(name = "value", type = "number", format = "double", description = "The data value", required = true, example = "19.0")
+	@Schema(name = "value", types = "number", format = "double", description = "The data value", required = true, example = "19.0")
 	@JsonProperty("value")
 	Double value;
 
diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app4/TrackerData.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app4/TrackerData.java
index 09e60a18f..caa99e91a 100644
--- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app4/TrackerData.java
+++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app4/TrackerData.java
@@ -39,7 +39,7 @@ public class TrackerData {
 	@JsonProperty("timestamp")
 	Instant timestamp;
 
-	@Schema(name = "value", type = "number", format = "double", description = "The data value", required = true, example = "19.0")
+	@Schema(name = "value", types = "number", format = "double", description = "The data value", required = true, example = "19.0")
 	@JsonProperty("value")
 	Double value;
 
diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app164.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app164.json
index 9ffea82bc..41edae960 100644
--- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app164.json
+++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app164.json
@@ -49,10 +49,12 @@
           "booleanValueAsFourthParameter": {
             "type": "boolean"
           },
-          "listBlah": {
-            "type": "array",
-            "items": {
-              "description": "test"
+          "listBlah" : {
+            "type" : "array",
+            "description" : "test",
+            "items" : {
+              "type" : "string",
+              "description" : "test"
             }
           }
         }
diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app26.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app26.json
index e6b09672d..57c46b16d 100644
--- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app26.json
+++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app26.json
@@ -64,14 +64,9 @@
         "type": "object",
         "properties": {
           "thing": {
+            "type" : "object",
             "description": "Hello",
             "oneOf": [
-              {
-                "$ref": "#/components/schemas/Foo"
-              },
-              {
-                "$ref": "#/components/schemas/Bar"
-              },
               {
                 "$ref": "#/components/schemas/Foo"
               },
diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/MyModel.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/MyModel.java
index 40862a21c..70a407104 100644
--- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/MyModel.java
+++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/MyModel.java
@@ -36,7 +36,7 @@ class MyModel {
 	/**
 	 * The Thing.
 	 */
-	@Schema(description = "Hello", type = "object", oneOf = { Foo.class, Bar.class })
+	@Schema(description = "Hello", types = "object", oneOf = { Foo.class, Bar.class })
 	private Object thing;
 
 	/**
diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app29/TrackerData.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app29/TrackerData.java
index c79bef79c..237e8c020 100644
--- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app29/TrackerData.java
+++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app29/TrackerData.java
@@ -54,7 +54,7 @@ class TrackerData {
 	/**
 	 * The Value.
 	 */
-	@Schema(name = "value", type = "number", format = "double", description = "The data value", required = true, example = "19.0")
+	@Schema(name = "value", types = "number", format = "double", description = "The data value", required = true, example = "19.0")
 	@JsonProperty("value")
 	Double value;
 
diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app4/TrackerData.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app4/TrackerData.java
index 040eb091a..b927d304c 100644
--- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app4/TrackerData.java
+++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app4/TrackerData.java
@@ -53,7 +53,7 @@ class TrackerData {
 	/**
 	 * The Value.
 	 */
-	@Schema(name = "value", type = "number", format = "double", description = "The data value", required = true, example = "19.0")
+	@Schema(name = "value", types = "number", format = "double", description = "The data value", required = true, example = "19.0")
 	@JsonProperty("value")
 	Double value;
 
diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app26.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app26.json
index 52c639196..fe00d3a19 100644
--- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app26.json
+++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app26.json
@@ -78,14 +78,9 @@
         "description": "The type My model.",
         "properties": {
           "thing": {
+            "type": "object",
             "description": "Hello",
             "oneOf": [
-              {
-                "$ref": "#/components/schemas/Foo"
-              },
-              {
-                "$ref": "#/components/schemas/Bar"
-              },
               {
                 "$ref": "#/components/schemas/Foo"
               },