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

This commit is contained in:
William Cheng
2021-01-09 00:15:53 +08:00
955 changed files with 41995 additions and 4606 deletions

View File

@@ -13,7 +13,11 @@
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<!-- RELEASE_VERSION -->
<<<<<<< HEAD
<version>6.0.0-SNAPSHOT</version>
=======
<version>5.1.0-SNAPSHOT</version>
>>>>>>> origin/5.1.x
<!-- /RELEASE_VERSION -->
<executions>
<execution>