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:19:33 UTC
git commit: [KARAF-2832] Fix exception when using the
features-maven-plugin with non osgi compliant features version(cherry picked
from commit 7a76562b42a0f0b13837ced083e8a2f90b1b75ee)
Repository: karaf
Updated Branches:
refs/heads/karaf-2.3.x c4bfdd466 -> 4e8c281bb
[KARAF-2832] Fix exception when using the features-maven-plugin with non osgi compliant features version(cherry picked from commit 7a76562b42a0f0b13837ced083e8a2f90b1b75ee)
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/4e8c281b
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/4e8c281b
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/4e8c281b
Branch: refs/heads/karaf-2.3.x
Commit: 4e8c281bba1019a1fce7c55f05a16f0e4cb751f7
Parents: c4bfdd4
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed Mar 19 21:03:30 2014 +0100
Committer: Freeman Fang <fr...@gmail.com>
Committed: Fri Mar 21 10:06:48 2014 +0800
----------------------------------------------------------------------
.../karaf/tooling/features/AddFeaturesToRepoMojo.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/4e8c281b/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 d4eb5a1..e1f4269 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
@@ -39,6 +39,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.felix.utils.version.VersionRange;
+import org.apache.felix.utils.version.VersionTable;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
@@ -303,12 +304,9 @@ public class AddFeaturesToRepoMojo 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);
}
}
@@ -320,7 +318,7 @@ public class AddFeaturesToRepoMojo extends MojoSupport {
for (String key : featuresMap.keySet()) {
String[] nameVersion = key.split("/");
if (feature.equals(nameVersion[0])) {
- 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);
}
}