chore: bump jsonschema-generator dependency to 4.7.0 (#5)

Author: CarstenWickner

pom.xml

@@ -8,7 +8,7 @@
 
     <groupId>com.github.victools</groupId>
     <artifactId>jsonschema-module-javax-validation</artifactId>
-    <version>4.4.0</version>
+    <version>4.7.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <licenses>
@@ -27,7 +27,7 @@
         <connection>scm:git:ssh://github.com/victools/jsonschema-module-javax-validation.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/victools/jsonschema-module-javax-validation.git</developerConnection>
         <url>https://github.com/victools/jsonschema-module-javax-validation</url>
-        <tag>v4.4.0</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <organization>
@@ -58,7 +58,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
 
-        <version.generator>4.4.0</version.generator>
+        <version.generator>4.7.0</version.generator>
 
         <version.javax.validation>2.0.1.Final</version.javax.validation>
 
@@ -68,10 +68,6 @@
         <version.mockito>2.27.0</version.mockito>
     </properties>
 
-    <prerequisites>
-        <maven>3.5</maven>
-    </prerequisites>
-
     <dependencies>
         <dependency>
             <groupId>com.github.victools</groupId>
@@ -114,6 +110,13 @@
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <showDeprecation>true</showDeprecation>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <version>3.0.0</version>

src/main/java/com/github/victools/jsonschema/module/javax/validation/JavaxValidationModule.java

@@ -143,18 +143,7 @@ private void applyToConfigPart(SchemaGeneratorConfigPart<?> configPart) {
      */
     protected <A extends Annotation> A getAnnotationFromFieldOrGetter(MemberScope<?, ?> member, Class<A> annotationClass,
             Function<A, Class<?>[]> validationGroupsLookup) {
-        A annotation = member.getAnnotation(annotationClass);
-        if (annotation == null) {
-            MemberScope<?, ?> associatedGetterOrField;
-            if (member instanceof FieldScope) {
-                associatedGetterOrField = ((FieldScope) member).findGetter();
-            } else if (member instanceof MethodScope) {
-                associatedGetterOrField = ((MethodScope) member).findGetterField();
-            } else {
-                associatedGetterOrField = null;
-            }
-            annotation = associatedGetterOrField == null ? null : associatedGetterOrField.getAnnotation(annotationClass);
-        }
+        A annotation = member.getAnnotationConsideringFieldAndGetter(annotationClass);
         if (annotation != null) {
             Class<?>[] associatedGroups = validationGroupsLookup.apply(annotation);
             /*

src/test/java/com/github/victools/jsonschema/module/javax/validation/IntegrationTest.java

@@ -21,6 +21,7 @@
 import com.github.victools.jsonschema.generator.SchemaGenerator;
 import com.github.victools.jsonschema.generator.SchemaGeneratorConfig;
 import com.github.victools.jsonschema.generator.SchemaGeneratorConfigBuilder;
+import com.github.victools.jsonschema.generator.SchemaVersion;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -58,7 +59,7 @@ public void testIntegration() throws Exception {
                 JavaxValidationOption.NOT_NULLABLE_FIELD_IS_REQUIRED,
                 JavaxValidationOption.NOT_NULLABLE_METHOD_IS_REQUIRED,
                 JavaxValidationOption.INCLUDE_PATTERN_EXPRESSIONS);
-        SchemaGeneratorConfig config = new SchemaGeneratorConfigBuilder(new ObjectMapper())
+        SchemaGeneratorConfig config = new SchemaGeneratorConfigBuilder(new ObjectMapper(), SchemaVersion.DRAFT_2019_09)
                 .with(module)
                 .build();
         SchemaGenerator generator = new SchemaGenerator(config);