diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenProperty.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenProperty.java index f667d845e74..4982bff41b1 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenProperty.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenProperty.java @@ -9,7 +9,7 @@ public class CodegenProperty extends CodegenObject implements Cloneable { public String baseName, complexType, getter, setter, description, datatype, datatypeWithEnum, dataFormat, name, min, max, defaultValue, defaultValueWithParam, - baseType, containerType, title; + baseType, containerType, title, schemaType; /** The 'description' string without escape charcters needed by some programming languages/targets */ public String unescapedDescription; @@ -248,6 +248,14 @@ public void setMaximum(String maximum) { this.maximum = maximum; } + public String getSchemaType() { + return schemaType; + } + + public void setSchemaType(String schemaType) { + this.schemaType = schemaType; + } + public boolean getExclusiveMinimum() { return exclusiveMinimum; } @@ -386,6 +394,7 @@ public int hashCode() result = prime * result + ((_enum == null) ? 0 : _enum.hashCode()); result = prime * result + ((allowableValues == null) ? 0 : allowableValues.hashCode()); result = prime * result + ((baseName == null) ? 0 : baseName.hashCode()); + result = prime * result + ((schemaType == null) ? 0 : schemaType.hashCode()); result = prime * result + ((baseType == null) ? 0 : baseType.hashCode()); result = prime * result + ((complexType == null) ? 0 : complexType.hashCode()); result = prime * result + ((containerType == null) ? 0 : containerType.hashCode()); @@ -438,6 +447,9 @@ public boolean equals(Object obj) { if ((this.baseName == null) ? (other.baseName != null) : !this.baseName.equals(other.baseName)) { return false; } + if ((this.schemaType == null) ? (other.schemaType != null) : !this.schemaType.equals(other.schemaType)) { + return false; + } if ((this.complexType == null) ? (other.complexType != null) : !this.complexType.equals(other.complexType)) { return false; } diff --git a/pom.docker.xml b/pom.docker.xml index eaa9e8417b7..cf99464782d 100644 --- a/pom.docker.xml +++ b/pom.docker.xml @@ -1127,24 +1127,24 @@ <jackson-databind-version>2.16.1</jackson-databind-version> <scala-version>2.11.1</scala-version> <felix-version>3.3.0</felix-version> - <commons-io-version>2.15.1</commons-io-version> - <commons-cli-version>1.8.0</commons-cli-version> + <commons-io-version>2.16.1</commons-io-version> + <commons-cli-version>1.9.0</commons-cli-version> <junit-version>4.13.2</junit-version> <maven-plugin-version>1.0.0</maven-plugin-version> - <commons-lang-version>3.14.0</commons-lang-version> + <commons-lang-version>3.16.0</commons-lang-version> <slf4j-version>2.0.9</slf4j-version> - <logback-version>1.5.6</logback-version> + <logback-version>1.5.7</logback-version> <scala-maven-plugin-version>3.2.1</scala-maven-plugin-version> <jmustache-version>1.16</jmustache-version> <testng-version>7.10.2</testng-version> - <surefire-version>3.2.3</surefire-version> + <surefire-version>3.4.0</surefire-version> <jmockit-version>1.49</jmockit-version> <reflections-version>0.10.2</reflections-version> - <mockito-version>5.8.0</mockito-version> + <mockito-version>5.12.0</mockito-version> <snakeyaml-version>2.2</snakeyaml-version> <handlebars-version>4.3.1</handlebars-version> <httpclient-version>4.5.14</httpclient-version> - <jersey-version>2.43</jersey-version> + <jersey-version>2.44</jersey-version> <json-version>20231013</json-version> </properties> </project> diff --git a/pom.java11.xml b/pom.java11.xml index 8e2a990521f..3e7671143c4 100644 --- a/pom.java11.xml +++ b/pom.java11.xml @@ -1228,24 +1228,24 @@ <jackson-databind-version>2.16.1</jackson-databind-version> <scala-version>2.11.1</scala-version> <felix-version>3.3.0</felix-version> - <commons-io-version>2.15.1</commons-io-version> - <commons-cli-version>1.8.0</commons-cli-version> + <commons-io-version>2.16.1</commons-io-version> + <commons-cli-version>1.9.0</commons-cli-version> <junit-version>4.13.2</junit-version> <maven-plugin-version>1.0.0</maven-plugin-version> - <commons-lang-version>3.14.0</commons-lang-version> + <commons-lang-version>3.16.0</commons-lang-version> <slf4j-version>2.0.9</slf4j-version> - <logback-version>1.5.6</logback-version> + <logback-version>1.5.7</logback-version> <scala-maven-plugin-version>3.2.1</scala-maven-plugin-version> <jmustache-version>1.16</jmustache-version> <testng-version>7.10.2</testng-version> - <surefire-version>3.2.3</surefire-version> + <surefire-version>3.4.0</surefire-version> <jmockit-version>1.49</jmockit-version> <reflections-version>0.10.2</reflections-version> - <mockito-version>5.8.0</mockito-version> + <mockito-version>5.12.0</mockito-version> <snakeyaml-version>2.2</snakeyaml-version> <handlebars-version>4.3.1</handlebars-version> <httpclient-version>4.5.14</httpclient-version> - <jersey-version>2.43</jersey-version> + <jersey-version>2.44</jersey-version> <json-version>20231013</json-version> </properties> </project> diff --git a/pom.java8.xml b/pom.java8.xml index 4bb28b1a293..beb68bac5ab 100644 --- a/pom.java8.xml +++ b/pom.java8.xml @@ -1231,24 +1231,24 @@ <jackson-databind-version>2.16.1</jackson-databind-version> <scala-version>2.11.1</scala-version> <felix-version>3.3.0</felix-version> - <commons-io-version>2.15.1</commons-io-version> - <commons-cli-version>1.8.0</commons-cli-version> + <commons-io-version>2.16.1</commons-io-version> + <commons-cli-version>1.9.0</commons-cli-version> <junit-version>4.13.2</junit-version> <maven-plugin-version>1.0.0</maven-plugin-version> - <commons-lang-version>3.14.0</commons-lang-version> + <commons-lang-version>3.16.0</commons-lang-version> <slf4j-version>2.0.9</slf4j-version> - <logback-version>1.5.6</logback-version> + <logback-version>1.5.7</logback-version> <scala-maven-plugin-version>3.2.1</scala-maven-plugin-version> <jmustache-version>1.16</jmustache-version> <testng-version>7.10.2</testng-version> - <surefire-version>3.2.3</surefire-version> + <surefire-version>3.4.0</surefire-version> <jmockit-version>1.49</jmockit-version> <reflections-version>0.10.2</reflections-version> - <mockito-version>5.8.0</mockito-version> + <mockito-version>5.12.0</mockito-version> <snakeyaml-version>2.2</snakeyaml-version> <handlebars-version>4.3.1</handlebars-version> <httpclient-version>4.5.14</httpclient-version> - <jersey-version>2.43</jersey-version> + <jersey-version>2.44</jersey-version> <json-version>20231013</json-version> </properties> </project> diff --git a/pom.xml b/pom.xml index a937433b0ca..94cb9d648b8 100644 --- a/pom.xml +++ b/pom.xml @@ -1210,24 +1210,24 @@ <jackson-databind-version>2.16.1</jackson-databind-version> <scala-version>2.11.1</scala-version> <felix-version>3.3.0</felix-version> - <commons-io-version>2.15.1</commons-io-version> - <commons-cli-version>1.8.0</commons-cli-version> + <commons-io-version>2.16.1</commons-io-version> + <commons-cli-version>1.9.0</commons-cli-version> <junit-version>4.13.2</junit-version> <maven-plugin-version>1.0.0</maven-plugin-version> - <commons-lang-version>3.14.0</commons-lang-version> + <commons-lang-version>3.16.0</commons-lang-version> <slf4j-version>2.0.9</slf4j-version> - <logback-version>1.5.6</logback-version> + <logback-version>1.5.7</logback-version> <scala-maven-plugin-version>3.2.1</scala-maven-plugin-version> <jmustache-version>1.16</jmustache-version> <testng-version>7.10.2</testng-version> - <surefire-version>3.2.3</surefire-version> + <surefire-version>3.4.0</surefire-version> <jmockit-version>1.49</jmockit-version> <reflections-version>0.10.2</reflections-version> - <mockito-version>5.8.0</mockito-version> + <mockito-version>5.12.0</mockito-version> <snakeyaml-version>2.2</snakeyaml-version> <handlebars-version>4.3.1</handlebars-version> <httpclient-version>4.5.14</httpclient-version> - <jersey-version>2.43</jersey-version> + <jersey-version>2.44</jersey-version> <json-version>20231013</json-version> </properties> </project>