Skip to content

Commit 78ae92c

Browse files
CarstenWicknerCarstenWickner
authored
chore(deps): Update various dependencies (#557)
1 parent d96e071 commit 78ae92c

12 files changed

Lines changed: 54 additions & 39 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
### `jsonschema-generator`
9+
#### Changed
10+
- BREAKING CHANGE: minimum Java version `17`
11+
- BREAKING CHANGE: minimum Jackson version `3.x`
12+
813
### `jsonschema-module-jackson`
914
#### Fixed
1015
- support `@JacksonAnnotationsInside` annotated combo annotations also when looking for `@JsonPropertyDescription`

‎checkstyle.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@
187187
value="Method name ''{0}'' must match pattern ''{1}''." />
188188
</module>
189189
<module name="JavadocVariable">
190-
<property name="ignoreNamePattern" value="^[A-Z_]+$" />
191-
<property name="excludeScope" value="private"/>
190+
<property name="ignoreNamePattern" value="^[A-Z_0-9]+$" />
191+
<property name="accessModifiers" value="public,protected,package"/>
192192
</module>
193193
<module name="SingleLineJavadoc" />
194194
<module name="RequireThis" />

‎jsonschema-examples/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,6 @@
7676
<plugin>
7777
<artifactId>maven-compiler-plugin</artifactId>
7878
</plugin>
79-
<plugin>
80-
<artifactId>maven-checkstyle-plugin</artifactId>
81-
</plugin>
8279
<plugin>
8380
<artifactId>maven-surefire-plugin</artifactId>
8481
</plugin>

‎jsonschema-generator-parent/pom.xml‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,13 @@
137137
<role>Provided PR #487 (support @JacksonAnnotationsInside annotations)</role>
138138
</roles>
139139
</contributor>
140+
<contributor>
141+
<name>Filip Hrisafov</name>
142+
<url>https://github.com/filiphr</url>
143+
<roles>
144+
<role>Provided PR #556 (Migration from Jackson 2.x to 3.x)</role>
145+
</roles>
146+
</contributor>
140147
</contributors>
141148

142149
<properties>
@@ -146,34 +153,34 @@
146153
<maven.compiler.target>17</maven.compiler.target>
147154
<!-- maven plugins -->
148155
<maven.plugin.version.checkstyle>3.6.0</maven.plugin.version.checkstyle>
149-
<version.checkstyle>10.19.0</version.checkstyle>
150-
<maven.plugin.version.compiler>3.13.0</maven.plugin.version.compiler>
151-
<maven.plugin.version.enforcer>3.5.0</maven.plugin.version.enforcer>
152-
<maven.plugin.version.javadoc>3.10.1</maven.plugin.version.javadoc>
153-
<maven.plugin.version.moditect>1.2.2.Final</maven.plugin.version.moditect>
154-
<maven.plugin.version.release>2.5.3</maven.plugin.version.release>
155-
<maven.plugin.version.source>3.3.1</maven.plugin.version.source>
156-
<maven.plugin.version.surefire>3.5.1</maven.plugin.version.surefire>
156+
<version.checkstyle>12.3.0</version.checkstyle>
157+
<maven.plugin.version.compiler>3.14.1</maven.plugin.version.compiler>
158+
<maven.plugin.version.enforcer>3.6.2</maven.plugin.version.enforcer>
159+
<maven.plugin.version.javadoc>3.12.0</maven.plugin.version.javadoc>
160+
<maven.plugin.version.moditect>1.3.0.Final</maven.plugin.version.moditect>
161+
<maven.plugin.version.release>3.3.1</maven.plugin.version.release>
162+
<maven.plugin.version.source>3.4.0</maven.plugin.version.source>
163+
<maven.plugin.version.surefire>3.5.4</maven.plugin.version.surefire>
157164

158165
<java.module.name>undefined</java.module.name>
159166

160167
<!-- included dependencies -->
161-
<version.classmate>1.7.0</version.classmate>
168+
<version.classmate>1.7.2</version.classmate>
162169
<version.jackson>3.0.3</version.jackson>
163-
<version.slf4j>2.0.16</version.slf4j>
170+
<version.slf4j>2.0.17</version.slf4j>
164171
<!-- test dependencies -->
165172
<version.jsonassert>1.5.3</version.jsonassert>
166-
<version.junit>5.11.3</version.junit>
167-
<version.logback>1.5.12</version.logback>
173+
<version.junit>5.14.0</version.junit>
174+
<version.logback>1.5.23</version.logback>
168175
<version.mockito>4.11.0</version.mockito>
169176
<version.validator>3.0.0</version.validator>
170177
<!-- provided module dependencies -->
171-
<version.jakarta.validation>3.1.0</version.jakarta.validation>
178+
<version.jakarta.validation>3.1.1</version.jakarta.validation>
172179
<version.javax.validation>2.0.1.Final</version.javax.validation>
173-
<version.swagger-1.5>1.6.14</version.swagger-1.5>
174-
<version.swagger-2>2.2.25</version.swagger-2>
180+
<version.swagger-1.5>1.6.16</version.swagger-1.5>
181+
<version.swagger-2>2.2.41</version.swagger-2>
175182
<!-- maven plugin runtime dependencies -->
176-
<version.classgraph>4.8.177</version.classgraph>
183+
<version.classgraph>4.8.184</version.classgraph>
177184
</properties>
178185

179186
<dependencyManagement>
@@ -267,7 +274,7 @@
267274
<scope>test</scope>
268275
<exclusions>
269276
<exclusion>
270-
<groupId>com.fasterxml.jackson.core</groupId>
277+
<groupId>tools.jackson.core</groupId>
271278
<artifactId>jackson-databind</artifactId>
272279
</exclusion>
273280
<exclusion>
@@ -368,7 +375,7 @@
368375
<goal>add-module-info</goal>
369376
</goals>
370377
<configuration>
371-
<jvmVersion>9</jvmVersion>
378+
<jvmVersion>17</jvmVersion>
372379
<overwriteExistingFiles>true</overwriteExistingFiles>
373380
<module>
374381
<moduleInfo>
@@ -380,7 +387,7 @@
380387
</moduleInfo>
381388
</module>
382389
<jdepsExtraArgs>
383-
<arg>--multi-release=9</arg>
390+
<arg>--multi-release=17</arg>
384391
</jdepsExtraArgs>
385392
</configuration>
386393
</execution>
@@ -403,7 +410,7 @@
403410
<configuration>
404411
<rules>
405412
<requireJavaVersion>
406-
<version>[11,)</version>
413+
<version>[17,)</version>
407414
</requireJavaVersion>
408415
</rules>
409416
</configuration>

‎jsonschema-generator/src/main/java/com/github/victools/jsonschema/generator/SchemaBuilder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,9 +388,9 @@ private void collectReferenceKeysFromGroup(Map<DefinitionKey, String> referenceK
388388
*/
389389
private boolean areDefinitionKeysDistinct(DefinitionKey mainSchemaKey, List<DefinitionKey> definitionKeys) {
390390
return definitionKeys.size() == 1
391-
|| (definitionKeys.size() == 2
392-
&& !this.config.shouldCreateDefinitionForMainSchema()
393-
&& definitionKeys.contains(mainSchemaKey));
391+
|| (definitionKeys.size() == 2
392+
&& !this.config.shouldCreateDefinitionForMainSchema()
393+
&& definitionKeys.contains(mainSchemaKey));
394394
}
395395

396396
/**

‎jsonschema-generator/src/main/java/com/github/victools/jsonschema/generator/impl/AttributeCollector.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,8 +500,8 @@ public AttributeCollector setAdditionalProperties(ObjectNode node, JsonNode addi
500500

501501
private boolean isNullOrTrue(JsonNode nodeToCheck) {
502502
return nodeToCheck == null
503-
|| nodeToCheck.isNull()
504-
|| nodeToCheck.isBoolean() && nodeToCheck.asBoolean();
503+
|| nodeToCheck.isNull()
504+
|| nodeToCheck.isBoolean() && nodeToCheck.asBoolean();
505505
}
506506

507507
/**

‎jsonschema-generator/src/main/java/com/github/victools/jsonschema/generator/impl/SchemaGenerationContextImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ private void traverseGenericType(ObjectNode targetNode, GenericTypeDetails typeD
322322

323323
private boolean shouldAddReferenceForExistingDefinition(GenericTypeDetails typeDetails) {
324324
return !typeDetails.isInlineDefinition()
325-
&& this.containsDefinition(typeDetails.getScope().getType(), typeDetails.getIgnoredDefinitionProvider());
325+
&& this.containsDefinition(typeDetails.getScope().getType(), typeDetails.getIgnoredDefinitionProvider());
326326
}
327327

328328
private Map.Entry<ObjectNode, Boolean> applyCustomDefinition(CustomDefinition customDefinition, ObjectNode targetNode,

‎jsonschema-generator/src/main/java/com/github/victools/jsonschema/generator/impl/Util.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,6 @@ public static boolean nullSafeEquals(Object one, Object other) {
108108
return false;
109109
}
110110
return one.hashCode() == other.hashCode()
111-
&& one.equals(other);
111+
&& one.equals(other);
112112
}
113113
}

‎jsonschema-generator/src/main/java/com/github/victools/jsonschema/generator/impl/module/SimpleTypeModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ private Map<String, Type> resolvePatternProperties(TypeScope scope) {
284284

285285
private boolean shouldHaveEmptySchema(TypeScope scope) {
286286
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());
288288
}
289289

290290
/**

‎jsonschema-generator/src/test/java/com/github/victools/jsonschema/generator/MemberScopeTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void testContainerType(String methodName, boolean isContainerType, Class<
8787
static Stream<Arguments> parametersForTestTypeDescription() {
8888
return Stream.of(
8989
Arguments.of("getStringArray", "String[]", "java.lang.String[]"),
90-
Arguments.of("getRawCollection", "Collection", "java.util.Collection"),
90+
Arguments.of("getRawCollection", "Collection<Object>", "java.util.Collection<java.lang.Object>"),
9191
Arguments.of("getListOfIntArrays", "List<int[]>", "java.util.List<int[]>"),
9292
Arguments.of("getMapWithNestedGenerics", "Map<String, Map<String, List<Set<Class<Object>>>>>",
9393
"java.util.Map<java.lang.String, java.util.Map<java.lang.String, java.util.List<java.util.Set<java.lang.Class<java.lang.Object>>>>>"),

0 commit comments

Comments
 (0)