Repository: karaf Updated Branches: refs/heads/karaf-3.0.x 961e79123 -> 0270ea3a1
[KARAF-2820]features-maven-plugin:add-features-to-repo adds wrong transitive feature version (cherry picked from commit ba11f3b4318407991467192ef73265e43cab5dbf) Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0270ea3a Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0270ea3a Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0270ea3a Branch: refs/heads/karaf-3.0.x Commit: 0270ea3a153995e63a2290340191a088111478e2 Parents: 961e791 Author: Freeman Fang <[email protected]> Authored: Thu Mar 13 16:42:12 2014 +0800 Committer: Freeman Fang <[email protected]> Committed: Thu Mar 13 16:43:14 2014 +0800 ---------------------------------------------------------------------- .../org/apache/karaf/tooling/features/AbstractFeatureMojo.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/0270ea3a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AbstractFeatureMojo.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AbstractFeatureMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AbstractFeatureMojo.java index 1127587..4b8a1a9 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AbstractFeatureMojo.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AbstractFeatureMojo.java @@ -200,7 +200,9 @@ public abstract class AbstractFeatureMojo extends MojoSupport { } Version ver = new Version(verStr); if (versionRange.contains(ver)) { - f = featuresMap.get(key); + if (f == null || new Version(f.getVersion()).compareTo(new Version(featuresMap.get(key).getVersion())) < 0) { + f = featuresMap.get(key); + } } } }
