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 02:37:20 UTC
git commit: [KARAF-2821]transform valid SNAPSHOT version to
org.osgi.framework.Version (cherry picked from commit
e5cf05530b8808fcc84380609eae434ca039f81c)
Repository: karaf
Updated Branches:
refs/heads/karaf-2.x 3387b0371 -> 7097302e2
[KARAF-2821]transform valid SNAPSHOT version to org.osgi.framework.Version
(cherry picked from commit e5cf05530b8808fcc84380609eae434ca039f81c)
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/7097302e
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/7097302e
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/7097302e
Branch: refs/heads/karaf-2.x
Commit: 7097302e211def43c5e898a499873f056ac662d0
Parents: 3387b03
Author: Freeman Fang <fr...@gmail.com>
Authored: Thu Mar 13 09:34:27 2014 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Thu Mar 13 09:37:00 2014 +0800
----------------------------------------------------------------------
.../apache/karaf/tooling/features/AddFeaturesToRepoMojo.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/7097302e/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 a332e3d..054fc3a 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
@@ -302,7 +302,11 @@ public class AddFeaturesToRepoMojo 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);
}