You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2018/11/13 09:43:46 UTC
[sling-slingfeature-maven-plugin] branch master updated: Add
support to set the vendor for an aggregate
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new a529317 Add support to set the vendor for an aggregate
a529317 is described below
commit a529317a116132dd7fb1cf8741119a696a316f53
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Nov 13 10:43:38 2018 +0100
Add support to set the vendor for an aggregate
---
src/main/java/org/apache/sling/feature/maven/mojos/Aggregate.java | 7 ++++++-
.../apache/sling/feature/maven/mojos/AggregateFeaturesMojo.java | 3 +++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/feature/maven/mojos/Aggregate.java b/src/main/java/org/apache/sling/feature/maven/mojos/Aggregate.java
index fb2ad91..e4d06d3 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/Aggregate.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/Aggregate.java
@@ -46,6 +46,11 @@ public class Aggregate extends FeatureSelectionConfig {
*/
public String description;
+ /**
+ * Optional vendor for the feature
+ */
+ public String vendor;
+
public Map<String, String> variables;
public Map<String, String> frameworkProperties;
@@ -55,7 +60,7 @@ public class Aggregate extends FeatureSelectionConfig {
return "Aggregate [filesIncludes=" + getIncludes() + ", filesExcludes=" + getExcludes() + ", includeArtifact="
+ getArtifacts() + ", includeClassifier=" + getClassifiers() + ", classifier=" + classifier
+ ", markAsFinal=" + markAsFinal + ", markAsComplete=" + markAsComplete + ", title=" + title
- + ", description=" + description + ", variables="
+ + ", description=" + description + ", vendor=" + vendor + ", variables="
+ variables + ", frameworkProperties=" + frameworkProperties + "]";
}
}
\ No newline at end of file
diff --git a/src/main/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesMojo.java b/src/main/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesMojo.java
index 21c0273..7a322e4 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesMojo.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesMojo.java
@@ -157,6 +157,9 @@ public class AggregateFeaturesMojo extends AbstractIncludingFeatureMojo {
if (aggregate.description != null) {
result.setDescription(aggregate.description);
}
+ if (aggregate.vendor != null) {
+ result.setVendor(aggregate.vendor);
+ }
ProjectHelper.setFeatureInfo(project, result);