valitydev/openapi-generator
14
0
Fork 0
mirror of https://github.com/valitydev/openapi-generator.git synced 2024-11-06 10:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#7123 use correct jackson date library when using Java 8 (#7285)

Browse Source
This commit is contained in:
Dennis Kieselhorst 2018-01-28 17:23:06 +01:00 committed by William Cheng
parent 6bc84eeee1
commit 298ca8d352
3 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache
View File

@ -154,12 +154,20 @@
<version>${jackson-jaxrs-version}</version> <version>${jackson-jaxrs-version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
{{#java8}}
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson-jaxrs-version}</version>
</dependency>
{{/java8}}
{{^java8}}
<dependency> <dependency>
<groupId>com.fasterxml.jackson.datatype</groupId> <groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId> <artifactId>jackson-datatype-joda</artifactId>
<version>${jackson-jaxrs-version}</version> <version>${jackson-jaxrs-version}</version>
<scope>compile</scope>
</dependency> </dependency>
{{/java8}}
{{#useBeanValidationFeature}} {{#useBeanValidationFeature}}
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>

10
modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
View File

@ -169,12 +169,20 @@
<version>${jackson-jaxrs-version}</version> <version>${jackson-jaxrs-version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
{{#java8}}
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson-jaxrs-version}</version>
</dependency>
{{/java8}}
{{^java8}}
<dependency> <dependency>
<groupId>com.fasterxml.jackson.datatype</groupId> <groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId> <artifactId>jackson-datatype-joda</artifactId>
<version>${jackson-jaxrs-version}</version> <version>${jackson-jaxrs-version}</version>
<scope>compile</scope>
</dependency> </dependency>
{{/java8}}
{{#generateSpringApplication}} {{#generateSpringApplication}}
<!-- Spring --> <!-- Spring -->
<dependency> <dependency>

9
modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
View File

@ -133,11 +133,20 @@
<artifactId>jersey-media-multipart</artifactId> <artifactId>jersey-media-multipart</artifactId>
<version>${jersey2-version}</version> <version>${jersey2-version}</version>
</dependency> </dependency>
{{#java8}}
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson-version}</version>
</dependency>
{{/java8}}
{{^java8}}
<dependency> <dependency>
<groupId>com.fasterxml.jackson.datatype</groupId> <groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId> <artifactId>jackson-datatype-joda</artifactId>
<version>${jackson-version}</version> <version>${jackson-version}</version>
</dependency> </dependency>
{{/java8}}
<dependency> <dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId> <groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId> <artifactId>jackson-jaxrs-json-provider</artifactId>