update samples

2025-12-11 13:22:45 +00:00 · 2020-04-21 02:22:55 +08:00
parent 935f6100c3
commit 5a9b0fcf9e
1089 changed files with 794 additions and 4499 deletions
--- a/samples/server/petstore/cpp-qt5-qhttpengine-server/.openapi-generator/VERSION
+++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1-SNAPSHOT
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/go-api-server/.openapi-generator/VERSION
+++ b/samples/server/petstore/go-api-server/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION
+++ b/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/java-msf4j/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-msf4j/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/java-play-framework/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-play-framework/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml
@@ -191,14 +191,14 @@
    <java.version>1.7</java.version>
    <maven.compiler.source>${java.version}</maven.compiler.source>
    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.18</swagger-core-version>
+    <swagger-core-version>1.5.22</swagger-core-version>
    <jetty-version>9.2.9.v20150224</jetty-version>
    <junit-version>4.13</junit-version>
    <logback-version>1.1.7</logback-version>
    <servlet-api-version>2.5</servlet-api-version>
    <beanvalidation-version>1.1.0.Final</beanvalidation-version>
    <cxf-version>3.3.0</cxf-version>
-    <jackson-jaxrs-version>2.9.8</jackson-jaxrs-version>
+    <jackson-jaxrs-version>2.9.9</jackson-jaxrs-version>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  </properties>
 </project>
--- a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/jaxrs-cxf-cdi/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf-cdi/pom.xml
@@ -58,8 +58,8 @@
            <groupId>org.apache.cxf</groupId>
            <artifactId>cxf-rt-frontend-jaxrs</artifactId>
            <!-- Version is just a guess -->
-            <!-- Require at lease CXF 3.1.2 since HTTP PATCH support was added on this version -->
-            <version>3.1.2</version>
+            <!-- IBM WebSphere Application Server Liberty Core v8.5.5.6 uses v3.0.2, source https://www.ibm.com/support/knowledgecenter/SSD28V_8.5.5/com.ibm.websphere.wlp.core.doc/ae/rwlp_jaxrs_secure.html -->
+            <version>3.0.2</version>
            <scope>provided</scope>
        </dependency>

@@ -77,6 +77,13 @@
            <version>[1.5.3,1.5.16]</version>
        </dependency>
        
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        
       <!-- Bean Validation API support -->
       <dependency>
           <groupId>javax.validation</groupId>
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml
@@ -191,14 +191,14 @@
    <java.version>1.7</java.version>
    <maven.compiler.source>${java.version}</maven.compiler.source>
    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.18</swagger-core-version>
+    <swagger-core-version>1.5.22</swagger-core-version>
    <jetty-version>9.2.9.v20150224</jetty-version>
    <junit-version>4.13</junit-version>
    <logback-version>1.1.7</logback-version>
    <servlet-api-version>2.5</servlet-api-version>
    <beanvalidation-version>1.1.0.Final</beanvalidation-version>
    <cxf-version>3.3.0</cxf-version>
-    <jackson-jaxrs-version>2.9.8</jackson-jaxrs-version>
+    <jackson-jaxrs-version>2.9.9</jackson-jaxrs-version>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  </properties>
 </project>
--- a/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/jaxrs-datelib-j8/README.md
+++ b/samples/server/petstore/jaxrs-datelib-j8/README.md
@@ -1,11 +1,12 @@
-# Swagger Jersey generated server
+# JAX-RS/Jersey server with OpenAPI

 ## Overview
-This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project. By using the 
-[OpenAPI-Spec](https://github.com/swagger-api/swagger-core/wiki) from a remote server, you can easily generate a server stub.  This
-is an example of building a swagger-enabled JAX-RS server.
+This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using an
+[OpenAPI-Spec](https://openapis.org), you can easily generate a server stub.

+This is an example of building a OpenAPI-enabled JAX-RS server.
 This example uses the [JAX-RS](https://jax-rs-spec.java.net/) framework.
+Jersey is used as JAX-RS implementation, `io.swagger:swagger-jersey2-jaxrs` is used to derive the OpenAPI Specification from the annotated code.

 To run the server, please execute the following:

@@ -13,10 +14,10 @@ To run the server, please execute the following:
 mvn clean package jetty:run
 ```

-You can then view the swagger listing here:
+You can then view the OpenAPI v2 specification here:

 ```
-http://localhost:8082/v2/openapi.json
+http://localhost:8082/v2/swagger.json
 ```

 Note that if you have configured the `host` to be something other than localhost, the calls through
--- a/samples/server/petstore/jaxrs-datelib-j8/pom.xml
+++ b/samples/server/petstore/jaxrs-datelib-j8/pom.xml
@@ -184,7 +184,7 @@
    <beanvalidation-version>1.1.0.Final</beanvalidation-version>
    <jetty-version>9.2.9.v20150224</jetty-version>
    <jersey2-version>2.22.2</jersey2-version>
-    <jackson-version>2.8.9</jackson-version>
+    <jackson-version>2.9.9</jackson-version>
    <junit-version>4.13</junit-version>
    <logback-version>1.1.7</logback-version>
    <servlet-api-version>2.5</servlet-api-version>
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/Bootstrap.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/Bootstrap.java
@@ -16,9 +16,9 @@ public class Bootstrap extends HttpServlet {
    Info info = new Info()
      .title("OpenAPI Server")
      .description("This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\")
-      .termsOfService("http://swagger.io/terms/")
+      .termsOfService("")
      .contact(new Contact()
-        .email("apiteam@swagger.io"))
+        .email(""))
      .license(new License()
        .name("Apache-2.0")
        .url("https://www.apache.org/licenses/LICENSE-2.0.html"));
--- a/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/jaxrs-jersey/README.md
+++ b/samples/server/petstore/jaxrs-jersey/README.md
@@ -17,7 +17,7 @@ mvn clean package jetty:run
 You can then view the OpenAPI v2 specification here:

 ```
-http://localhost:8080/v2/swagger.json
+http://localhost:80/v2/swagger.json
 ```

 Note that if you have configured the `host` to be something other than localhost, the calls through
--- a/samples/server/petstore/jaxrs-jersey/pom.xml
+++ b/samples/server/petstore/jaxrs-jersey/pom.xml
@@ -47,7 +47,7 @@
          <stopKey>stopit</stopKey>
          <stopWait>10</stopWait>
          <httpConnector>
-            <port>8080</port>
+            <port>80</port>
            <idleTimeout>60000</idleTimeout>
          </httpConnector>
        </configuration>
@@ -184,7 +184,7 @@
    <beanvalidation-version>1.1.0.Final</beanvalidation-version>
    <jetty-version>9.2.9.v20150224</jetty-version>
    <jersey2-version>2.22.2</jersey2-version>
-    <jackson-version>2.8.9</jackson-version>
+    <jackson-version>2.9.9</jackson-version>
    <junit-version>4.13</junit-version>
    <logback-version>1.1.7</logback-version>
    <servlet-api-version>2.5</servlet-api-version>
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/Bootstrap.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/Bootstrap.java
@@ -15,7 +15,7 @@ public class Bootstrap extends HttpServlet {
  public void init(ServletConfig config) throws ServletException {
    Info info = new Info()
      .title("OpenAPI Server")
-      .description("This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.")
+      .description("This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\")
      .termsOfService("")
      .contact(new Contact()
        .email(""))
--- a/samples/server/petstore/jaxrs-jersey/src/main/webapp/WEB-INF/web.xml
+++ b/samples/server/petstore/jaxrs-jersey/src/main/webapp/WEB-INF/web.xml
@@ -38,7 +38,7 @@
        </init-param>
        <init-param>
            <param-name>swagger.api.basepath</param-name>
-            <param-value>http://petstore.swagger.io/v2</param-value>
+            <param-value>http://petstore.swagger.io:80/v2</param-value>
        </init-param>

        <load-on-startup>2</load-on-startup>
--- a/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/jaxrs-resteasy/default/build.gradle
+++ b/samples/server/petstore/jaxrs-resteasy/default/build.gradle
@@ -4,7 +4,7 @@ project.version = "1.0.0"
 project.group = "org.openapitools"

 repositories {
-    mavenCentral()
+    maven { url "https://repo1.maven.org/maven2" }
 }

 dependencies {
@@ -15,10 +15,10 @@ dependencies {
    providedCompile 'javax.annotation:javax.annotation-api:1.2'
    providedCompile 'javax:javaee-api:7.0'
    providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final'
-    compile         'io.swagger:swagger-annotations:1.5.10'
+    compile         'io.swagger:swagger-annotations:1.5.22'
    compile         'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final'
    providedCompile 'javax.validation:validation-api:1.1.0.Final'
-    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1'
+    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9'
    compile         'joda-time:joda-time:2.7'
    //TODO: swaggerFeature
    compile 'io.swagger:swagger-jaxrs:1.5.12'
--- a/samples/server/petstore/jaxrs-resteasy/default/pom.xml
+++ b/samples/server/petstore/jaxrs-resteasy/default/pom.xml
@@ -71,6 +71,12 @@
            <artifactId>swagger-annotations</artifactId>
            <version>${swagger-core-version}</version>
        </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-log4j12</artifactId>
@@ -123,7 +129,7 @@
        <dependency>
            <groupId>com.fasterxml.jackson.datatype</groupId>
            <artifactId>jackson-datatype-joda</artifactId>
-            <version>2.4.1</version>
+            <version>2.9.9</version>
        </dependency>
        <dependency>
            <groupId>joda-time</groupId>
@@ -180,7 +186,7 @@
        </repository>
    </repositories>
    <properties>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-core-version>1.5.22</swagger-core-version>
        <jetty-version>9.2.9.v20150224</jetty-version>
        <resteasy-version>3.0.11.Final</resteasy-version>
        <slf4j-version>1.6.3</slf4j-version>
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/jaxrs-resteasy/joda/build.gradle
+++ b/samples/server/petstore/jaxrs-resteasy/joda/build.gradle
@@ -4,7 +4,7 @@ project.version = "1.0.0"
 project.group = "org.openapitools"

 repositories {
-    mavenCentral()
+    maven { url "https://repo1.maven.org/maven2" }
 }

 dependencies {
@@ -15,10 +15,10 @@ dependencies {
    providedCompile 'javax.annotation:javax.annotation-api:1.2'
    providedCompile 'javax:javaee-api:7.0'
    providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final'
-    compile         'io.swagger:swagger-annotations:1.5.10'
+    compile         'io.swagger:swagger-annotations:1.5.22'
    compile         'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final'
    providedCompile 'javax.validation:validation-api:1.1.0.Final'
-    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1'
+    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9'
    compile         'joda-time:joda-time:2.7'
    //TODO: swaggerFeature
    compile 'io.swagger:swagger-jaxrs:1.5.12'
--- a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml
+++ b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml
@@ -71,6 +71,12 @@
            <artifactId>swagger-annotations</artifactId>
            <version>${swagger-core-version}</version>
        </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-log4j12</artifactId>
@@ -123,7 +129,7 @@
        <dependency>
            <groupId>com.fasterxml.jackson.datatype</groupId>
            <artifactId>jackson-datatype-joda</artifactId>
-            <version>2.4.1</version>
+            <version>2.9.9</version>
        </dependency>
        <dependency>
            <groupId>joda-time</groupId>
@@ -180,7 +186,7 @@
        </repository>
    </repositories>
    <properties>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-core-version>1.5.22</swagger-core-version>
        <jetty-version>9.2.9.v20150224</jetty-version>
        <resteasy-version>3.0.11.Final</resteasy-version>
        <slf4j-version>1.6.3</slf4j-version>
--- a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/jaxrs-spec-interface/pom.xml
+++ b/samples/server/petstore/jaxrs-spec-interface/pom.xml
@@ -57,6 +57,12 @@
      <scope>provided</scope>
      <version>1.5.3</version>
    </dependency>
+    <!-- @Nullable annotation -->
+    <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <version>3.0.2</version>
+    </dependency>
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
@@ -72,7 +78,7 @@
    </dependency>
  </dependencies>
  <properties>
-    <jackson-version>2.8.9</jackson-version>
+    <jackson-version>2.9.9</jackson-version>
    <junit-version>4.8.1</junit-version>
  </properties>
 </project>
--- a/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/jaxrs-spec/pom.xml
+++ b/samples/server/petstore/jaxrs-spec/pom.xml
@@ -72,6 +72,12 @@
      <scope>provided</scope>
      <version>1.5.3</version>
    </dependency>
+    <!-- @Nullable annotation -->
+    <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <version>3.0.2</version>
+    </dependency>
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
@@ -107,7 +113,7 @@
    </dependency>
  </dependencies>
  <properties>
-    <jackson-version>2.8.9</jackson-version>
+    <jackson-version>2.9.9</jackson-version>
    <junit-version>4.8.1</junit-version>
  </properties>
 </project>
--- a/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION
+++ b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/kotlin-server/ktor/README.md
+++ b/samples/server/petstore/kotlin-server/ktor/README.md
@@ -2,11 +2,7 @@

 This is a sample server Petstore server. For this sample, you can use the api key &#x60;special-key&#x60; to test the authorization filters.

-<<<<<<< HEAD
 Generated by OpenAPI Generator 5.0.0-SNAPSHOT.
-=======
-Generated by OpenAPI Generator 4.3.1-SNAPSHOT.
->>>>>>> origin/master

 ## Requires

--- a/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION
+++ b/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION
+++ b/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/php-lumen/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-lumen/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/php-slim/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-slim/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION
+++ b/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1-SNAPSHOT
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION
+++ b/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION
+++ b/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/python-flask-python2/.openapi-generator/VERSION
+++ b/samples/server/petstore/python-flask-python2/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/python-flask/.openapi-generator/VERSION
+++ b/samples/server/petstore/python-flask/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION
+++ b/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc/.openapi-generator/VERSION
+++ b/samples/server/petstore/spring-mvc/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
-=======
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1-SNAPSHOT).
->>>>>>> origin/master
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
--- a/Show More
+++ b/Show More