Merge remote-tracking branch 'origin/5.3.x' into 6.0.x

samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION

@@ -1 +1,5 @@
-6.0.0-SNAPSHOT
+<<<<<<< HEAD
+6.0.0-SNAPSHOT
+=======
+5.3.0-SNAPSHOT
+>>>>>>> origin/5.3.x

samples/server/petstore/springboot-virtualan/pom.xml

@@ -75,18 +75,13 @@
         <dependency>
             <groupId>io.virtualan</groupId>
             <artifactId>virtualan-plugin</artifactId>
-            <version>2.1.7</version>
+            <version>2.2.1</version>
         </dependency>
         <!-- HyperSQL DB -->
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>2.3.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <version>1.5.9.RELEASE</version>
+            <version>2.5.0</version>
         </dependency>
     <!-- END Virtual Service API support -->
         <dependency>

samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java

@@ -1,5 +1,9 @@
 /**
+<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT).
+=======
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT).
+>>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java

@@ -1,5 +1,9 @@
 /**
+<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT).
+=======
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT).
+>>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java

@@ -1,5 +1,9 @@
 /**
+<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT).
+=======
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT).
+>>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java

@@ -1,5 +1,9 @@
 /**
+<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT).
+=======
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT).
+>>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java

@@ -1,5 +1,9 @@
 /**
+<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT).
+=======
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT).
+>>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java

@@ -1,5 +1,9 @@
 /**
+<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT).
+=======
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT).
+>>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java

@@ -44,7 +44,7 @@ public class FormatTest   {
   private byte[] _byte;
 
   @JsonProperty("binary")
-  private org.springframework.web.multipart.MultipartFile binary;
+  private org.springframework.core.io.Resource binary;
 
   @JsonProperty("date")
   @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
@@ -236,7 +236,7 @@ public class FormatTest   {
     this._byte = _byte;
   }
 
-  public FormatTest binary(org.springframework.web.multipart.MultipartFile binary) {
+  public FormatTest binary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
     return this;
   }
@@ -249,11 +249,11 @@ public class FormatTest   {
 
   @Valid
 
-  public org.springframework.web.multipart.MultipartFile getBinary() {
+  public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
 
-  public void setBinary(org.springframework.web.multipart.MultipartFile binary) {
+  public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 

samples/server/petstore/springboot-virtualan/src/main/resources/application.properties

@@ -2,7 +2,7 @@ springfox.documentation.swagger.v2.path=/api-docs
 server.port=80
 spring.jackson.date-format=org.openapitools.RFC3339DateFormat
 spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false
-virtual.datasource.driver-class-name=org.hsqldb.jdbcDriver
-virtual.datasource.jdbcurl=jdbc:hsqldb:mem:dataSource
-virtual.datasource.username=sa
-virtual.datasource.password=
+virtualan.datasource.driver-class-name=org.hsqldb.jdbcDriver
+virtualan.datasource.jdbcurl=jdbc:hsqldb:mem:dataSource
+virtualan.datasource.username=sa
+virtualan.datasource.password=