Merge remote-tracking branch 'origin/4.2.x' into 5.0.x

samples/client/petstore/java/resttemplate-withXml/build.gradle

@@ -96,8 +96,8 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     swagger_annotations_version = "1.5.22"
-    jackson_version = "2.9.9"
-    jackson_databind_version = "2.9.9"
+    jackson_version = "2.9.10"
+    jackson_databind_version = "2.9.10"
     jackson-databind-nullable-version = "0.2.0"
     spring_web_version = "4.3.9.RELEASE"
     jodatime_version = "2.9.9"

samples/client/petstore/java/resttemplate-withXml/docs/FormatTest.md

@@ -19,6 +19,7 @@ Name | Type | Description | Notes
 **dateTime** | [**OffsetDateTime**](OffsetDateTime.md) |  |  [optional]
 **uuid** | [**UUID**](UUID.md) |  |  [optional]
 **password** | **String** |  | 
+**bigDecimal** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
 
 
 

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java

@@ -46,7 +46,8 @@ import javax.xml.bind.annotation.*;
   FormatTest.JSON_PROPERTY_DATE,
   FormatTest.JSON_PROPERTY_DATE_TIME,
   FormatTest.JSON_PROPERTY_UUID,
-  FormatTest.JSON_PROPERTY_PASSWORD
+  FormatTest.JSON_PROPERTY_PASSWORD,
+  FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
 
 @XmlRootElement(name = "FormatTest")
@@ -105,6 +106,10 @@ public class FormatTest {
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
 
+  @XmlElement(name = "BigDecimal")
+  public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
+  private BigDecimal bigDecimal;
+
 
   public FormatTest integer(Integer integer) {
     
@@ -463,6 +468,33 @@ public class FormatTest {
   }
 
 
+  public FormatTest bigDecimal(BigDecimal bigDecimal) {
+    
+    this.bigDecimal = bigDecimal;
+    return this;
+  }
+
+   /**
+   * Get bigDecimal
+   * @return bigDecimal
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "BigDecimal")
+
+  public BigDecimal getBigDecimal() {
+    return bigDecimal;
+  }
+
+
+
+  public void setBigDecimal(BigDecimal bigDecimal) {
+    this.bigDecimal = bigDecimal;
+  }
+
+
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -484,12 +516,13 @@ public class FormatTest {
         Objects.equals(this.date, formatTest.date) &&
         Objects.equals(this.dateTime, formatTest.dateTime) &&
         Objects.equals(this.uuid, formatTest.uuid) &&
-        Objects.equals(this.password, formatTest.password);
+        Objects.equals(this.password, formatTest.password) &&
+        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password);
+    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
   }
 
 
@@ -510,6 +543,7 @@ public class FormatTest {
     sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
     sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
     sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }