loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.2.x' into 4.0.x

Browse Source
This commit is contained in:
Jeremie Bresson
2018-07-18 12:32:55 +02:00
parent f98000753d 45ed374b62
commit eb09731a65
255 changed files with 8075 additions and 1622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/client/petstore/java/jersey2-java8/build.gradle
View File

@@ -93,9 +93,9 @@ if(hasProperty('target') && target == 'android') {
}
ext {
swagger_annotations_version = "1.5.17"
jackson_version = "2.8.9"
jersey_version = "2.25.1"
swagger_annotations_version = "1.5.20"
jackson_version = "2.9.6"
jersey_version = "2.27"
junit_version = "4.12"
}
@@ -107,6 +107,6 @@ 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_version"
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version",
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
testCompile "junit:junit:$junit_version"
}

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

@@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.5.17",
"io.swagger" % "swagger-annotations" % "1.5.20",
"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",

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

@@ -251,9 +251,9 @@
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-core-version>1.5.18</swagger-core-version>
<jersey-version>2.25.1</jersey-version>
<jackson-version>2.7.5</jackson-version>
<swagger-core-version>1.5.20</swagger-core-version>
<jersey-version>2.27</jersey-version>
<jackson-version>2.8.9</jackson-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
</properties>

3
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
View File

@@ -26,7 +26,8 @@ import io.swagger.annotations.ApiModelProperty;
/**
* Animal
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true )
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
@JsonSubTypes({
@JsonSubTypes.Type(value = Dog.class, name = "Dog"),
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),