From 1686f92f8c17d9013f649a4173491ecb57c1ae22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= Date: Thu, 15 Feb 2024 04:55:08 +0100 Subject: [PATCH] Add properties to parameters of fix-artifacts-metadata mojo Fix https://github.com/eclipse-tycho/tycho/issues/3505 --- .../tycho/plugins/p2/repository/AbstractRepositoryMojo.java | 2 +- .../p2/repository/FixArtifactsMetadataMetadataMojo.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/AbstractRepositoryMojo.java b/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/AbstractRepositoryMojo.java index 295089b6e8..e56358bc1a 100644 --- a/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/AbstractRepositoryMojo.java +++ b/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/AbstractRepositoryMojo.java @@ -19,7 +19,7 @@ public abstract class AbstractRepositoryMojo extends AbstractP2Mojo { - @Parameter + @Parameter(property = "p2.repository.location") private File repositoryLocation; protected File getAssemblyRepositoryLocation() { diff --git a/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/FixArtifactsMetadataMetadataMojo.java b/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/FixArtifactsMetadataMetadataMojo.java index 6a7e7d592d..2d82657be2 100644 --- a/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/FixArtifactsMetadataMetadataMojo.java +++ b/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/FixArtifactsMetadataMetadataMojo.java @@ -39,7 +39,7 @@ @Mojo(name = "fix-artifacts-metadata", defaultPhase = LifecyclePhase.PREPARE_PACKAGE, threadSafe = true) public class FixArtifactsMetadataMetadataMojo extends AbstractRepositoryMojo { - @Parameter(defaultValue = "${project.name}") + @Parameter(defaultValue = "${project.name}", property = "p2.repository.name") private String repositoryName; /** @@ -48,7 +48,7 @@ public class FixArtifactsMetadataMetadataMojo extends AbstractRepositoryMojo { * redundant file content. *

*/ - @Parameter(defaultValue = "true") + @Parameter(defaultValue = "true", property = "p2.repository.xz") private boolean xzCompress; /** @@ -58,7 +58,7 @@ public class FixArtifactsMetadataMetadataMojo extends AbstractRepositoryMojo { * pre-Mars p2 clients which cannot read XZ-compressed index files. *

*/ - @Parameter(defaultValue = "true") + @Parameter(defaultValue = "true", property = "p2.repository.xz.keep") private boolean keepNonXzIndexFiles; @Component