You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/03/04 19:57:04 UTC
[maven-release] branch master updated: Revert "More Path
replacements"
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
The following commit(s) were added to refs/heads/master by this push:
new a1c8123 Revert "More Path replacements"
a1c8123 is described below
commit a1c8123696d03137b0e2817e80be0ec70712f424
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Mar 4 20:56:56 2018 +0100
Revert "More Path replacements"
This reverts commit 45cd37f5ef610f5f39c73d153c4ed481798e8ee8.
---
.../release/phase/CheckoutProjectFromScm.java | 18 +++++++++------
.../maven/shared/release/util/ReleaseUtil.java | 6 +++++
.../shared/release/DefaultReleaseManagerTest.java | 3 ++-
.../PropertiesReleaseDescriptorStoreTest.java | 13 ++++++-----
.../shared/release/config/ReleaseUtilsTest.java | 5 ++--
.../release/phase/AbstractReleaseTestCase.java | 7 ++++++
.../shared/release/phase/ScmBranchPhaseTest.java | 27 ++++++++++++++--------
.../shared/release/phase/ScmTagPhaseTest.java | 27 ++++++++++++++--------
8 files changed, 70 insertions(+), 36 deletions(-)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
index cbed6ea..60f78b8 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
@@ -21,7 +21,6 @@ package org.apache.maven.shared.release.phase;
import java.io.File;
import java.io.IOException;
-import java.nio.file.Path;
import java.util.List;
import org.apache.maven.project.MavenProject;
@@ -222,10 +221,10 @@ public class CheckoutProjectFromScm
String scmRelativePathProjectDirectory = scmResult.getRelativePathProjectDirectory();
if ( StringUtils.isEmpty( scmRelativePathProjectDirectory ) )
{
- Path basedir;
+ String basedir;
try
{
- basedir = ReleaseUtil.getCommonBasedir( reactorProjects );
+ basedir = ReleaseUtil.getCommonBasedir( reactorProjects ).toString();
}
catch ( IOException e )
{
@@ -233,17 +232,22 @@ public class CheckoutProjectFromScm
+ e.getMessage(), e );
}
- Path rootProjectBasedir;
+ String rootProjectBasedir = rootProject.getBasedir().getAbsolutePath();
try
{
- rootProjectBasedir = rootProject.getBasedir().toPath().toRealPath();
+ if ( ReleaseUtil.isSymlink( rootProject.getBasedir() ) )
+ {
+ rootProjectBasedir = rootProject.getBasedir().getCanonicalPath();
+ }
}
catch ( IOException e )
{
throw new ReleaseExecutionException( e.getMessage(), e );
}
-
- scmRelativePathProjectDirectory = basedir.relativize( rootProjectBasedir ).toString();
+ if ( rootProjectBasedir.length() > basedir.length() )
+ {
+ scmRelativePathProjectDirectory = rootProjectBasedir.substring( basedir.length() + 1 );
+ }
}
releaseDescriptor.setScmRelativePathProjectDirectory( scmRelativePathProjectDirectory );
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
index 2afd545..587a50c 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
@@ -243,6 +243,12 @@ public class ReleaseUtil
return url;
}
+ public static boolean isSymlink( File file )
+ throws IOException
+ {
+ return !file.getAbsolutePath().equals( file.getCanonicalPath() );
+ }
+
public static String interpolate( String value, Model model )
throws ReleaseExecutionException
{
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
index 11e7f83..142d49b 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
@@ -690,8 +690,9 @@ public class DefaultReleaseManagerTest
fail( "commit should have failed" );
}
- catch ( ReleaseExecutionException e )
+ catch ( ReleaseScmCommandException e )
{
+ assertNull( "check no other cause", e.getCause() );
}
}
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
index 394330e..35903ce 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
@@ -21,6 +21,7 @@ import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder.BuilderRe
* under the License.
*/
+import org.apache.maven.shared.release.phase.AbstractReleaseTestCase;
import org.apache.maven.shared.release.scm.IdentifiedScm;
import org.codehaus.plexus.PlexusTestCase;
import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
@@ -65,7 +66,7 @@ public class PropertiesReleaseDescriptorStoreTest
throws Exception
{
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
- builder.setWorkingDirectory( getTestFile( "target/test-classes" ).getAbsolutePath() );
+ builder.setWorkingDirectory( AbstractReleaseTestCase.getPath( getTestFile( "target/test-classes" ) ) );
ReleaseDescriptor config = store.read( builder ).build();
ReleaseDescriptorBuilder expected = createExpectedReleaseConfiguration();
@@ -144,12 +145,12 @@ public class PropertiesReleaseDescriptorStoreTest
file.getParentFile().mkdirs();
ReleaseDescriptorBuilder config = createReleaseConfigurationForWriting();
- config.setWorkingDirectory( file.getParentFile().getAbsolutePath() );
+ config.setWorkingDirectory( AbstractReleaseTestCase.getPath( file.getParentFile() ) );
store.write( config.build() );
ReleaseDescriptorBuilder rereadDescriptorBuilder = store.read( file );
- rereadDescriptorBuilder.setWorkingDirectory( file.getParentFile().getAbsolutePath() );
+ rereadDescriptorBuilder.setWorkingDirectory( AbstractReleaseTestCase.getPath( file.getParentFile() ) );
assertAndAdjustScmPassword( config, rereadDescriptorBuilder.build() );
assertAndAdjustScmPrivateKeyPassPhrase( config, rereadDescriptorBuilder.build() );
@@ -257,7 +258,7 @@ public class PropertiesReleaseDescriptorStoreTest
assertTrue( "Check file already exists", file.exists() );
ReleaseDescriptorBuilder config = createReleaseConfigurationForWriting();
- config.setWorkingDirectory( file.getParentFile().getAbsolutePath() );
+ config.setWorkingDirectory( AbstractReleaseTestCase.getPath( file.getParentFile() ) );
store.delete( config.build() );
@@ -273,7 +274,7 @@ public class PropertiesReleaseDescriptorStoreTest
assertFalse( "Check file already exists", file.exists() );
ReleaseDescriptorBuilder config = createReleaseConfigurationForWriting();
- config.setWorkingDirectory( file.getParentFile().getAbsolutePath() );
+ config.setWorkingDirectory( AbstractReleaseTestCase.getPath( file.getParentFile() ) );
store.delete( config.build() );
@@ -358,7 +359,7 @@ public class PropertiesReleaseDescriptorStoreTest
releaseDescriptor.setScmSourceUrl( "scm-url" );
releaseDescriptor.setScmUsername( "username" );
// Not setting other optional SCM settings for brevity
- releaseDescriptor.setWorkingDirectory( getTestFile( "target/test-working-directory" ).getAbsolutePath() );
+ releaseDescriptor.setWorkingDirectory( AbstractReleaseTestCase.getPath( getTestFile( "target/test-working-directory" ) ) );
// Not setting non-override setting completedPhase
return releaseDescriptor;
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
index a8212da..4cff313 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
@@ -24,6 +24,7 @@ import junit.framework.TestCase;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.model.Scm;
import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder.BuilderReleaseDescriptor;
+import org.apache.maven.shared.release.phase.AbstractReleaseTestCase;
import java.io.File;
import java.io.IOException;
@@ -133,7 +134,7 @@ public class ReleaseUtilsTest
if ( otherFile != null )
{
- configBuilder.setWorkingDirectory( otherFile.getAbsolutePath() );
+ configBuilder.setWorkingDirectory( AbstractReleaseTestCase.getPath( otherFile ) );
assertFalse( "Check original comparison", configBuilder.build().equals( origConfig ) );
}
@@ -264,7 +265,7 @@ public class ReleaseUtilsTest
{
File workingDirectory = new File( "." );
- return createReleaseDescriptor( workingDirectory.getAbsolutePath() );
+ return createReleaseDescriptor(AbstractReleaseTestCase.getPath( workingDirectory ) );
}
private static ReleaseDescriptorBuilder createReleaseDescriptor( String workingDirectory )
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
index ed9cfd1..96eadcd 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
@@ -58,6 +58,7 @@ import org.apache.maven.project.ProjectSorter;
import org.apache.maven.repository.internal.MavenRepositorySystemSession;
import org.apache.maven.shared.release.PlexusJUnit4TestCase;
import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder;
+import org.apache.maven.shared.release.util.ReleaseUtil;
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
import org.sonatype.aether.repository.WorkspaceReader;
import org.sonatype.aether.repository.WorkspaceRepository;
@@ -335,6 +336,12 @@ public abstract class AbstractReleaseTestCase
return "file://" + getTestFile( "src/test/remote-repository" ).getCanonicalPath().replace( '\\', '/' );
}
+ public static String getPath( File file )
+ throws IOException
+ {
+ return ReleaseUtil.isSymlink( file ) ? file.getCanonicalPath() : file.getAbsolutePath();
+ }
+
/**
* WorkspaceReader to find versions and artifacts from reactor
*/
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
index 505b963..9136cb2 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
@@ -31,6 +31,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
+import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
@@ -77,6 +78,12 @@ public class ScmBranchPhaseTest
phase = lookup( ReleasePhase.class, "scm-branch" );
}
+ public static String getPath( File file )
+ throws IOException
+ {
+ return ReleaseUtil.isSymlink( file ) ? file.getCanonicalPath() : file.getAbsolutePath();
+ }
+
@Test
public void testBranch()
throws Exception
@@ -86,7 +93,7 @@ public class ScmBranchPhaseTest
List<MavenProject> reactorProjects = createReactorProjects();
builder.setScmSourceUrl( "scm-url" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
- builder.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
+ builder.setWorkingDirectory( getPath( rootProject.getFile().getParentFile() ) );
builder.setScmReleaseLabel( "release-label" );
builder.setScmCommentPrefix( "[my prefix] " );
@@ -96,7 +103,7 @@ public class ScmBranchPhaseTest
when( scmProviderMock.branch( isA( ScmRepository.class ), argThat( new IsScmFileSetEquals( fileSet ) ),
eq( "release-label" ),
argThat( new IsScmBranchParametersEquals( new ScmBranchParameters( "[my prefix] copy for branch release-label" ) ) ) ) ).thenReturn( new BranchScmResult( "...",
- Collections.singletonList( new ScmFile( rootProject.getFile().getAbsolutePath(),
+ Collections.singletonList( new ScmFile( getPath( rootProject.getFile() ),
ScmFileStatus.TAGGED ) ) ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
@@ -124,7 +131,7 @@ public class ScmBranchPhaseTest
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
builder.setScmSourceUrl( scmUrl );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
- builder.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
+ builder.setWorkingDirectory( getPath( rootProject.getFile().getParentFile() ) );
builder.setScmReleaseLabel( "release-label" );
builder.setScmCommentPrefix( "[my prefix] " );
builder.setScmBranchBase( "http://svn.example.com/repos/project/branches/" );
@@ -138,7 +145,7 @@ public class ScmBranchPhaseTest
when( scmProviderMock.branch( eq( repository ), argThat( new IsScmFileSetEquals( fileSet ) ),
eq( "release-label" ),
argThat( new IsScmBranchParametersEquals( new ScmBranchParameters( "[my prefix] copy for branch release-label" ) ) ) ) ).thenReturn( new BranchScmResult( "...",
- Collections.singletonList( new ScmFile( rootProject.getFile().getAbsolutePath(),
+ Collections.singletonList( new ScmFile( getPath( rootProject.getFile() ),
ScmFileStatus.TAGGED ) ) ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
@@ -165,7 +172,7 @@ public class ScmBranchPhaseTest
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
builder.setScmSourceUrl( rootProject.getScm().getConnection() );
- builder.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
+ builder.setWorkingDirectory( getPath( rootProject.getFile().getParentFile() ) );
builder.setScmReleaseLabel( "release-label" );
builder.setScmCommentPrefix( "[my prefix] " );
@@ -179,7 +186,7 @@ public class ScmBranchPhaseTest
when( scmProviderMock.branch( eq( repository ), argThat( new IsScmFileSetEquals( fileSet ) ),
eq( "release-label" ),
argThat( new IsScmBranchParametersEquals( new ScmBranchParameters( "[my prefix] copy for branch release-label" ) ) ) ) ).thenReturn( new BranchScmResult( "...",
- Collections.singletonList( new ScmFile( rootProject.getFile().getAbsolutePath(),
+ Collections.singletonList( new ScmFile( getPath( rootProject.getFile() ),
ScmFileStatus.TAGGED ) ) ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
@@ -206,7 +213,7 @@ public class ScmBranchPhaseTest
List<MavenProject> reactorProjects = createReactorProjects( dir, dir, null );
builder.setScmSourceUrl( "scm-url" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
- builder.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
+ builder.setWorkingDirectory( getPath( rootProject.getFile().getParentFile() ) );
builder.setScmReleaseLabel( "release-label" );
builder.setScmCommentPrefix( "[my prefix] " );
@@ -216,7 +223,7 @@ public class ScmBranchPhaseTest
when( scmProviderMock.branch( isA( ScmRepository.class ), argThat( new IsScmFileSetEquals( fileSet ) ),
eq( "release-label" ),
argThat( new IsScmBranchParametersEquals( new ScmBranchParameters( "[my prefix] copy for branch release-label" ) ) ) ) ).thenReturn( new BranchScmResult( "...",
- Collections.singletonList( new ScmFile( rootProject.getFile().getAbsolutePath(),
+ Collections.singletonList( new ScmFile( getPath( rootProject.getFile() ),
ScmFileStatus.TAGGED ) ) ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
@@ -258,7 +265,7 @@ public class ScmBranchPhaseTest
List<MavenProject> reactorProjects = createReactorProjects();
builder.setScmSourceUrl( "scm-url" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
- builder.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
+ builder.setWorkingDirectory( getPath( rootProject.getFile().getParentFile() ) );
builder.setScmReleaseLabel( "release-label" );
ScmProvider scmProviderMock = mock( ScmProvider.class );
@@ -414,7 +421,7 @@ public class ScmBranchPhaseTest
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
builder.setScmSourceUrl( "scm-url" );
builder.setScmReleaseLabel( "release-label" );
- builder.setWorkingDirectory( getTestFile( "target/test/checkout" ).getAbsolutePath() );
+ builder.setWorkingDirectory( getPath( getTestFile( "target/test/checkout" ) ) );
return builder;
}
}
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
index c9ab753..1ac428b 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
@@ -31,6 +31,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
+import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
@@ -77,6 +78,12 @@ public class ScmTagPhaseTest
phase = (ReleasePhase) lookup( ReleasePhase.class, "scm-tag" );
}
+ public static String getPath( File file )
+ throws IOException
+ {
+ return ReleaseUtil.isSymlink( file ) ? file.getCanonicalPath() : file.getAbsolutePath();
+ }
+
@Test
public void testTag()
throws Exception
@@ -86,7 +93,7 @@ public class ScmTagPhaseTest
List<MavenProject> reactorProjects = createReactorProjects();
builder.setScmSourceUrl( "scm-url" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
- builder.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
+ builder.setWorkingDirectory( getPath( rootProject.getFile().getParentFile() ) );
builder.setScmReleaseLabel( "release-label" );
builder.setScmCommentPrefix( "[my prefix] " );
@@ -96,7 +103,7 @@ public class ScmTagPhaseTest
when( scmProviderMock.tag( isA( ScmRepository.class ), argThat( new IsScmFileSetEquals( fileSet ) ),
eq( "release-label" ),
argThat( new IsScmTagParametersEquals( new ScmTagParameters( "[my prefix] copy for tag release-label" ) ) ) ) ).thenReturn( new TagScmResult( "...",
- Collections.singletonList( new ScmFile( rootProject.getFile().getAbsolutePath(),
+ Collections.singletonList( new ScmFile( getPath( rootProject.getFile() ),
ScmFileStatus.TAGGED ) ) ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
@@ -123,7 +130,7 @@ public class ScmTagPhaseTest
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
builder.setScmSourceUrl( scmUrl );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
- builder.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
+ builder.setWorkingDirectory( getPath( rootProject.getFile().getParentFile() ) );
builder.setScmReleaseLabel( "release-label" );
builder.setScmCommentPrefix( "[my prefix] " );
builder.setScmTagBase( "http://svn.example.com/repos/project/releases/" );
@@ -137,7 +144,7 @@ public class ScmTagPhaseTest
when( scmProviderMock.tag( eq( repository ), argThat( new IsScmFileSetEquals( fileSet ) ),
eq( "release-label" ),
argThat( new IsScmTagParametersEquals( new ScmTagParameters( "[my prefix] copy for tag release-label" ) ) ) ) ).thenReturn( new TagScmResult( "...",
- Collections.singletonList( new ScmFile( rootProject.getFile().getAbsolutePath(),
+ Collections.singletonList( new ScmFile( getPath( rootProject.getFile() ),
ScmFileStatus.TAGGED ) ) ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
@@ -164,7 +171,7 @@ public class ScmTagPhaseTest
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
builder.setScmSourceUrl( rootProject.getScm().getConnection() );
- builder.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
+ builder.setWorkingDirectory( getPath( rootProject.getFile().getParentFile() ) );
builder.setScmReleaseLabel( "release-label" );
builder.setScmCommentPrefix( "[my prefix] " );
@@ -178,7 +185,7 @@ public class ScmTagPhaseTest
when( scmProviderMock.tag( eq( repository ), argThat( new IsScmFileSetEquals( fileSet ) ),
eq( "release-label" ),
argThat( new IsScmTagParametersEquals( new ScmTagParameters( "[my prefix] copy for tag release-label" ) ) ) ) ).thenReturn( new TagScmResult( "...",
- Collections.singletonList( new ScmFile( rootProject.getFile().getAbsolutePath(),
+ Collections.singletonList( new ScmFile( getPath( rootProject.getFile() ),
ScmFileStatus.TAGGED ) ) ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
@@ -205,7 +212,7 @@ public class ScmTagPhaseTest
List<MavenProject> reactorProjects = createReactorProjects( dir, dir, null );
builder.setScmSourceUrl( "scm-url" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
- builder.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
+ builder.setWorkingDirectory( getPath( rootProject.getFile().getParentFile() ) );
builder.setScmReleaseLabel( "release-label" );
builder.setScmCommentPrefix( "[my prefix] " );
@@ -215,7 +222,7 @@ public class ScmTagPhaseTest
when( scmProviderMock.tag( isA( ScmRepository.class ), argThat( new IsScmFileSetEquals( fileSet ) ),
eq( "release-label" ),
argThat( new IsScmTagParametersEquals( new ScmTagParameters( "[my prefix] copy for tag release-label" ) ) ) ) ).thenReturn( new TagScmResult( "...",
- Collections.singletonList( new ScmFile( rootProject.getFile().getAbsolutePath(),
+ Collections.singletonList( new ScmFile( getPath( rootProject.getFile() ),
ScmFileStatus.TAGGED ) ) ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
@@ -257,7 +264,7 @@ public class ScmTagPhaseTest
List<MavenProject> reactorProjects = createReactorProjects();
builder.setScmSourceUrl( "scm-url" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
- builder.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
+ builder.setWorkingDirectory( getPath( rootProject.getFile().getParentFile() ) );
builder.setScmReleaseLabel( "release-label" );
ScmProvider scmProviderMock = mock( ScmProvider.class );
@@ -411,7 +418,7 @@ public class ScmTagPhaseTest
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
builder.setScmSourceUrl( "scm-url" );
builder.setScmReleaseLabel( "release-label" );
- builder.setWorkingDirectory( getTestFile( "target/test/checkout" ).getAbsolutePath() );
+ builder.setWorkingDirectory( getPath( getTestFile( "target/test/checkout" ) ) );
return builder;
}
}
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.