Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B895E200C3A for ; Thu, 2 Mar 2017 11:20:22 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B5A33160B61; Thu, 2 Mar 2017 10:20:22 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 151DE160B6F for ; Thu, 2 Mar 2017 11:20:21 +0100 (CET) Received: (qmail 66085 invoked by uid 500); 2 Mar 2017 10:20:21 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 66068 invoked by uid 99); 2 Mar 2017 10:20:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Mar 2017 10:20:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 12A80DFAB2; Thu, 2 Mar 2017 10:20:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: jbonofre@apache.org To: commits@karaf.apache.org Date: Thu, 02 Mar 2017 10:20:21 -0000 Message-Id: <78c2d9e55e1345dd9392e39ea3e4d539@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] karaf git commit: [KARAF-4997] Deal with POM dependencies in generated features.xml using generate Maven plugin archived-at: Thu, 02 Mar 2017 10:20:22 -0000 Repository: karaf Updated Branches: refs/heads/master aa89b54e5 -> 96b8617c8 [KARAF-4997] Deal with POM dependencies in generated features.xml using generate Maven plugin Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9141f445 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9141f445 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9141f445 Branch: refs/heads/master Commit: 9141f445960b7b48ab18175249760bac91a22fdc Parents: aa89b54 Author: Stephen Kitt Authored: Fri Feb 24 18:14:38 2017 +0100 Committer: Jean-Baptiste Onofré Committed: Wed Mar 1 16:16:44 2017 +0100 ---------------------------------------------------------------------- .../features/GenerateDescriptorMojo.java | 31 +++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/9141f445/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 5a152ff..329280d 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 @@ -580,7 +580,14 @@ public class GenerateDescriptorMojo extends MojoSupport { 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 + // Determine what dependency we're actually going to use + Dependency matchingDependency = findMatchingDependency(feature.getFeature(), dependency); + if (matchingDependency != null) { + // The feature already has a matching dependency, merge + mergeDependencies(matchingDependency, dependency); + dependency = matchingDependency; + } + // We mustn't de-duplicate here, we may have seen a feature in !add mode otherFeatures.put(dependency, includedFeature); if (add) { if (!feature.getFeature().contains(dependency)) { @@ -598,6 +605,28 @@ public class GenerateDescriptorMojo extends MojoSupport { } } + private Dependency findMatchingDependency(List dependencies, Dependency reference) { + String referenceName = reference.getName(); + for (Dependency dependency : dependencies) { + if (referenceName.equals(dependency.getName())) { + return dependency; + } + } + return null; + } + + private void mergeDependencies(Dependency target, Dependency source) { + if (target.getVersion() == null || Feature.DEFAULT_VERSION.equals(target.getVersion())) { + target.setVersion(source.getVersion()); + } + if (source.isDependency()) { + target.setDependency(true); + } + if (source.isPrerequisite()) { + target.setPrerequisite(true); + } + } + private boolean isBundleIncludedTransitively(Feature feature, Map otherFeatures, Bundle bundle) { for (Dependency dependency : feature.getFeature()) {