Merge branch 'fix_resteasy_gradle_definition' of https://github.com/chameleon82/swagger-codegen into chameleon82-fix_resteasy_gradle_definition

This commit is contained in:
wing328 2016-07-01 19:54:43 +08:00
commit f18f81cce9
2 changed files with 4 additions and 5 deletions

View File

@ -40,7 +40,6 @@ public class JacksonConfig implements ContextResolver<ObjectMapper> {
}); });
} }
@Override
public ObjectMapper getContext(Class<?> arg0) { public ObjectMapper getContext(Class<?> arg0) {
return objectMapper; return objectMapper;
} }

View File

@ -15,10 +15,10 @@ dependencies {
providedCompile 'javax.annotation:javax.annotation-api:1.2' providedCompile 'javax.annotation:javax.annotation-api:1.2'
providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' 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 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final'
{{#joda}}
// compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1' compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1'
// compile 'joda-time:joda-time:2.7' compile 'joda-time:joda-time:2.7'
{{/joda}}
testCompile 'junit:junit:4.12', testCompile 'junit:junit:4.12',
'org.hamcrest:hamcrest-core:1.3' 'org.hamcrest:hamcrest-core:1.3'
} }