Merge remote-tracking branch 'origin/3.4.x' into 4.0.x

This commit is contained in:
William Cheng
2018-10-16 16:08:11 +08:00
3597 changed files with 125920 additions and 21130 deletions

View File

@@ -15,6 +15,7 @@
<properties>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
<gradleVersion>4.10.2</gradleVersion>
</properties>
<dependencies>
@@ -54,7 +55,7 @@
<artifactId>gradle-maven-plugin</artifactId>
<version>1.0.8</version>
<configuration>
<gradleVersion>4.7</gradleVersion>
<gradleVersion>${gradleVersion}</gradleVersion>
<args>
<arg>-P openApiGeneratorVersion=${project.version}</arg>
</args>
@@ -76,6 +77,13 @@
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-tooling-api</artifactId>
<version>${gradleVersion}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>