From f09520091f1ee91c6577982f2590d32300d4e89d Mon Sep 17 00:00:00 2001 From: brett Date: Fri, 19 Aug 2005 06:47:11 +0000 Subject: [PATCH] PR: MPARTIFACT-58 add leading / on directory if it is missing git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@233442 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/artifact/deployer/RepositoryBuilder.java | 7 ++++++- artifact/xdocs/changes.xml | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) 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 @@ Vincent Massol + + Correct handling of directory without a leading / + Correct basedir for file:// URLs Fix handling of dependencies with properties