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/23 19:39:51 UTC
[maven-release] 02/05: Switch from commonbasedir to workingdirectory
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch Paths
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 39873364b62699bc8624bce10b2e1d86dbb49327
Author: rfscholte <rf...@apache.org>
AuthorDate: Fri Mar 23 16:15:56 2018 +0100
Switch from commonbasedir to workingdirectory
---
.../shared/release/phase/CheckoutProjectFromScm.java | 12 ++----------
.../maven/shared/release/DefaultReleaseManagerTest.java | 2 ++
.../AbstractEditModeRewritingReleasePhaseTestCase.java | 6 +++---
.../phase/AbstractRewritingReleasePhaseTestCase.java | 16 +++++-----------
.../shared/release/phase/CheckoutProjectFromScmTest.java | 6 ++++--
.../release/phase/RewritePomsForBranchPhaseTest.java | 6 +++---
.../phase/RewritePomsForDevelopmentPhaseTest.java | 2 +-
.../release/phase/RewritePomsForReleasePhaseTest.java | 6 +++---
8 files changed, 23 insertions(+), 33 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 7c8f274..5b7b9b9 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
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.LinkOption;
import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.List;
import org.apache.maven.project.MavenProject;
@@ -223,16 +224,7 @@ public class CheckoutProjectFromScm
String scmRelativePathProjectDirectory = scmResult.getRelativePathProjectDirectory();
if ( StringUtils.isEmpty( scmRelativePathProjectDirectory ) )
{
- Path basedir;
- try
- {
- basedir = ReleaseUtil.getCommonBasedir( reactorProjects );
- }
- catch ( IOException e )
- {
- throw new ReleaseExecutionException( "Exception occurred while calculating common basedir: "
- + e.getMessage(), e );
- }
+ Path basedir = Paths.get( releaseDescriptor.getWorkingDirectory() );
Path rootProjectBasedir;
try
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 47cc88b..11fe6c6 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
@@ -481,6 +481,7 @@ public class DefaultReleaseManagerTest
builder.setScmSourceUrl( "scm-url" );
File checkoutDirectory = getTestFile( "target/checkout-directory" );
builder.setCheckoutDirectory( checkoutDirectory.getAbsolutePath() );
+ builder.setWorkingDirectory( getTestPath( "target/dummy-project" ) );
ReleasePerformRequest performRequest = new ReleasePerformRequest();
performRequest.setReleaseDescriptorBuilder( builder );
@@ -677,6 +678,7 @@ public class DefaultReleaseManagerTest
builder.setScmSourceUrl( "scm-url" );
File checkoutDirectory = getTestFile( "target/checkout-directory" );
builder.setCheckoutDirectory( checkoutDirectory.getAbsolutePath() );
+ builder.setWorkingDirectory( getTestPath( "target/dummy-project" ) );
ScmManager scmManager = (ScmManager) lookup( ScmManager.class );
ScmProviderStub providerStub =
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java
index 9bc40d8..9abaec8 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java
@@ -66,7 +66,7 @@ public abstract class AbstractEditModeRewritingReleasePhaseTestCase
public void testRewriteBasicPomWithEditMode()
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
builder.setScmUseEditMode( true );
mapNextVersion( builder, "groupId:artifactId" );
@@ -80,7 +80,7 @@ public abstract class AbstractEditModeRewritingReleasePhaseTestCase
public void testRewriteBasicPomWithEditModeFailure()
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
builder.setScmUseEditMode( true );
mapNextVersion( builder, "groupId:artifactId" );
@@ -110,7 +110,7 @@ public abstract class AbstractEditModeRewritingReleasePhaseTestCase
throws Exception
{
// prepare
- List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
builder.setScmUseEditMode( true );
mapNextVersion( builder, "groupId:artifactId" );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
index afe16e6..a8f2dff 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
@@ -96,7 +96,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
public void testRewriteBasicPom()
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
mapNextVersion( builder, "groupId:artifactId" );
@@ -510,7 +510,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
throws Exception
{
// prepare
- List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
builder.setScmUseEditMode( true );
mapNextVersion( builder, "groupId:artifactId" );
@@ -534,7 +534,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
public void testRewriteUnmappedPom()
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
try
@@ -554,7 +554,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
throws Exception
{
// prepare
- List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
builder.setScmUseEditMode( true );
builder.setScmSourceUrl( "scm:svn:fail" );
@@ -583,7 +583,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
throws Exception
{
// prepare
- List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
builder.setScmUseEditMode( true );
builder.setScmSourceUrl( "scm:fail:path" );
@@ -701,12 +701,6 @@ public abstract class AbstractRewritingReleasePhaseTestCase
return builder;
}
- protected List<MavenProject> createReactorProjectsFromBasicPom()
- throws Exception
- {
- return createReactorProjects( "basic-pom" );
- }
-
protected abstract ReleaseDescriptorBuilder createConfigurationForWithParentNextVersion( List<MavenProject> reactorProjects )
throws Exception;
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java
index defcb17..82954e8 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java
@@ -97,6 +97,7 @@ public class CheckoutProjectFromScmTest
String dir = "scm-commit/single-pom";
List<MavenProject> reactorProjects = createReactorProjects( dir, dir, null );
+ builder.setWorkingDirectory( getWorkingDirectory( dir ) .toString() );
// execute
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -138,8 +139,8 @@ public class CheckoutProjectFromScmTest
stub.addScmRepositoryForUrl( scmUrl, repository );
String dir = "scm-commit/multimodule-with-deep-subprojects";
- List<MavenProject> reactorProjects =
- createReactorProjects( dir, dir, null );
+ List<MavenProject> reactorProjects = createReactorProjects( dir, dir, null );
+ builder.setWorkingDirectory( getWorkingDirectory( dir ) .toString() );
// execute
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -182,6 +183,7 @@ public class CheckoutProjectFromScmTest
List<MavenProject> reactorProjects =
createReactorProjects( "rewrite-for-release/pom-with-parent-flat", "root-project" );
+ builder.setWorkingDirectory( getWorkingDirectory( "rewrite-for-release/pom-with-parent-flat" ) .toString() );
// execute
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
index 6441794..5f337b8 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
@@ -77,7 +77,7 @@ public class RewritePomsForBranchPhaseTest
public void testSimulateRewrite()
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
builder.addReleaseVersion( "groupId:artifactId", NEXT_VERSION );
@@ -117,7 +117,7 @@ public class RewritePomsForBranchPhaseTest
public void testClean()
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
builder.addReleaseVersion( "groupId:artifactId", NEXT_VERSION );
@@ -138,7 +138,7 @@ public class RewritePomsForBranchPhaseTest
public void testCleanNotExists()
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
builder.addReleaseVersion( "groupId:artifactId", NEXT_VERSION );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
index 6409a1d..64fcb0c 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
@@ -142,7 +142,7 @@ public class RewritePomsForDevelopmentPhaseTest
public void testCleanNotExists()
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
File testFile = getTestFile( "target/test-classes/projects/rewrite-for-development/basic-pom/pom.xml.next" );
testFile.delete();
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
index 6afab3c..a65051d 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
@@ -78,7 +78,7 @@ public class RewritePomsForReleasePhaseTest
public void testSimulateRewrite()
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
builder.addReleaseVersion( "groupId:artifactId", NEXT_VERSION );
@@ -118,7 +118,7 @@ public class RewritePomsForReleasePhaseTest
public void testClean()
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
builder.addReleaseVersion( "groupId:artifactId", NEXT_VERSION );
@@ -139,7 +139,7 @@ public class RewritePomsForReleasePhaseTest
public void testCleanNotExists()
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
File testFile = getTestFile( "target/test-classes/projects/rewrite-for-release/basic-pom/pom.xml.tag" );
testFile.delete();
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.