FELIX-4999 : maven-scr-plugin messes project resources when outputDirectory configuration present on windows
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1694981 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
index b93a659..5f5d26f 100644
--- a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
+++ b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
@@ -183,6 +183,7 @@
*/
private BuildContext buildContext;
+ @Override
public void execute() throws MojoExecutionException, MojoFailureException {
final String projectType = project.getArtifact().getType();
@@ -494,7 +495,7 @@
resourcesEntry.append(entry);
resourcesEntry.append("=");
resourcesEntry.append(this.outputDirectory);
- resourcesEntry.append("/");
+ resourcesEntry.append(File.separatorChar);
resourcesEntry.append(entry);
}
}
@@ -513,7 +514,7 @@
resourcesEntry.append(entry);
resourcesEntry.append("=");
resourcesEntry.append(this.outputDirectory);
- resourcesEntry.append("/");
+ resourcesEntry.append(File.separatorChar);
resourcesEntry.append(entry);
}
}
@@ -542,7 +543,7 @@
final Iterator<Resource> rsrcIterator = this.project.getResources().iterator();
while (!found && rsrcIterator.hasNext()) {
final Resource rsrc = rsrcIterator.next();
- found = rsrc.getDirectory().equals(ourRsrcPath);
+ found = rsrc.getDirectory().replace(File.separatorChar, '/').equals(ourRsrcPath);
}
if (!found) {
final Resource resource = new Resource();