chore: release 4.35.0

victools · Mar 29, 2024 · bdca6c5 · bdca6c5
1 parent 4938865
commit bdca6c5
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 55 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 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]
+## [4.35.0] - 2024-03-29
 ### `jsonschema-generator`
 #### Added
 - check for custom definitions for `void` methods (this may result in exceptions inside custom configuration if a `null` return type is not considered)
@@ -821,7 +821,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Indicate a number's "exclusiveMaximum" according to `@DecimalMax` or `@Negative`
 
 
-[Unreleased]: https://github.com/victools/jsonschema-generator/compare/v4.34.0...HEAD
+[4.35.0]: https://github.com/victools/jsonschema-generator/compare/v4.34.0...v4.35.0
 [4.34.0]: https://github.com/victools/jsonschema-generator/compare/v4.33.1...v4.34.0
 [4.33.1]: https://github.com/victools/jsonschema-generator/compare/v4.33.0...v4.33.1
 [4.33.0]: https://github.com/victools/jsonschema-generator/compare/v4.32.0...v4.33.0

diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ Additional documentation and configuration examples can be found here: https://v
 <dependency>
     <groupId>com.github.victools</groupId>
     <artifactId>jsonschema-generator</artifactId>
-    <version>4.34.0</version>
+    <version>4.35.0</version>
 </dependency>
 ```
 

diff --git a/jsonschema-examples/pom.xml b/jsonschema-examples/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.victools</groupId>
         <artifactId>jsonschema-generator-parent</artifactId>
-        <version>4.35.0-SNAPSHOT</version>
+        <version>4.35.0</version>
         <relativePath>../jsonschema-generator-parent/pom.xml</relativePath>
     </parent>
     <artifactId>jsonschema-examples</artifactId>

diff --git a/...s/src/main/java/com/github/victools/jsonschema/examples/ExternalRefAnnotationExample.java b/...s/src/main/java/com/github/victools/jsonschema/examples/ExternalRefAnnotationExample.java
@@ -59,7 +59,7 @@ public ObjectNode generateSchema() {
         return generator.generateSchema(Example.class);
     }
 
-    private static class SchemaRefDefinitionProvider implements CustomDefinitionProviderV2 {
+    private static final class SchemaRefDefinitionProvider implements CustomDefinitionProviderV2 {
 
         private Class<?> mainType;
 

diff --git a/.../src/main/java/com/github/victools/jsonschema/examples/ValidationErrorMessageExample.java b/.../src/main/java/com/github/victools/jsonschema/examples/ValidationErrorMessageExample.java
@@ -60,13 +60,13 @@ public ObjectNode generateSchema() {
 
     private <M extends MemberScope<?, ?>> void includeMessageAttribute(ObjectNode collectedMemberAttributes, M member,
                 SchemaGenerationContext context) {
-        Map<SchemaKeyword, String> validationMessages = new HashMap<>();
-        NotNull notNullAnnotation = this.getAnnotation(member, NotNull.class);
-        NotEmpty notEmptyAnnotation = this.getAnnotation(member, NotEmpty.class);
-        NotBlank notBlankAnnotation = this.getAnnotation(member, NotBlank.class);
-        Size sizeAnnotation = this.getAnnotation(member, Size.class);
-        Min minAnnotation = this.getAnnotation(member, Min.class);
-        Max maxAnnotation = this.getAnnotation(member, Max.class);
+        final Map<SchemaKeyword, String> validationMessages = new HashMap<>();
+        final NotNull notNullAnnotation = this.getAnnotation(member, NotNull.class);
+        final NotEmpty notEmptyAnnotation = this.getAnnotation(member, NotEmpty.class);
+        final NotBlank notBlankAnnotation = this.getAnnotation(member, NotBlank.class);
+        final Size sizeAnnotation = this.getAnnotation(member, Size.class);
+        final Min minAnnotation = this.getAnnotation(member, Min.class);
+        final Max maxAnnotation = this.getAnnotation(member, Max.class);
 
         if (!member.isFakeContainerItemScope()) {
             if (notNullAnnotation != null) {

diff --git a/jsonschema-generator-bom/pom.xml b/jsonschema-generator-bom/pom.xml
@@ -8,7 +8,7 @@
 
     <groupId>com.github.victools</groupId>
     <artifactId>jsonschema-generator-bom</artifactId>
-    <version>4.35.0-SNAPSHOT</version>
+    <version>4.35.0</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -26,7 +26,7 @@
         <connection>scm:git:https://github.com/victools/jsonschema-generator.git</connection>
         <developerConnection>scm:git:https://github.com/victools/jsonschema-generator.git</developerConnection>
         <url>https://github.com/victools/jsonschema-generator</url>
-        <tag>HEAD</tag>
+        <tag>v4.35.0</tag>
     </scm>
 
     <organization>

diff --git a/jsonschema-generator-parent/pom.xml b/jsonschema-generator-parent/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.github.victools</groupId>
         <artifactId>jsonschema-generator-bom</artifactId>
-        <version>4.35.0-SNAPSHOT</version>
+        <version>4.35.0</version>
         <relativePath>../jsonschema-generator-bom/pom.xml</relativePath>
     </parent>
     <artifactId>jsonschema-generator-parent</artifactId>
@@ -132,19 +132,19 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <file.encoding>UTF-8</file.encoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <!-- maven plugins -->
-        <maven.plugin.version.checkstyle>3.2.0</maven.plugin.version.checkstyle>
-        <version.checkstyle>9.3</version.checkstyle>
+        <maven.plugin.version.checkstyle>3.3.1</maven.plugin.version.checkstyle>
+        <version.checkstyle>10.14.1</version.checkstyle>
         <maven.plugin.version.compiler>3.10.1</maven.plugin.version.compiler>
         <maven.plugin.version.enforcer>3.2.1</maven.plugin.version.enforcer>
-        <maven.plugin.version.jacoco>0.8.8</maven.plugin.version.jacoco>
-        <maven.plugin.version.javadoc>3.4.1</maven.plugin.version.javadoc>
+        <maven.plugin.version.javadoc>3.6.3</maven.plugin.version.javadoc>
         <maven.plugin.version.moditect>1.0.0.RC3</maven.plugin.version.moditect>
         <maven.plugin.version.release>2.5.3</maven.plugin.version.release>
         <maven.plugin.version.source>3.2.1</maven.plugin.version.source>
-        <maven.plugin.version.surefire>3.0.0-M7</maven.plugin.version.surefire>
+        <maven.plugin.version.surefire>3.2.5</maven.plugin.version.surefire>
 
         <java.module.name>undefined</java.module.name>
 
@@ -314,32 +314,6 @@
                         </dependency>
                     </dependencies>
                 </plugin>
-                <plugin>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>${maven.plugin.version.jacoco}</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>prepare-agent</goal>
-                            </goals>
-                        </execution>
-                        <execution>
-                            <id>report</id>
-                            <phase>test</phase>
-                            <goals>
-                                <goal>report</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                    <dependencies>
-                        <dependency>
-                            <groupId>commons-collections</groupId>
-                            <artifactId>commons-collections</artifactId>
-                            <version>3.2.2</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
@@ -371,7 +345,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>$maven.plugin.version.release{}</version>
+                    <version>${maven.plugin.version.release}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.moditect</groupId>

diff --git a/jsonschema-generator/pom.xml b/jsonschema-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.victools</groupId>
         <artifactId>jsonschema-generator-parent</artifactId>
-        <version>4.35.0-SNAPSHOT</version>
+        <version>4.35.0</version>
         <relativePath>../jsonschema-generator-parent/pom.xml</relativePath>
     </parent>
     <artifactId>jsonschema-generator</artifactId>

diff --git a/jsonschema-maven-plugin/pom.xml b/jsonschema-maven-plugin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.victools</groupId>
         <artifactId>jsonschema-generator-parent</artifactId>
-        <version>4.35.0-SNAPSHOT</version>
+        <version>4.35.0</version>
         <relativePath>../jsonschema-generator-parent/pom.xml</relativePath>
     </parent>
     <artifactId>jsonschema-maven-plugin</artifactId>

diff --git a/jsonschema-module-jackson/pom.xml b/jsonschema-module-jackson/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.victools</groupId>
         <artifactId>jsonschema-generator-parent</artifactId>
-        <version>4.35.0-SNAPSHOT</version>
+        <version>4.35.0</version>
         <relativePath>../jsonschema-generator-parent/pom.xml</relativePath>
     </parent>
     <artifactId>jsonschema-module-jackson</artifactId>

diff --git a/jsonschema-module-jakarta-validation/pom.xml b/jsonschema-module-jakarta-validation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.victools</groupId>
         <artifactId>jsonschema-generator-parent</artifactId>
-        <version>4.35.0-SNAPSHOT</version>
+        <version>4.35.0</version>
         <relativePath>../jsonschema-generator-parent/pom.xml</relativePath>
     </parent>
     <artifactId>jsonschema-module-jakarta-validation</artifactId>

diff --git a/jsonschema-module-javax-validation/pom.xml b/jsonschema-module-javax-validation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.victools</groupId>
         <artifactId>jsonschema-generator-parent</artifactId>
-        <version>4.35.0-SNAPSHOT</version>
+        <version>4.35.0</version>
         <relativePath>../jsonschema-generator-parent/pom.xml</relativePath>
     </parent>
     <artifactId>jsonschema-module-javax-validation</artifactId>

diff --git a/jsonschema-module-swagger-1.5/pom.xml b/jsonschema-module-swagger-1.5/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.victools</groupId>
         <artifactId>jsonschema-generator-parent</artifactId>
-        <version>4.35.0-SNAPSHOT</version>
+        <version>4.35.0</version>
         <relativePath>../jsonschema-generator-parent/pom.xml</relativePath>
     </parent>
     <artifactId>jsonschema-module-swagger-1.5</artifactId>

diff --git a/jsonschema-module-swagger-2/pom.xml b/jsonschema-module-swagger-2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.victools</groupId>
         <artifactId>jsonschema-generator-parent</artifactId>
-        <version>4.35.0-SNAPSHOT</version>
+        <version>4.35.0</version>
         <relativePath>../jsonschema-generator-parent/pom.xml</relativePath>
     </parent>
     <artifactId>jsonschema-module-swagger-2</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>com.github.victools</groupId>
     <artifactId>jsonschema-generator-reactor</artifactId>
-    <version>4.35.0-SNAPSHOT</version>
+    <version>4.35.0</version>
     <packaging>pom</packaging>
 
     <name>Java JSON Schema Generator (Reactor)</name>