This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 235ec97  [KARAF-6085]karaf-maven-plugin verify mojo builds invalid 
repository URL on Windows
235ec97 is described below

commit 235ec97a2036ebc33abf0b72c9ae8ef9f853b27c
Author: Freeman Fang <freeman.f...@gmail.com>
AuthorDate: Mon Mar 11 11:53:56 2019 +0800

    [KARAF-6085]karaf-maven-plugin verify mojo builds invalid repository URL on 
Windows
---
 .../src/main/java/org/apache/karaf/tooling/VerifyMojo.java    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
index 5ffc224..cd31bb1 100644
--- 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
+++ 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
@@ -266,7 +266,16 @@ public class VerifyMojo extends MojoSupport {
             if (framework.contains("framework")) {
                 allDescriptors.add("mvn:org.apache.karaf.features/framework/" 
+ getVersion("org.apache.karaf.features:framework") + "/xml/features");
             }
-            allDescriptors.add("file:" + project.getBuild().getDirectory() + 
"/feature/feature.xml");
+            String filePrefix = null;
+            if (System.getProperty("os.name").contains("Windows")) {
+                filePrefix = "file:/";
+            } else {
+                filePrefix = "file:";
+            }
+            allDescriptors.add(filePrefix + project.getBuild().getDirectory() 
+ File.separator 
+                               + "feature"
+                               + File.separator 
+                               + "feature.xml");
         } else {
             allDescriptors.addAll(descriptors);
             if (framework != null && framework.contains("framework")) {

Reply via email to