Merge branch 'develop_2.0' into library-template-jersey2

Conflicts: modules/swagger-codegen/src/main/resources/Java/JsonUtil.mustache
2015-08-22 21:53:04 +08:00
parent af2ec4cf85 0af29cc5cf
commit 595c01c537
104 changed files with 589 additions and 273 deletions
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.datatype.joda.*;

 import java.io.IOException;

+{{>generatedAnnotation}}
 public class JSON {
  private ObjectMapper mapper;