Skip non-existing base directory and other updates.

pom.xml

@@ -41,7 +41,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <java.version>1.8</java.version>
     <json-schema-validator-version>2.2.14</json-schema-validator-version>
-    <jackson-version>2.11.2</jackson-version>
+    <jackson-version>2.13.3</jackson-version>
   </properties>
 
   <dependencies>
@@ -59,7 +59,18 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.3.0</version>
+      <version>3.4.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-shared-utils</artifactId>
+      <version>3.3.4</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-compat</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -83,7 +94,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.7.30</version>
+      <version>1.7.36</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -100,10 +111,15 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.7.0</version>
+        <version>5.8.2</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-classworlds</artifactId>
+        <version>2.6.0</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -113,7 +129,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.1</version>
+          <version>3.10.1</version>
           <configuration>
             <source>${java.version}</source>
             <target>${java.version}</target>
@@ -122,7 +138,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.0.0-M5</version>
+          <version>3.0.0-M7</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -154,7 +170,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>3.2.1</version>
+        <version>3.3.0</version>
         <executions>
           <execution>
             <id>integration-test</id>
@@ -205,7 +221,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M3</version>
+        <version>3.0.0</version>
         <executions>
           <execution>
             <id>enforce-versions</id>
@@ -251,5 +267,22 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>java9+</id>
+      <activation>
+        <jdk>[9,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <release>8</release>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>

src/it/skip-nonexisting-basedir/invoker.properties

@@ -0,0 +1 @@
+invoker.buildResult = success

src/it/skip-nonexisting-basedir/pom.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.github.sylvainlaurent.maven.it</groupId>
+  <artifactId>validate-it</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>@project.artifactId@</artifactId>
+        <version>@project.version@</version>
+        <executions>
+          <execution>
+            <id>validate</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>validate</goal>
+            </goals>
+            <configuration>
+              <validationSets>
+                <validationSet>
+                  <baseDir>${project.basedir}/doesnotexist</baseDir>
+                  <includes>
+                    <include>src/main/resources/*.yml</include>
+                  </includes>
+                </validationSet>
+              </validationSets>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

src/it/skip-nonexisting-basedir/verify.groovy

@@ -0,0 +1,2 @@
+return new File('target/it/skip-nonexisting-basedir/build.log')
+        .text.contains('does not exist or is not a directory. Skipping.')

src/it/validate-succeeds/pom.xml

@@ -29,9 +29,10 @@
               <detectDuplicateKeys>false</detectDuplicateKeys>
               <validationSets>
                 <validationSet>
-                  <jsonSchema>src/main/resources/swagger-schema.json</jsonSchema>
+                  <baseDir>src</baseDir>
+                  <jsonSchema>main/resources/swagger-schema.json</jsonSchema>
                   <includes>
-                    <include>src/main/resources/swagger-*.yml</include>
+                    <include>main/resources/swagger-*.yml</include>
                   </includes>
                 </validationSet>
               </validationSets>

src/it/validate-succeeds/verify.groovy

@@ -0,0 +1,2 @@
+return !(new File('target/it/validate-succeeds/build.log')
+        .text.contains('does not exist or is not a directory. Skipping.'))

src/main/java/com/github/sylvainlaurent/maven/yamljsonvalidator/ValidateMojo.java

@@ -9,6 +9,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 
 /**
@@ -29,7 +30,7 @@ public class ValidateMojo extends AbstractMojo {
      * and <code>&lt;exclude&gt;</code> elements respectively to specify lists of file masks of
      * included and excluded files. The file masks are treated as paths relative to
      * <code>${project.basedir}</code> and their syntax is that of
-     * <code>org.codehaus.plexus.util.DirectoryScanner</code>.</p>
+     * <code>org.apache.maven.shared.utils.io.DirectoryScanner</code>.</p>
      *
      * <p>JSON schema can be specified with <code>&lt;jsonSchema&gt;</code> element.</p>
      */
@@ -70,6 +71,19 @@ public class ValidateMojo extends AbstractMojo {
     @Parameter(defaultValue = "false")
     private boolean allowTrailingComma;
 
+    /**
+     * Set to <code>true</code> to follow symlinks.
+     */
+    @Parameter(defaultValue = "true")
+    private boolean followSymlinks;
+
+    /**
+     * Set to <code>true</code> to include default excludes. Default excludes contain excludes for backup files and
+     * SCM directories.
+     */
+    @Parameter(defaultValue = "true")
+    private boolean addDefaultExcludes;
+
     @Override
     public void execute() throws MojoExecutionException {
         boolean encounteredError = false;
@@ -80,15 +94,27 @@ public void execute() throws MojoExecutionException {
         }
 
         for (final ValidationSet set : validationSets) {
-            InputStream inputStream = openJsonSchema(set.getJsonSchema());
-            final ValidationService validationService = new ValidationService(
-                    inputStream,
-                    allowEmptyFiles,
-                    detectDuplicateKeys,
-                    allowJsonComments,
-                    allowTrailingComma);
-
-            final File[] files = set.getFiles(basedir);
+            final String validationSetBaseDirStr = set.getBaseDir();
+            final File validationSetBaseDir = validationSetBaseDirStr != null
+                    ? new File(validationSetBaseDirStr) : this.basedir;
+            final String setJsonSchema = set.getJsonSchema();
+            final ValidationService validationService;
+            try (InputStream inputStream = openJsonSchema(
+                    setJsonSchema != null
+                            ? new File(validationSetBaseDir, setJsonSchema).toString()
+                            : null
+            )) {
+                validationService = new ValidationService(
+                        inputStream,
+                        allowEmptyFiles,
+                        detectDuplicateKeys,
+                        allowJsonComments,
+                        allowTrailingComma);
+            } catch (IOException ex) {
+                throw new MojoExecutionException("Failed to read schema", ex);
+            }
+
+            final File[] files = ValidationSet.getFiles(set, getLog(), basedir, followSymlinks, addDefaultExcludes);
 
             for (final File file : files) {
                 if (verbose) {

src/main/java/com/github/sylvainlaurent/maven/yamljsonvalidator/ValidationService.java

@@ -1,6 +1,7 @@
 package com.github.sylvainlaurent.maven.yamljsonvalidator;
 
 import com.fasterxml.jackson.core.JsonParser.Feature;
+import com.fasterxml.jackson.core.json.JsonReadFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.MissingNode;
@@ -41,8 +42,8 @@ public ValidationService(final InputStream schemaFile,
             this.jsonMapper.enable(Feature.ALLOW_COMMENTS);
         }
         if (allowTrailingComma) {
-            this.jsonMapper.enable(Feature.ALLOW_TRAILING_COMMA);
-            this.yamlMapper.enable(Feature.ALLOW_TRAILING_COMMA);
+            this.jsonMapper.enable(JsonReadFeature.ALLOW_TRAILING_COMMA.mappedFeature());
+            this.yamlMapper.enable(JsonReadFeature.ALLOW_TRAILING_COMMA.mappedFeature());
         }
     }
 

src/main/java/com/github/sylvainlaurent/maven/yamljsonvalidator/ValidationSet.java

@@ -1,8 +1,9 @@
 package com.github.sylvainlaurent.maven.yamljsonvalidator;
 
-import java.io.File;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.shared.utils.io.DirectoryScanner;
 
-import org.codehaus.plexus.util.DirectoryScanner;
+import java.io.File;
 
 public class ValidationSet {
     /**
@@ -14,6 +15,8 @@ public class ValidationSet {
 
     private String[] excludes;
 
+    private String baseDir;
+
     public String getJsonSchema() {
         return jsonSchema;
     }
@@ -38,21 +41,45 @@ public void setExcludes(final String[] excludes) {
         this.excludes = excludes;
     }
 
-    public File[] getFiles(final File basedir) {
+    public String getBaseDir() {
+        return baseDir;
+    }
+
+    public void setBaseDir(String baseDir) {
+        this.baseDir = baseDir;
+    }
+
+    public static File[] getFiles(final ValidationSet validationSet, final Log log, final File projectBaseDir,
+                                  final boolean followSymlinks, final boolean addDefaultExcludes) {
         final DirectoryScanner ds = new DirectoryScanner();
-        ds.setBasedir(basedir);
-        if (includes != null && includes.length > 0) {
-            ds.setIncludes(includes);
+        final String validationSetBaseDirStr = validationSet.getBaseDir();
+        final File validationSetBaseDir = validationSetBaseDirStr != null
+                ? new File(validationSetBaseDirStr) : projectBaseDir;
+        ds.setBasedir(validationSetBaseDir);
+        ds.setFollowSymlinks(followSymlinks);
+        if (addDefaultExcludes) {
+            ds.addDefaultExcludes();
+        }
+        if (validationSet.includes != null && validationSet.includes.length > 0) {
+            ds.setIncludes(validationSet.includes);
         }
-        if (excludes != null && excludes.length > 0) {
-            ds.setExcludes(excludes);
+        if (validationSet.excludes != null && validationSet.excludes.length > 0) {
+            ds.setExcludes(validationSet.excludes);
         }
+
+        if (validationSetBaseDir == null
+                || !validationSetBaseDir.exists()
+                || !validationSetBaseDir.isDirectory()) {
+            log.warn("Directory " + validationSetBaseDir + " does not exist or is not a directory. Skipping.");
+            return new File[0];
+        }
+
         ds.scan();
         final String[] filePaths = ds.getIncludedFiles();
         final File[] files = new File[filePaths.length];
 
         for (int i = 0; i < filePaths.length; i++) {
-            files[i] = new File(basedir, filePaths[i]);
+            files[i] = new File(validationSetBaseDir, filePaths[i]);
         }
 
         return files;