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/21 03:42:19 UTC
git commit: [KARAF-2832]Fix exception when using the
features-maven-plugin with non osgi compliant features version (cherry picked
from commit e9edfa60e013d7550cd69c5f370fdca99dfb50b2)
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x a0e25de17 -> 7f45b6b9f
[KARAF-2832]Fix exception when using the features-maven-plugin with non osgi compliant features version
(cherry picked from commit e9edfa60e013d7550cd69c5f370fdca99dfb50b2)
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/7f45b6b9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/7f45b6b9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/7f45b6b9
Branch: refs/heads/karaf-3.0.x
Commit: 7f45b6b9f3c57dc1009fa1aeb224e4097c54358b
Parents: a0e25de
Author: Freeman Fang <fr...@gmail.com>
Authored: Fri Mar 21 10:38:59 2014 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Fri Mar 21 10:41:36 2014 +0800
----------------------------------------------------------------------
.../apache/karaf/tooling/features/AbstractFeatureMojo.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/7f45b6b9/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 4b8a1a9..76e6492 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
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.felix.utils.version.VersionRange;
+import org.apache.felix.utils.version.VersionTable;
import org.apache.karaf.tooling.features.model.ArtifactRef;
import org.apache.karaf.tooling.features.model.Feature;
import org.apache.karaf.tooling.features.model.Repository;
@@ -195,12 +196,9 @@ public abstract class AbstractFeatureMojo extends MojoSupport {
String[] nameVersion = key.split("/");
if (feature.equals(nameVersion[0])) {
String verStr = featuresMap.get(key).getVersion();
- if (verStr.endsWith("-SNAPSHOT")) {
- verStr = verStr.replace("-SNAPSHOT", ".SNAPSHOT");
- }
- Version ver = new Version(verStr);
+ Version ver = VersionTable.getVersion(verStr);
if (versionRange.contains(ver)) {
- if (f == null || new Version(f.getVersion()).compareTo(new Version(featuresMap.get(key).getVersion())) < 0) {
+ if (f == null || VersionTable.getVersion(f.getVersion()).compareTo(VersionTable.getVersion(featuresMap.get(key).getVersion())) < 0) {
f = featuresMap.get(key);
}
}