You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/09/01 11:43:08 UTC
karaf git commit: [KARAF-5311] NPE in karaf-maven-plugin when
specifying descriptor by file url
Repository: karaf
Updated Branches:
refs/heads/master 7f6a3859d -> 6d5355e48
[KARAF-5311] NPE in karaf-maven-plugin when specifying descriptor by file url
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6d5355e4
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6d5355e4
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6d5355e4
Branch: refs/heads/master
Commit: 6d5355e488e9e5a593fa5a8904a805745c04958a
Parents: 7f6a385
Author: Guillaume Nodet <gn...@apache.org>
Authored: Fri Sep 1 13:26:22 2017 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Fri Sep 1 13:26:22 2017 +0200
----------------------------------------------------------------------
.../karaf/tooling/features/AbstractFeatureMojo.java | 5 ++++-
.../org/apache/karaf/tooling/utils/MojoSupport.java | 14 +++++++-------
2 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/6d5355e4/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 918f0a8..7c29fe3 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
@@ -122,7 +122,10 @@ public abstract class AbstractFeatureMojo extends MojoSupport {
if (includeMvnBasedDescriptors) {
bundles.add(uri);
}
- Features repo = JaxbUtil.unmarshal(descriptor.getFile().toURI().toString(), true);
+ String uriToUse = descriptor != null
+ ? descriptor.getFile().toURI().toString()
+ : translateFromMaven(uri);
+ Features repo = JaxbUtil.unmarshal(uriToUse, true);
for (Feature f : repo.getFeature()) {
featuresMap.put(f.getId(), f);
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/6d5355e4/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
index a11c4e2..3f0e06c 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
@@ -188,13 +188,13 @@ public abstract class MojoSupport extends AbstractMojo {
return getLocalRepoUrl() + "/" + dir + name;
}
- if (System.getProperty("os.name").startsWith("Windows") && uri.startsWith("file:")) {
- String baseDir = uri.substring(5).replace('\\', '/').replaceAll(" ", "%20");
- String result = baseDir;
- if (baseDir.indexOf(":") > 0) {
- result = "file:///" + baseDir;
- }
- return result;
+ uri = uri.replaceAll(" ", "%20");
+ if (uri.startsWith("file:") && File.separatorChar != '/') {
+ String baseDir = uri.substring(5).replace(File.separatorChar, '/');
+ if (baseDir.indexOf(':') >= 0) {
+ baseDir = "///" + baseDir;
+ }
+ return "file:" + baseDir;
}
return uri;
}