diff --git a/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java b/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java
index 78ce28b1..c163ad5e 100755
--- a/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java
+++ b/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java
@@ -50,8 +50,13 @@ public class RepositoryBuilder
Repository repository = new Repository( id, url );
String dir = (String) project.getContext().getVariable( "maven.repo." + id + ".directory" );
- if ( repository.getBasedir() != null )
+ if ( repository.getBasedir() != null && dir != null )
{
+ dir = dir.replace( '\\', '/' );
+ if ( !repository.getBasedir().endsWith( "/" ) && !dir.startsWith( "/" ) )
+ {
+ dir = "/" + dir;
+ }
dir = repository.getBasedir() + dir;
}
diff --git a/artifact/xdocs/changes.xml b/artifact/xdocs/changes.xml
index afe2debd..526d4516 100644
--- a/artifact/xdocs/changes.xml
+++ b/artifact/xdocs/changes.xml
@@ -24,6 +24,9 @@