You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/01/31 01:27:21 UTC
svn commit: r904931 - in /maven/maven-3/trunk: ./
maven-core/src/main/java/org/apache/maven/project/
maven-model-builder/src/main/java/org/apache/maven/model/building/
maven-model-builder/src/main/java/org/apache/maven/model/path/
Author: bentmann
Date: Sun Jan 31 00:27:21 2010
New Revision: 904931
URL: http://svn.apache.org/viewvc?rev=904931&view=rev
Log:
[MNG-4464] Improve handling of relative paths with backslashes
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java
maven/maven-3/trunk/pom.xml
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=904931&r1=904930&r2=904931&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java Sun Jan 31 00:27:21 2010
@@ -338,6 +338,8 @@
continue;
}
+ module = module.replace( '\\', File.separatorChar ).replace( '/', File.separatorChar );
+
File moduleFile = new File( basedir, module );
if ( moduleFile.isDirectory() )
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=904931&r1=904930&r2=904931&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java Sun Jan 31 00:27:21 2010
@@ -545,6 +545,8 @@
String parentPath = childModel.getParent().getRelativePath();
+ parentPath = parentPath.replace( '\\', File.separatorChar ).replace( '/', File.separatorChar );
+
File pomFile = new File( new File( projectDirectory, parentPath ).toURI().normalize() );
if ( pomFile.isDirectory() )
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java?rev=904931&r1=904930&r2=904931&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java Sun Jan 31 00:27:21 2010
@@ -39,6 +39,8 @@
if ( path != null && basedir != null )
{
+ path = path.replace( '\\', File.separatorChar ).replace( '/', File.separatorChar );
+
File file = new File( path );
if ( file.isAbsolute() )
{
Modified: maven/maven-3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=904931&r1=904930&r2=904931&view=diff
==============================================================================
--- maven/maven-3/trunk/pom.xml (original)
+++ maven/maven-3/trunk/pom.xml Sun Jan 31 00:27:21 2010
@@ -41,7 +41,7 @@
<commonsCliVersion>1.2</commonsCliVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion>
<junitVersion>3.8.2</junitVersion>
- <plexusVersion>1.5.3</plexusVersion>
+ <plexusVersion>1.5.4</plexusVersion>
<plexusInterpolationVersion>1.11</plexusInterpolationVersion>
<plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion>
<plexusUtilsVersion>2.0.1</plexusUtilsVersion>