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:07:59 UTC
[1/2] 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/master 9ce8fb53b -> d2894bfab
[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/8c39bdd4
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8c39bdd4
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8c39bdd4
Branch: refs/heads/master
Commit: 8c39bdd46dd4f5e42491a27c2ae9700f13ad57fb
Parents: 9ce8fb5
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 17:02:12 2017 +0100
----------------------------------------------------------------------
.../tooling/features/GenerateDescriptorMojo.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/8c39bdd4/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 8f61c52..57d01c3 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
@@ -262,6 +262,18 @@ 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
// *************************************************
@@ -557,6 +569,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) {
[2/2] karaf git commit: [KARAF-4998] This closes #286
Posted by jb...@apache.org.
[KARAF-4998] This closes #286
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d2894bfa
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d2894bfa
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d2894bfa
Branch: refs/heads/master
Commit: d2894bfabaa73baa63f73675df1b4ae980528517
Parents: 9ce8fb5 8c39bdd
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Tue Feb 28 18:07:38 2017 +0100
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Tue Feb 28 18:07:38 2017 +0100
----------------------------------------------------------------------
.../tooling/features/GenerateDescriptorMojo.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------