You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/08/11 07:49:52 UTC
svn commit: r1695213 -
/felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
Author: cziegeler
Date: Tue Aug 11 05:49:51 2015
New Revision: 1695213
URL: http://svn.apache.org/r1695213
Log:
FELIX-4999 : maven-scr-plugin messes project resources when outputDirectory configuration present on windows
Modified:
felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
Modified: felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java?rev=1695213&r1=1695212&r2=1695213&view=diff
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java (original)
+++ felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java Tue Aug 11 05:49:51 2015
@@ -534,7 +534,7 @@ public class SCRDescriptorMojo extends A
* 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 @@ public class SCRDescriptorMojo extends A
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();