You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2014/03/13 09:21:32 UTC
git commit: [KARAF-2820]features-maven-plugin:add-features-to-repo
adds wrong transitive feature version (cherry picked from commit
d0379f5111c4b8eee4d695244664e04f724eb759)
Repository: karaf
Updated Branches:
refs/heads/karaf-2.x 7097302e2 -> c39524b97
[KARAF-2820]features-maven-plugin:add-features-to-repo adds wrong transitive feature version
(cherry picked from commit d0379f5111c4b8eee4d695244664e04f724eb759)
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c39524b9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c39524b9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c39524b9
Branch: refs/heads/karaf-2.x
Commit: c39524b972c20579743e10b223996bbdbc5e85f3
Parents: 7097302
Author: Freeman Fang <fr...@gmail.com>
Authored: Thu Mar 13 16:20:13 2014 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Thu Mar 13 16:21:16 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/c39524b9/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);
}
}