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@1695213 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 5f5d26f..7e13918 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
@@ -534,7 +534,7 @@
* configured build output directory) is used for output
*/
private boolean updateProjectResources() {
- final String classesDir = this.project.getBuild().getOutputDirectory().replace(File.separatorChar, '/');
+ final String classesDir = new File(this.project.getBuild().getOutputDirectory()).getAbsolutePath().replace(File.separatorChar, '/');
final String ourRsrcPath = this.outputDirectory.getAbsolutePath().replace(File.separatorChar, '/');
if ( !classesDir.equals(ourRsrcPath) ) {
// now add the descriptor directory to the maven resources
@@ -543,7 +543,7 @@
final Iterator<Resource> rsrcIterator = this.project.getResources().iterator();
while (!found && rsrcIterator.hasNext()) {
final Resource rsrc = rsrcIterator.next();
- found = rsrc.getDirectory().replace(File.separatorChar, '/').equals(ourRsrcPath);
+ found = new File(rsrc.getDirectory()).getAbsolutePath().replace(File.separatorChar, '/').equals(ourRsrcPath);
}
if (!found) {
final Resource resource = new Resource();