loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Merge remote-tracking branch 'origin/master' into 4.1.x

Browse Source
This commit is contained in:
William Cheng
2019-06-03 00:06:43 +08:00
parent 98348a9ee6 b74fa4458d
commit 8d3a1a5add
1959 changed files with 24161 additions and 4878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/client/petstore/java/resttemplate/.openapi-generator/VERSION
View File

@@ -1 +1,5 @@
4.1.0-SNAPSHOT
<<<<<<< HEAD
4.1.0-SNAPSHOT
=======
4.0.2-SNAPSHOT
>>>>>>> origin/master

6
samples/client/petstore/java/resttemplate/build.gradle
View File

@@ -95,9 +95,9 @@ if(hasProperty('target') && target == 'android') {
}
ext {
swagger_annotations_version = "1.5.21"
jackson_version = "2.8.11"
jackson_databind_version = "2.8.11.3"
swagger_annotations_version = "1.5.22"
jackson_version = "2.9.9"
jackson_databind_version = "2.9.9"
spring_web_version = "4.3.9.RELEASE"
jodatime_version = "2.9.9"
junit_version = "4.12"

6
samples/client/petstore/java/resttemplate/pom.xml
View File

@@ -245,10 +245,10 @@
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.21</swagger-annotations-version>
<swagger-annotations-version>1.5.22</swagger-annotations-version>
<spring-web-version>4.3.9.RELEASE</spring-web-version>
<jackson-version>2.8.11</jackson-version>
<jackson-databind-version>2.8.11.3</jackson-databind-version>
<jackson-version>2.9.9</jackson-version>
<jackson-databind-version>2.9.9</jackson-databind-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>