chore(deps): Update various dependencies (#557)

CarstenWickner · web-flow · commit 78ae92c6646d · 2025-12-30T15:24:28.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### `jsonschema-generator`
+#### Changed
+- BREAKING CHANGE: minimum Java version `17`
+- BREAKING CHANGE: minimum Jackson version `3.x`
+
 ### `jsonschema-module-jackson`
 #### Fixed
 - support `@JacksonAnnotationsInside` annotated combo annotations also when looking for `@JsonPropertyDescription`  
diff --git a/checkstyle.xml b/checkstyle.xml
@@ -187,8 +187,8 @@
                 value="Method name ''{0}'' must match pattern ''{1}''." />
         </module>
         <module name="JavadocVariable">
-            <property name="ignoreNamePattern" value="^[A-Z_]+$" />
-            <property name="excludeScope" value="private"/>
+            <property name="ignoreNamePattern" value="^[A-Z_0-9]+$" />
+            <property name="accessModifiers" value="public,protected,package"/>
         </module>
         <module name="SingleLineJavadoc" />
         <module name="RequireThis" />
diff --git a/jsonschema-examples/pom.xml b/jsonschema-examples/pom.xml
@@ -76,9 +76,6 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
-            <plugin>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
diff --git a/jsonschema-generator-parent/pom.xml b/jsonschema-generator-parent/pom.xml
@@ -137,6 +137,13 @@
                 <role>Provided PR #487 (support @JacksonAnnotationsInside annotations)</role>
             </roles>
         </contributor>
+        <contributor>
+            <name>Filip Hrisafov</name>
+            <url>https://github.com/filiphr</url>
+            <roles>
+                <role>Provided PR #556 (Migration from Jackson 2.x to 3.x)</role>
+            </roles>
+        </contributor>
     </contributors>
 
     <properties>
@@ -146,34 +153,34 @@
         <maven.compiler.target>17</maven.compiler.target>
         <!-- maven plugins -->
         <maven.plugin.version.checkstyle>3.6.0</maven.plugin.version.checkstyle>
-        <version.checkstyle>10.19.0</version.checkstyle>
-        <maven.plugin.version.compiler>3.13.0</maven.plugin.version.compiler>
-        <maven.plugin.version.enforcer>3.5.0</maven.plugin.version.enforcer>
-        <maven.plugin.version.javadoc>3.10.1</maven.plugin.version.javadoc>
-        <maven.plugin.version.moditect>1.2.2.Final</maven.plugin.version.moditect>
-        <maven.plugin.version.release>2.5.3</maven.plugin.version.release>
-        <maven.plugin.version.source>3.3.1</maven.plugin.version.source>
-        <maven.plugin.version.surefire>3.5.1</maven.plugin.version.surefire>
+        <version.checkstyle>12.3.0</version.checkstyle>
+        <maven.plugin.version.compiler>3.14.1</maven.plugin.version.compiler>
+        <maven.plugin.version.enforcer>3.6.2</maven.plugin.version.enforcer>
+        <maven.plugin.version.javadoc>3.12.0</maven.plugin.version.javadoc>
+        <maven.plugin.version.moditect>1.3.0.Final</maven.plugin.version.moditect>
+        <maven.plugin.version.release>3.3.1</maven.plugin.version.release>
+        <maven.plugin.version.source>3.4.0</maven.plugin.version.source>
+        <maven.plugin.version.surefire>3.5.4</maven.plugin.version.surefire>
 
         <java.module.name>undefined</java.module.name>
 
         <!-- included dependencies -->
-        <version.classmate>1.7.0</version.classmate>
+        <version.classmate>1.7.2</version.classmate>
         <version.jackson>3.0.3</version.jackson>
-        <version.slf4j>2.0.16</version.slf4j>
+        <version.slf4j>2.0.17</version.slf4j>
         <!-- test dependencies -->
         <version.jsonassert>1.5.3</version.jsonassert>
-        <version.junit>5.11.3</version.junit>
-        <version.logback>1.5.12</version.logback>
+        <version.junit>5.14.0</version.junit>
+        <version.logback>1.5.23</version.logback>
         <version.mockito>4.11.0</version.mockito>
         <version.validator>3.0.0</version.validator>
         <!-- provided module dependencies -->
-        <version.jakarta.validation>3.1.0</version.jakarta.validation>
+        <version.jakarta.validation>3.1.1</version.jakarta.validation>
         <version.javax.validation>2.0.1.Final</version.javax.validation>
-        <version.swagger-1.5>1.6.14</version.swagger-1.5>
-        <version.swagger-2>2.2.25</version.swagger-2>
+        <version.swagger-1.5>1.6.16</version.swagger-1.5>
+        <version.swagger-2>2.2.41</version.swagger-2>
         <!-- maven plugin runtime dependencies -->
-        <version.classgraph>4.8.177</version.classgraph>
+        <version.classgraph>4.8.184</version.classgraph>
     </properties>
 
     <dependencyManagement>
@@ -267,7 +274,7 @@
             <scope>test</scope>
             <exclusions>
                 <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <groupId>tools.jackson.core</groupId>
                     <artifactId>jackson-databind</artifactId>
                 </exclusion>
                 <exclusion>
@@ -368,7 +375,7 @@
                                 <goal>add-module-info</goal>
                             </goals>
                             <configuration>
-                                <jvmVersion>9</jvmVersion>
+                                <jvmVersion>17</jvmVersion>
                                 <overwriteExistingFiles>true</overwriteExistingFiles>
                                 <module>
                                     <moduleInfo>
@@ -380,7 +387,7 @@
                                     </moduleInfo>
                                 </module>
                                 <jdepsExtraArgs>
-                                    <arg>--multi-release=9</arg>
+                                    <arg>--multi-release=17</arg>
                                 </jdepsExtraArgs>
                             </configuration>
                         </execution>
@@ -403,7 +410,7 @@
                         <configuration>
                             <rules>
                                 <requireJavaVersion>
-                                    <version>[11,)</version>
+                                    <version>[17,)</version>
                                 </requireJavaVersion>
                             </rules>
                         </configuration>
diff --git a/jsonschema-generator/src/main/java/com/github/victools/jsonschema/generator/SchemaBuilder.java b/jsonschema-generator/src/main/java/com/github/victools/jsonschema/generator/SchemaBuilder.java
@@ -388,9 +388,9 @@ private void collectReferenceKeysFromGroup(Map<DefinitionKey, String> referenceK
      */
     private boolean areDefinitionKeysDistinct(DefinitionKey mainSchemaKey, List<DefinitionKey> definitionKeys) {
         return definitionKeys.size() == 1
-               || (definitionKeys.size() == 2
-                   && !this.config.shouldCreateDefinitionForMainSchema()
-                   && definitionKeys.contains(mainSchemaKey));
+                || (definitionKeys.size() == 2
+                    && !this.config.shouldCreateDefinitionForMainSchema()
+                    && definitionKeys.contains(mainSchemaKey));
     }
 
     /**
diff --git a/jsonschema-generator/src/main/java/com/github/victools/jsonschema/generator/impl/AttributeCollector.java b/jsonschema-generator/src/main/java/com/github/victools/jsonschema/generator/impl/AttributeCollector.java
@@ -500,8 +500,8 @@ public AttributeCollector setAdditionalProperties(ObjectNode node, JsonNode addi
 
     private boolean isNullOrTrue(JsonNode nodeToCheck) {
         return nodeToCheck == null
-               || nodeToCheck.isNull()
-               || nodeToCheck.isBoolean() && nodeToCheck.asBoolean();
+                || nodeToCheck.isNull()
+                || nodeToCheck.isBoolean() && nodeToCheck.asBoolean();
     }
 
     /**
diff --git a/jsonschema-generator/src/main/java/com/github/victools/jsonschema/generator/impl/SchemaGenerationContextImpl.java b/jsonschema-generator/src/main/java/com/github/victools/jsonschema/generator/impl/SchemaGenerationContextImpl.java
@@ -322,7 +322,7 @@ private void traverseGenericType(ObjectNode targetNode, GenericTypeDetails typeD
 
     private boolean shouldAddReferenceForExistingDefinition(GenericTypeDetails typeDetails) {
         return !typeDetails.isInlineDefinition()
-               && this.containsDefinition(typeDetails.getScope().getType(), typeDetails.getIgnoredDefinitionProvider());
+                && this.containsDefinition(typeDetails.getScope().getType(), typeDetails.getIgnoredDefinitionProvider());
     }
 
     private Map.Entry<ObjectNode, Boolean> applyCustomDefinition(CustomDefinition customDefinition, ObjectNode targetNode,
diff --git a/jsonschema-generator/src/main/java/com/github/victools/jsonschema/generator/impl/Util.java b/jsonschema-generator/src/main/java/com/github/victools/jsonschema/generator/impl/Util.java
@@ -108,6 +108,6 @@ public static boolean nullSafeEquals(Object one, Object other) {
             return false;
         }
         return one.hashCode() == other.hashCode()
-               && one.equals(other);
+                && one.equals(other);
     }
 }
diff --git a/jsonschema-generator/src/main/java/com/github/victools/jsonschema/generator/impl/module/SimpleTypeModule.java b/jsonschema-generator/src/main/java/com/github/victools/jsonschema/generator/impl/module/SimpleTypeModule.java
@@ -284,7 +284,7 @@ private Map<String, Type> resolvePatternProperties(TypeScope scope) {
 
     private boolean shouldHaveEmptySchema(TypeScope scope) {
         return scope.getType() == null
-               || SchemaKeyword.TAG_TYPE_NULL == this.fixedJsonSchemaTypes.get(scope.getType().getErasedType());
+                || SchemaKeyword.TAG_TYPE_NULL == this.fixedJsonSchemaTypes.get(scope.getType().getErasedType());
     }
 
     /**
diff --git a/jsonschema-generator/src/test/java/com/github/victools/jsonschema/generator/MemberScopeTest.java b/jsonschema-generator/src/test/java/com/github/victools/jsonschema/generator/MemberScopeTest.java
@@ -87,7 +87,7 @@ public void testContainerType(String methodName, boolean isContainerType, Class<
     static Stream<Arguments> parametersForTestTypeDescription() {
         return Stream.of(
             Arguments.of("getStringArray", "String[]", "java.lang.String[]"),
-            Arguments.of("getRawCollection", "Collection", "java.util.Collection"),
+            Arguments.of("getRawCollection", "Collection<Object>", "java.util.Collection<java.lang.Object>"),
             Arguments.of("getListOfIntArrays", "List<int[]>", "java.util.List<int[]>"),
             Arguments.of("getMapWithNestedGenerics", "Map<String, Map<String, List<Set<Class<Object>>>>>",
                 "java.util.Map<java.lang.String, java.util.Map<java.lang.String, java.util.List<java.util.Set<java.lang.Class<java.lang.Object>>>>>"),
diff --git a/jsonschema-generator/src/test/resources/com/github/victools/jsonschema/generator/testclass2-array.json b/jsonschema-generator/src/test/resources/com/github/victools/jsonschema/generator/testclass2-array.json
@@ -1,7 +1,7 @@
 {
     "$ref": "#/definitions/TestClass2...",
     "definitions": {
-        "TestClass2": {
+        "TestClass2_Object_": {
             "type": "object",
             "properties": {
                 "genericArray": {
@@ -14,7 +14,7 @@
         "TestClass2...": {
             "type": "array",
             "items": {
-                "$ref": "#/definitions/TestClass2"
+                "$ref": "#/definitions/TestClass2_Object_"
             }
         }
     }
diff --git a/jsonschema-maven-plugin/src/main/java/com/github/victools/jsonschema/plugin/maven/GeneratorOptions.java b/jsonschema-maven-plugin/src/main/java/com/github/victools/jsonschema/plugin/maven/GeneratorOptions.java
@@ -23,12 +23,18 @@
  */
 public class GeneratorOptions {
 
-    // The preset options
+    /**
+     * The options preset/template to use as the basis, for including some standard options.
+     */
     public StandardOptionPreset preset;
 
-    // The options of the generator that should be enabled
+    /**
+     * The options of the generator that should be enabled (in addition to the ones defined in the {@code preset}).
+     */
     public Option[] enabled;
 
-    // The options of the generator that should be disabled
+    /**
+     * The options of the generator that should be disabled (i.e., excluding some of the {@code preset}'s standard options).
+     */
     public Option[] disabled;
 }

Original file line number	Diff line number	Diff line change
`@@ -500,8 +500,8 @@ public AttributeCollector setAdditionalProperties(ObjectNode node, JsonNode addi`
`500`	`500`
`501`	`501`	`private boolean isNullOrTrue(JsonNode nodeToCheck) {`
`502`	`502`	`return nodeToCheck == null`
`503`		`- \|\| nodeToCheck.isNull()`
`504`		`- \|\| nodeToCheck.isBoolean() && nodeToCheck.asBoolean();`
	`503`	`+ \|\| nodeToCheck.isNull()`
	`504`	`+ \|\| nodeToCheck.isBoolean() && nodeToCheck.asBoolean();`
`505`	`505`	`}`
`506`	`506`
`507`	`507`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ private void traverseGenericType(ObjectNode targetNode, GenericTypeDetails typeD`
`322`	`322`
`323`	`323`	`private boolean shouldAddReferenceForExistingDefinition(GenericTypeDetails typeDetails) {`
`324`	`324`	`return !typeDetails.isInlineDefinition()`
`325`		`- && this.containsDefinition(typeDetails.getScope().getType(), typeDetails.getIgnoredDefinitionProvider());`
	`325`	`+ && this.containsDefinition(typeDetails.getScope().getType(), typeDetails.getIgnoredDefinitionProvider());`
`326`	`326`	`}`
`327`	`327`
`328`	`328`	`private Map.Entry<ObjectNode, Boolean> applyCustomDefinition(CustomDefinition customDefinition, ObjectNode targetNode,`
Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,6 @@ public static boolean nullSafeEquals(Object one, Object other) {`
`108`	`108`	`return false;`
`109`	`109`	`}`
`110`	`110`	`return one.hashCode() == other.hashCode()`
`111`		`- && one.equals(other);`
	`111`	`+ && one.equals(other);`
`112`	`112`	`}`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ private Map<String, Type> resolvePatternProperties(TypeScope scope) {`
`284`	`284`
`285`	`285`	`private boolean shouldHaveEmptySchema(TypeScope scope) {`
`286`	`286`	`return scope.getType() == null`
`287`		`- \|\| SchemaKeyword.TAG_TYPE_NULL == this.fixedJsonSchemaTypes.get(scope.getType().getErasedType());`
	`287`	`+ \|\| SchemaKeyword.TAG_TYPE_NULL == this.fixedJsonSchemaTypes.get(scope.getType().getErasedType());`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`/**`