From 0506b4ab768f84a09a8a1c890927535fb54b93e7 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 22 Jun 2016 01:10:48 +0600 Subject: [PATCH] Fix joda dependency in resteasy gradle file --- .../resources/JavaJaxRS/resteasy/JacksonConfig.mustache | 1 - .../src/main/resources/JavaJaxRS/resteasy/gradle.mustache | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/JacksonConfig.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/JacksonConfig.mustache index f2caa6c8331..0f591e315dc 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/JacksonConfig.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/JacksonConfig.mustache @@ -40,7 +40,6 @@ public class JacksonConfig implements ContextResolver { }); } - @Override public ObjectMapper getContext(Class arg0) { return objectMapper; } diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache index b5d7e2378ef..ae34de08166 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache @@ -15,10 +15,10 @@ dependencies { providedCompile 'javax.annotation:javax.annotation-api:1.2' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' - -// compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1' -// compile 'joda-time:joda-time:2.7' - +{{#joda}} + compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1' + compile 'joda-time:joda-time:2.7' +{{/joda}} testCompile 'junit:junit:4.12', 'org.hamcrest:hamcrest-core:1.3' }