Merge branch 'master' into 5.0.x

This commit is contained in:
wing328
2019-10-17 11:18:57 +08:00
1825 changed files with 46850 additions and 11246 deletions

View File

@@ -98,7 +98,7 @@ ext {
swagger_annotations_version = "1.5.22"
jackson_version = "2.9.10"
jackson_databind_version = "2.9.10"
jackson-databind-nullable-version = "0.2.0"
jackson_databind_nullable_version = "0.2.0"
threepane_version = "2.6.4"
feign_version = "9.7.0"
feign_form_version = "2.1.0"
@@ -116,7 +116,7 @@ dependencies {
compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version"
compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threepane_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
compile "com.brsanthu:migbase64:2.2"