Merge remote-tracking branch 'origin/master' into 5.0-sync-master

modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml

@@ -19,7 +19,11 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
+<<<<<<< HEAD
                 <version>5.0.0-SNAPSHOT</version>
+=======
+                <version>4.3.1-SNAPSHOT</version>
+>>>>>>> origin/master
                 <!-- /RELEASE_VERSION -->
                 <dependencies>
                     <dependency>
@@ -74,7 +78,7 @@
     </pluginRepositories>
     <dependencies>
          <!-- dependencies are needed for the client being generated -->
-         
+
         <dependency>
           <groupId>io.swagger</groupId>
           <artifactId>swagger-annotations</artifactId>
@@ -83,7 +87,7 @@
 
         <!-- You can find the dependencies for the library configuation you chose by looking in JavaClientCodegen.
              Then find the corresponding dependency on Maven Central, and set the versions in the property section below -->
-                
+
         <!-- HTTP client: jersey-client -->
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
@@ -159,5 +163,5 @@
             <version>2.2</version>
         </dependency>
     </dependencies>
-    
+
 </project>