You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2010/01/27 17:37:35 UTC
svn commit: r903718 -
/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
Author: brett
Date: Wed Jan 27 16:37:34 2010
New Revision: 903718
URL: http://svn.apache.org/viewvc?rev=903718&view=rev
Log:
[MRELEASE-261] project basedir's always use the system file separator, so honour that instead of multiple substitutions
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java?rev=903718&r1=903717&r2=903718&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java Wed Jan 27 16:37:34 2010
@@ -43,6 +43,8 @@
public static final String POMv4 = "pom.xml";
+ private static final String FS = File.separator;
+
/**
* The line separator to use.
*/
@@ -177,7 +179,7 @@
{
MavenProject p = (MavenProject) i.next();
- String dir = FileUtils.normalize( p.getBasedir().getPath() ).replace( '\\', '/' );
+ String dir = FileUtils.normalize( p.getBasedir().getPath() );
if ( basedir == null )
{
@@ -186,23 +188,23 @@
else
{
// always end in / so that we know what is a path and what is a partial directory name in the next call
- if ( !basedir.endsWith( "/" ) )
+ if ( !basedir.endsWith( FS ) )
{
- basedir = basedir + "/";
+ basedir = basedir + FS;
}
basedir = StringUtils.getCommonPrefix( new String[]{dir, basedir} );
- if ( !basedir.endsWith( "/" ) )
+ if ( !basedir.endsWith( FS ) )
{
- basedir = basedir.substring( 0, basedir.lastIndexOf( '/' ) );
+ basedir = basedir.substring( 0, basedir.lastIndexOf( FS ) );
}
}
}
if ( basedir != null )
{
- if ( basedir.endsWith( "/" ) && basedir.length() > 1 )
+ if ( basedir.endsWith( FS ) && basedir.length() > 1 )
{
basedir = basedir.substring( 0, basedir.length() - 1 );
}