[SCM-943] scm:check-local-modification does not support excludes

michael-o · michael-o · commit d7107dac448f · 2022-05-22T10:10:08.000+02:00
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckLocalModificationsMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckLocalModificationsMojo.java
@@ -19,13 +19,12 @@
  * under the License.
  */
 
-import java.io.File;
+import java.io.IOException;
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.scm.ScmException;
-import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.command.status.StatusScmResult;
 import org.apache.maven.scm.repository.ScmRepository;
 
@@ -45,19 +44,13 @@ public class CheckLocalModificationsMojo
      */
     @Parameter( property = "scm.checkLocalModification.errorMessage",
                     defaultValue = "The build will stop as there is local modifications" )
-    private String errorMessage; 
-    
+    private String errorMessage;
+
     /**
      * Skip the check for local modifications if set to {@code true}.
-     */    
+     */
     @Parameter( property = "scm.checkLocalModification.skip", defaultValue = "false" )
     private boolean skip;
-    
-    /**
-     * current directory
-     */     
-    @Parameter( defaultValue = "${basedir}", readonly = true )
-    private File baseDirectory;
 
     public void execute()
         throws MojoExecutionException
@@ -74,9 +67,9 @@ public void execute()
         try
         {
             ScmRepository repository = getScmRepository();
-            result = getScmManager().status( repository, new ScmFileSet( baseDirectory ) );
+            result = getScmManager().status( repository, getFileSet() );
         }
-        catch ( ScmException e )
+        catch ( IOException | ScmException e )
         {
             throw new MojoExecutionException( e.getMessage(), e );
         }
@@ -94,5 +87,5 @@ public void execute()
         }
 
     }
-    
+
 }
