Repository: karaf Updated Branches: refs/heads/karaf-2.3.x e5cf05530 -> d0379f511
[KARAF-2820]features-maven-plugin:add-features-to-repo adds wrong transitive feature version Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d0379f51 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d0379f51 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d0379f51 Branch: refs/heads/karaf-2.3.x Commit: d0379f5111c4b8eee4d695244664e04f724eb759 Parents: e5cf055 Author: Freeman Fang <[email protected]> Authored: Thu Mar 13 16:20:13 2014 +0800 Committer: Freeman Fang <[email protected]> Committed: Thu Mar 13 16:20:13 2014 +0800 ---------------------------------------------------------------------- .../apache/karaf/tooling/features/AddFeaturesToRepoMojo.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/d0379f51/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java ---------------------------------------------------------------------- diff --git a/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java b/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java index 054fc3a..d4eb5a1 100644 --- a/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java +++ b/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java @@ -308,7 +308,9 @@ public class AddFeaturesToRepoMojo 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); + } } } } @@ -318,7 +320,7 @@ public class AddFeaturesToRepoMojo extends MojoSupport { for (String key : featuresMap.keySet()) { String[] nameVersion = key.split("/"); if (feature.equals(nameVersion[0])) { - if (f == null || f.getVersion().compareTo(featuresMap.get(key).getVersion()) < 0) { + if (f == null || new Version(f.getVersion()).compareTo(new Version(featuresMap.get(key).getVersion())) < 0) { f = featuresMap.get(key); } }
