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 03:18:48 UTC
git commit: [KARAF-2821]transform valid SNAPSHOT version to
org.osgi.framework.Version (cherry picked from commit
d6540b86217386335788ffaf27b7fb8b862b948a)
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x 60e52d70e -> 961e79123
[KARAF-2821]transform valid SNAPSHOT version to org.osgi.framework.Version
(cherry picked from commit d6540b86217386335788ffaf27b7fb8b862b948a)
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/961e7912
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/961e7912
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/961e7912
Branch: refs/heads/karaf-3.0.x
Commit: 961e79123d1a8ff45b0634b300e8a0079cf77aa5
Parents: 60e52d7
Author: Freeman Fang <fr...@gmail.com>
Authored: Thu Mar 13 10:12:56 2014 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Thu Mar 13 10:14:19 2014 +0800
----------------------------------------------------------------------
.../org/apache/karaf/tooling/features/AbstractFeatureMojo.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/961e7912/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 5e9f1cb..1127587 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
@@ -194,7 +194,11 @@ public abstract class AbstractFeatureMojo extends MojoSupport {
for (String key : featuresMap.keySet()) {
String[] nameVersion = key.split("/");
if (feature.equals(nameVersion[0])) {
- Version ver = new Version(featuresMap.get(key).getVersion());
+ String verStr = featuresMap.get(key).getVersion();
+ if (verStr.endsWith("-SNAPSHOT")) {
+ verStr = verStr.replace("-SNAPSHOT", ".SNAPSHOT");
+ }
+ Version ver = new Version(verStr);
if (versionRange.contains(ver)) {
f = featuresMap.get(key);
}