forked from loafle/openapi-generator-original
Merge branch '4.3.x' into 5.0.x
This commit is contained in:
@@ -1 +1,5 @@
|
||||
5.0.0-SNAPSHOT
|
||||
<<<<<<< HEAD
|
||||
5.0.0-SNAPSHOT
|
||||
=======
|
||||
4.3.0-SNAPSHOT
|
||||
>>>>>>> 4.3.x
|
||||
|
||||
@@ -96,7 +96,7 @@ if(hasProperty('target') && target == 'android') {
|
||||
ext {
|
||||
swagger_annotations_version = "1.5.22"
|
||||
jackson_version = "2.9.10"
|
||||
jackson_databind_version = "2.9.10"
|
||||
jackson_databind_version = "2.9.10.1"
|
||||
jackson_databind_nullable_version = "0.2.0"
|
||||
jersey_version = "2.27"
|
||||
junit_version = "4.12"
|
||||
|
||||
@@ -15,7 +15,7 @@ lazy val root = (project in file(".")).
|
||||
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1",
|
||||
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
|
||||
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
|
||||
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
|
||||
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10.1" % "compile",
|
||||
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
|
||||
"junit" % "junit" % "4.12" % "test",
|
||||
"com.novocode" % "junit-interface" % "0.10" % "test"
|
||||
|
||||
@@ -278,7 +278,7 @@
|
||||
<swagger-annotations-version>1.5.22</swagger-annotations-version>
|
||||
<jersey-version>2.27</jersey-version>
|
||||
<jackson-version>2.9.10</jackson-version>
|
||||
<jackson-databind-version>2.9.10</jackson-databind-version>
|
||||
<jackson-databind-version>2.9.10.1</jackson-databind-version>
|
||||
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
|
||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||
<junit-version>4.12</junit-version>
|
||||
|
||||
Reference in New Issue
Block a user