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/jersey2-java8/.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/jersey2-java8/build.gradle
View File

@@ -94,9 +94,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"
jersey_version = "2.27"
junit_version = "4.12"
}

10
samples/client/petstore/java/jersey2-java8/build.sbt
View File

@@ -9,14 +9,14 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.5.21",
"io.swagger" % "swagger-annotations" % "1.5.22",
"org.glassfish.jersey.core" % "jersey-client" % "2.25.1",
"org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1",
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1",
"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-jsr310" % "2.8.9" % "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-jsr310" % "2.9.9" % "compile",
"junit" % "junit" % "4.12" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test"
)

6
samples/client/petstore/java/jersey2-java8/pom.xml
View File

@@ -249,10 +249,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>
<jersey-version>2.27</jersey-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>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
</properties>