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

This commit is contained in:
William Cheng
2019-06-03 09:28:51 +08:00
1217 changed files with 21000 additions and 4757 deletions

View File

@@ -32,6 +32,7 @@ if(hasProperty('target') && target == 'android') {
minSdkVersion 14
targetSdkVersion 25
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
@@ -110,9 +111,9 @@ if(hasProperty('target') && target == 'android') {
}
ext {
swagger_annotations_version = "1.5.17"
jackson_version = "2.8.11"
jackson_databind_version = "2.8.11.2"
swagger_annotations_version = "1.5.22"
jackson_version = "2.9.9"
jackson_databind_version = "2.9.9"
jersey_version = "1.19.4"
jodatime_version = "2.9.9"
junit_version = "4.12"

View File

@@ -108,10 +108,10 @@
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.20</swagger-annotations-version>
<swagger-annotations-version>1.5.22</swagger-annotations-version>
<spring-web-version>5.0.7.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>
<junit-version>4.12</junit-version>
<reactor-version>3.1.8.RELEASE</reactor-version>
<reactor-netty-version>0.7.8.RELEASE</reactor-netty-version>