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 11:12:22 UTC
[jackrabbit-filevault-package-maven-plugin] branch master updated: JCRVLT-723 only ever validate supplemental artifacts in case they have (#102)
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
The following commit(s) were added to refs/heads/master by this push:
new a24c286 JCRVLT-723 only ever validate supplemental artifacts in case they have (#102)
a24c286 is described below
commit a24c286f52a0a918d0594206412d448fc873bf23
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Oct 26 13:12:18 2023 +0200
JCRVLT-723 only ever validate supplemental artifacts in case they have (#102)
the right type
---
.../packaging/impl/extensions/ContentPackageArtifactHandler.java | 5 +++--
.../impl/extensions/ContentPackageLifecycleMappingProvider.java | 3 ++-
.../filevault/maven/packaging/mojo/ValidatePackageMojo.java | 5 +++--
.../apache/jackrabbit/filevault/maven/packaging/mojo/VaultMojo.java | 4 ++--
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/impl/extensions/ContentPackageArtifactHandler.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/impl/extensions/ContentPackageArtifactHandler.java
index 4609d7d..2cea6b6 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/impl/extensions/ContentPackageArtifactHandler.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/impl/extensions/ContentPackageArtifactHandler.java
@@ -19,14 +19,15 @@ package org.apache.jackrabbit.filevault.maven.packaging.impl.extensions;
import javax.inject.Named;
import javax.inject.Singleton;
+import org.apache.jackrabbit.filevault.maven.packaging.mojo.VaultMojo;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
@Singleton
-@Named("content-package")
+@Named(VaultMojo.PACKAGE_TYPE)
public class ContentPackageArtifactHandler extends DefaultArtifactHandler {
public ContentPackageArtifactHandler() {
- super("content-package");
+ super(VaultMojo.PACKAGE_TYPE);
setIncludesDependencies(true);
setExtension("zip");
setLanguage("java");
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/impl/extensions/ContentPackageLifecycleMappingProvider.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/impl/extensions/ContentPackageLifecycleMappingProvider.java
index 8526e0e..6fdb4a0 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/impl/extensions/ContentPackageLifecycleMappingProvider.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/impl/extensions/ContentPackageLifecycleMappingProvider.java
@@ -25,12 +25,13 @@ import javax.inject.Named;
import javax.inject.Provider;
import javax.inject.Singleton;
+import org.apache.jackrabbit.filevault.maven.packaging.mojo.VaultMojo;
import org.apache.maven.lifecycle.mapping.Lifecycle;
import org.apache.maven.lifecycle.mapping.LifecycleMapping;
import org.apache.maven.lifecycle.mapping.LifecyclePhase;
@Singleton
-@Named("content-package")
+@Named(VaultMojo.PACKAGE_TYPE)
public class ContentPackageLifecycleMappingProvider implements Provider<LifecycleMapping> {
private static final String DEFAULT_LIFECYCLE_KEY = "default";
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..75488b9 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())
+ && VaultMojo.PACKAGE_TYPE.equals(attached.getType())) {
validatePackage(validationHelper, attached.getFile().toPath());
foundPackage = true;
}
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/VaultMojo.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/VaultMojo.java
index 55d37e6..5f0b657 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/VaultMojo.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/mojo/VaultMojo.java
@@ -76,9 +76,9 @@ import org.jetbrains.annotations.NotNull;
@Mojo(name = "package", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution = ResolutionScope.COMPILE, threadSafe = true)
public class VaultMojo extends AbstractSourceAndMetadataPackageMojo {
- private static final String PACKAGE_TYPE = "zip";
+ public static final String PACKAGE_TYPE = "content-package";
- public static final String PACKAGE_EXT = "." + PACKAGE_TYPE;
+ public static final String PACKAGE_EXT = ".zip";
private static final Collection<File> STATIC_META_INF_FILES = Arrays.asList(new File(Constants.META_DIR, Constants.CONFIG_XML),
new File(Constants.META_DIR, Constants.SETTINGS_XML));