You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2023/10/26 09:11:05 UTC

[jackrabbit-filevault-package-maven-plugin] branch bugfix/JCRVLT-723-consider-type-before-validating created (now e391bbf)

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

kwin pushed a change to branch bugfix/JCRVLT-723-consider-type-before-validating
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven-plugin.git


      at e391bbf  JCRVLT-723 only ever validate supplemental artifacts in case they have the right type

This branch includes the following new commits:

     new e391bbf  JCRVLT-723 only ever validate supplemental artifacts in case they have the right type

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[jackrabbit-filevault-package-maven-plugin] 01/01: JCRVLT-723 only ever validate supplemental artifacts in case they have the right type

Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch bugfix/JCRVLT-723-consider-type-before-validating
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven-plugin.git

commit e391bbf9e7cac2dbf6fadcea64d96ef91b2b7cc0
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Oct 26 11:10:59 2023 +0200

    JCRVLT-723 only ever validate supplemental artifacts in case they have
    the right type
---
 .../filevault/maven/packaging/mojo/ValidatePackageMojo.java          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/ValidatePackageMojo.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/ValidatePackageMojo.java
index 676a28f..54caa10 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/ValidatePackageMojo.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/ValidatePackageMojo.java
@@ -121,8 +121,9 @@ public class ValidatePackageMojo extends AbstractValidateMojo {
                 classifiersToCompare.add(classifier);
             }
             for (Artifact attached : attachedArtifacts) {
-                // validate attached artifacts with given classifiers
-                if (classifiersToCompare.contains(attached.getClassifier())) {
+                // validate attached artifacts with given classifiers (in case it is a content package)
+                if (classifiersToCompare.contains(attached.getClassifier()) &&
+                    attached.getType().equals("content-package")) {
                     validatePackage(validationHelper, attached.getFile().toPath());
                     foundPackage = true;
                 }