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

@@ -95,11 +95,11 @@ 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"
threepane_version = "2.6.4"
feign_version = "9.4.0"
feign_version = "9.7.0"
feign_form_version = "2.1.0"
junit_version = "4.12"
oltu_version = "1.0.1"

View File

@@ -9,15 +9,15 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"io.github.openfeign" % "feign-core" % "9.4.0" % "compile",
"io.github.openfeign" % "feign-jackson" % "9.4.0" % "compile",
"io.github.openfeign" % "feign-slf4j" % "9.4.0" % "compile",
"io.swagger" % "swagger-annotations" % "1.5.22" % "compile",
"io.github.openfeign" % "feign-core" % "9.7.0" % "compile",
"io.github.openfeign" % "feign-jackson" % "9.7.0" % "compile",
"io.github.openfeign" % "feign-slf4j" % "9.7.0" % "compile",
"io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.8.11" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.11" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.8.11.3" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.8.7" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"com.brsanthu" % "migbase64" % "2.2" % "compile",

View File

@@ -267,10 +267,10 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<swagger-annotations-version>1.5.21</swagger-annotations-version>
<feign-version>9.4.0</feign-version>
<feign-version>9.7.0</feign-version>
<feign-form-version>2.1.0</feign-form-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>
<junit-version>4.12</junit-version>
<maven-plugin-version>1.0.0</maven-plugin-version>