[jackrabbit-filevault-package-maven-plugin] 02/02: trivial: clarify main artifact and classifier handling for "validate-package"

[kw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven-plugin.git

commit 8aef2793bb32203a2ee9a0132be30ebd86de444f
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Wed Jun 2 11:10:27 2021 +0200

    trivial: clarify main artifact and classifier handling for
    "validate-package"
---
 .../jackrabbit/filevault/maven/packaging/ValidatePackageMojo.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidatePackageMojo.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidatePackageMojo.java
index f334b99..811dadb 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidatePackageMojo.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidatePackageMojo.java
@@ -55,7 +55,8 @@ import org.xml.sax.SAXException;
         name = "validate-package", defaultPhase = LifecyclePhase.VERIFY, requiresDependencyResolution = ResolutionScope.COMPILE, requiresProject = false, threadSafe = true)
 public class ValidatePackageMojo extends AbstractValidateMojo {
 
-    /** The mainn package file to validate. By default will be the project's main artifact (in case a project is given) */
+    /** The main package file to validate. By default will be the project's main artifact (in case a project is given). If empty the main artifact will not be validated
+     * but only the attached artifacts with the given {@link #classifiers}. */
     @Parameter(property = "vault.packageToValidate", defaultValue = "${project.artifact.file}", required=true)
     private File packageFile;
 
@@ -71,7 +72,7 @@ public class ValidatePackageMojo extends AbstractValidateMojo {
     private List<Artifact> attachedArtifacts;
 
     /**
-     * If given validates all attached artifacts with one of the given classifiers in addition
+     * If given validates all attached artifacts with one of the given classifiers in addition to the one given in {@link #packageFile}.
      */
     @Parameter()
     private List<String> classifiers;
@@ -83,7 +84,7 @@ public class ValidatePackageMojo extends AbstractValidateMojo {
     public void doExecute(ValidationHelper validationHelper) throws MojoExecutionException, MojoFailureException {
         try {
             boolean foundPackage = false;
-            if (packageFile != null && !packageFile.isDirectory()) {
+            if (packageFile != null && !packageFile.toString().isEmpty() && !packageFile.isDirectory()) {
                 validatePackage(validationHelper, packageFile);
                 foundPackage = true;
             }