Skip to content

Commit f18f81c

Browse files
committed
Merge branch 'fix_resteasy_gradle_definition' of https://github.com/chameleon82/swagger-codegen into chameleon82-fix_resteasy_gradle_definition
2 parents 33e6be3 + 0506b4a commit f18f81c

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/JacksonConfig.mustache

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ public class JacksonConfig implements ContextResolver<ObjectMapper> {
4040
});
4141
}
4242

43-
@Override
4443
public ObjectMapper getContext(Class<?> arg0) {
4544
return objectMapper;
4645
}

modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ dependencies {
1515
providedCompile 'javax.annotation:javax.annotation-api:1.2'
1616
providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final'
1717
compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final'
18-
19-
// compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1'
20-
// compile 'joda-time:joda-time:2.7'
21-
18+
{{#joda}}
19+
compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1'
20+
compile 'joda-time:joda-time:2.7'
21+
{{/joda}}
2222
testCompile 'junit:junit:4.12',
2323
'org.hamcrest:hamcrest-core:1.3'
2424
}

0 commit comments

Comments
 (0)