diff --git a/CHANGELOG.md b/CHANGELOG.md index 474d45322..31b255a54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 1.2.2 +* Don't log ClassAlreadyExistsException for Enum ([#1597](https://github.com/joelittlejohn/jsonschema2pojo/pull/1597)) +* Prevent generating duplicate constructors when all properties are required; and both includeAllPropertiesConstructor and includeRequiredPropertiesConstructor are true ([#1553](https://github.com/joelittlejohn/jsonschema2pojo/pull/1553)) +* Add support for property names containing question mark(s) ([#1522](https://github.com/joelittlejohn/jsonschema2pojo/pull/1522)) +* Avoid NPE when setting additionalProperties path ([#1515](https://github.com/joelittlejohn/jsonschema2pojo/pull/1515)) + ## 1.2.1 * Fix detection of targetVersion for Android gradle builds ([#1487](https://github.com/joelittlejohn/jsonschema2pojo/pull/1487)) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index c92633c64..12ca7417b 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -116,3 +116,6 @@ * TheTrueDentist * Josejulio Martínez * Nils Andresen +* Michael Edgar +* Julien Herr +* Daniel Hammer diff --git a/README.md b/README.md index 8e8a1317f..e444a843e 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ A very simple Maven example: org.jsonschema2pojo jsonschema2pojo-maven-plugin - 1.2.1 + 1.2.2 ${basedir}/src/main/resources/schema com.example.types @@ -31,7 +31,7 @@ A very simple Gradle example: ```groovy plugins { id "java" - id "org.jsonschema2pojo" version "1.2.1" + id "org.jsonschema2pojo" version "1.2.2" } repositories { @@ -51,10 +51,10 @@ Useful pages: * **[Getting started](https://github.com/joelittlejohn/jsonschema2pojo/wiki/Getting-Started)** * **[How to contribute](https://github.com/joelittlejohn/jsonschema2pojo/blob/master/CONTRIBUTING.md)** * [Reference](https://github.com/joelittlejohn/jsonschema2pojo/wiki/Reference) - * [Latest Javadocs](https://joelittlejohn.github.io/jsonschema2pojo/javadocs/1.2.1/) - * [Documentation for the Maven plugin](https://joelittlejohn.github.io/jsonschema2pojo/site/1.2.1/generate-mojo.html) + * [Latest Javadocs](https://joelittlejohn.github.io/jsonschema2pojo/javadocs/1.2.2/) + * [Documentation for the Maven plugin](https://joelittlejohn.github.io/jsonschema2pojo/site/1.2.2/generate-mojo.html) * [Documentation for the Gradle plugin](https://github.com/joelittlejohn/jsonschema2pojo/tree/master/jsonschema2pojo-gradle-plugin#usage) - * [Documentation for the Ant task](https://joelittlejohn.github.io/jsonschema2pojo/site/1.2.1/Jsonschema2PojoTask.html) + * [Documentation for the Ant task](https://joelittlejohn.github.io/jsonschema2pojo/site/1.2.2/Jsonschema2PojoTask.html) Project resources: * [Downloads](https://github.com/joelittlejohn/jsonschema2pojo/releases) diff --git a/jsonschema2pojo-ant/pom.xml b/jsonschema2pojo-ant/pom.xml index 671d53ddb..367d93d58 100644 --- a/jsonschema2pojo-ant/pom.xml +++ b/jsonschema2pojo-ant/pom.xml @@ -5,7 +5,7 @@ jsonschema2pojo org.jsonschema2pojo - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT jsonschema2pojo-ant diff --git a/jsonschema2pojo-cli/pom.xml b/jsonschema2pojo-cli/pom.xml index a3b1bb457..051184e7b 100644 --- a/jsonschema2pojo-cli/pom.xml +++ b/jsonschema2pojo-cli/pom.xml @@ -5,7 +5,7 @@ jsonschema2pojo org.jsonschema2pojo - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT jsonschema2pojo-cli diff --git a/jsonschema2pojo-core/pom.xml b/jsonschema2pojo-core/pom.xml index 8096882cb..9c40eae38 100644 --- a/jsonschema2pojo-core/pom.xml +++ b/jsonschema2pojo-core/pom.xml @@ -5,7 +5,7 @@ jsonschema2pojo org.jsonschema2pojo - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT jsonschema2pojo-core diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/EnumRule.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/EnumRule.java index bafd06b8f..9adb0c97b 100644 --- a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/EnumRule.java +++ b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/EnumRule.java @@ -115,7 +115,6 @@ public JType apply(String nodeName, JsonNode node, JsonNode parent, JClassContai try { _enum = createEnum(node, nodeName, container); } catch (ClassAlreadyExistsException e) { - ruleFactory.getLogger().error("Could not create enum.", e); return e.getExistingClass(); } diff --git a/jsonschema2pojo-gradle-plugin/README.md b/jsonschema2pojo-gradle-plugin/README.md index 29ded90c4..bff5603e4 100644 --- a/jsonschema2pojo-gradle-plugin/README.md +++ b/jsonschema2pojo-gradle-plugin/README.md @@ -15,7 +15,7 @@ With Groovy: ```groovy plugins { id "java" - id "org.jsonschema2pojo" version "1.2.1" + id "org.jsonschema2pojo" version "1.2.2" } jsonSchema2Pojo { @@ -28,7 +28,7 @@ With Kotlin: ```kotlin plugins { id("java") - id("org.jsonschema2pojo") version "1.2.1" + id("org.jsonschema2pojo") version "1.2.2" } jsonSchema2Pojo { @@ -44,7 +44,7 @@ Below we have a full build.gradle example, showing all available configuration o ```groovy plugins { id "java" - id "org.jsonschema2pojo" version "1.2.1" + id "org.jsonschema2pojo" version "1.2.2" } repositories { @@ -266,7 +266,7 @@ jsonSchema2Pojo { dateTimeType = "java.time.LocalDateTime" // What type to use instead of string when adding string properties of format "time" to Java types - timeType = "java.time.LocalDate" + timeType = "java.time.LocalTime" // A custom pattern to use when formatting date fields during serialization. Requires support from // your JSON binding library. diff --git a/jsonschema2pojo-gradle-plugin/example/android/gradle/wrapper/gradle-wrapper.jar b/jsonschema2pojo-gradle-plugin/example/android/gradle/wrapper/gradle-wrapper.jar index 943f0cbfa..afba10928 100644 Binary files a/jsonschema2pojo-gradle-plugin/example/android/gradle/wrapper/gradle-wrapper.jar and b/jsonschema2pojo-gradle-plugin/example/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/jsonschema2pojo-gradle-plugin/example/android/gradle/wrapper/gradle-wrapper.properties b/jsonschema2pojo-gradle-plugin/example/android/gradle/wrapper/gradle-wrapper.properties index 508322917..c7d437bbb 100644 --- a/jsonschema2pojo-gradle-plugin/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/jsonschema2pojo-gradle-plugin/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/jsonschema2pojo-gradle-plugin/pom.xml b/jsonschema2pojo-gradle-plugin/pom.xml index d8a9353d1..9ed215eaf 100644 --- a/jsonschema2pojo-gradle-plugin/pom.xml +++ b/jsonschema2pojo-gradle-plugin/pom.xml @@ -5,7 +5,7 @@ jsonschema2pojo org.jsonschema2pojo - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT jsonschema2pojo-gradle-plugin diff --git a/jsonschema2pojo-integration-tests/pom.xml b/jsonschema2pojo-integration-tests/pom.xml index 3cc0a857b..a172bed27 100644 --- a/jsonschema2pojo-integration-tests/pom.xml +++ b/jsonschema2pojo-integration-tests/pom.xml @@ -5,7 +5,7 @@ jsonschema2pojo org.jsonschema2pojo - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT jsonschema2pojo-integration-tests @@ -191,7 +191,7 @@ org.apache.johnzon johnzon-jsonb - 1.2.19 + 1.2.21 test diff --git a/jsonschema2pojo-maven-plugin/pom.xml b/jsonschema2pojo-maven-plugin/pom.xml index 3b4580fc3..0487288b4 100644 --- a/jsonschema2pojo-maven-plugin/pom.xml +++ b/jsonschema2pojo-maven-plugin/pom.xml @@ -5,7 +5,7 @@ jsonschema2pojo org.jsonschema2pojo - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT jsonschema2pojo-maven-plugin diff --git a/pom.xml b/pom.xml index 83ff0b733..c89fc6912 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.jsonschema2pojo jsonschema2pojo - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT pom jsonschema2pojo @@ -37,7 +37,8 @@ https://github.com/joelittlejohn/jsonschema2pojo scm:git:git@github.com:joelittlejohn/jsonschema2pojo.git scm:git:git@github.com:joelittlejohn/jsonschema2pojo.git - + HEAD + @@ -50,10 +51,10 @@ UTF-8 UTF-8 5.6 - 2.10.1 + 2.11.0 1.12.0 - 2.15.2 - 2.15.2 + 2.17.2 + 2.17.2 3.8.1 @@ -102,7 +103,7 @@ maven-javadoc-plugin - 3.5.0 + 2.10.4 maven-plugin-plugin @@ -231,7 +232,7 @@ maven-javadoc-plugin - 8 + -Xdoclint:none @@ -357,13 +358,13 @@ commons-codec commons-codec - 1.15 + 1.17.1 test commons-io commons-io - 2.11.0 + 2.17.0 commons-lang @@ -373,12 +374,12 @@ org.apache.commons commons-text - 1.10.0 + 1.12.0 org.apache.commons commons-lang3 - 3.12.0 + 3.17.0 javax.annotation @@ -398,7 +399,7 @@ joda-time joda-time - 2.12.2 + 2.13.0 junit @@ -435,7 +436,7 @@ org.apache.ant ant - 1.10.13 + 1.10.15 org.apache.bval @@ -511,7 +512,7 @@ org.skyscreamer jsonassert - 1.5.1 + 1.5.3 test