You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2017/02/28 17:11:50 UTC
karaf git commit: [KARAF-4998] Add Maven plugin configuration to be
able to define the dependency and prerequisite flags on features
Repository: karaf
Updated Branches:
refs/heads/karaf-4.0.x 49e9f9891 -> 2fc4a07d9
[KARAF-4998] Add Maven plugin configuration to be able to define the dependency and prerequisite flags on features
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2fc4a07d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2fc4a07d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2fc4a07d
Branch: refs/heads/karaf-4.0.x
Commit: 2fc4a07d9ae4bc8c914556a43b3b0ee44f5a0e79
Parents: 49e9f98
Author: Stephen Kitt <sk...@redhat.com>
Authored: Fri Feb 24 18:21:55 2017 +0100
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Tue Feb 28 18:11:24 2017 +0100
----------------------------------------------------------------------
.../tooling/features/GenerateDescriptorMojo.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/2fc4a07d/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
index 55355a4..d045975 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
@@ -258,7 +258,19 @@ public class GenerateDescriptorMojo extends MojoSupport {
*/
@Parameter(defaultValue = "false")
private boolean simplifyBundleDependencies;
-
+
+ /**
+ * Name of features which are prerequisites (they still need to be defined separately).
+ */
+ @Parameter
+ private List<String> prerequisiteFeatures = new ArrayList<>();
+
+ /**
+ * Name of features which are dependencies (they still need to be defined separately).
+ */
+ @Parameter
+ private List<String> dependencyFeatures = new ArrayList<>();
+
// *************************************************
// READ-ONLY MAVEN PLUGIN PARAMETERS
// *************************************************
@@ -537,6 +549,8 @@ public class GenerateDescriptorMojo extends MojoSupport {
}
for (Feature includedFeature : includedFeatures.getFeature()) {
Dependency dependency = new Dependency(includedFeature.getName(), includedFeature.getVersion());
+ dependency.setPrerequisite(prerequisiteFeatures.contains(dependency.getName()));
+ dependency.setDependency(dependencyFeatures.contains(dependency.getName()));
// We musn't de-duplicate here, we may have seen a feature in !add mode
otherFeatures.put(dependency, includedFeature);
if (add) {