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:49 UTC
[maven-release] branch Paths updated (f6ad39e -> 1610ccb)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch Paths
in repository https://gitbox.apache.org/repos/asf/maven-release.git.
from f6ad39e Optimize Path usage
new 249de32 Remove unused parameter
new 3987336 Switch from commonbasedir to workingdirectory
new 2a30602 Prepare usage of workingDirectory in tests
new e375f16 RewritePomsForReleasePhase uses workingDirectory instead of commonBasedir
new 1610ccb Remove usage commonBasedir from RewritePhases
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../release/phase/AbstractRewritePomsPhase.java | 32 ++++---------
.../release/phase/CheckoutProjectFromScm.java | 12 +----
.../release/phase/RewritePomVersionsPhase.java | 5 +-
.../release/phase/RewritePomsForBranchPhase.java | 16 +++----
.../phase/RewritePomsForDevelopmentPhase.java | 5 +-
.../release/phase/RewritePomsForReleasePhase.java | 18 ++++----
.../shared/release/DefaultReleaseManagerTest.java | 2 +
...tractEditModeRewritingReleasePhaseTestCase.java | 7 +--
.../release/phase/AbstractReleaseTestCase.java | 7 ++-
.../AbstractRewritingReleasePhaseTestCase.java | 29 ++++++------
.../release/phase/CheckoutProjectFromScmTest.java | 6 ++-
.../phase/GenerateReleasePomsPhaseTest.java | 6 +--
.../phase/RewritePomsForBranchPhaseTest.java | 52 +++++++++++++++------
.../phase/RewritePomsForDevelopmentPhaseTest.java | 15 ++++--
.../phase/RewritePomsForReleasePhaseTest.java | 54 +++++++++++++++-------
15 files changed, 149 insertions(+), 117 deletions(-)
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.
[maven-release] 03/05: Prepare usage of workingDirectory in tests
Posted by rf...@apache.org.
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 2a30602ab1caff4123892aba4ea77c9d78b01eb0
Author: rfscholte <rf...@apache.org>
AuthorDate: Fri Mar 23 17:58:57 2018 +0100
Prepare usage of workingDirectory in tests
---
.../maven/shared/release/phase/AbstractReleaseTestCase.java | 10 +++++-----
.../shared/release/phase/GenerateReleasePomsPhaseTest.java | 4 +---
.../shared/release/phase/RewritePomsForBranchPhaseTest.java | 11 +++++++++--
.../release/phase/RewritePomsForDevelopmentPhaseTest.java | 11 +++++++++--
.../shared/release/phase/RewritePomsForReleasePhaseTest.java | 12 ++++++++++--
5 files changed, 34 insertions(+), 14 deletions(-)
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 40334be..2ddee24 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
@@ -98,6 +98,11 @@ public abstract class AbstractReleaseTestCase
localRepository = new MavenArtifactRepository( "local", "file://" + localRepoPath, layout, null, null );
}
+ protected Path getWorkingDirectory( String workingDir )
+ {
+ return Paths.get( getBasedir(), "target/test-classes" ).resolve( Paths.get( "projects", workingDir ) ) ;
+ }
+
protected List<MavenProject> createReactorProjects( String path, String subpath )
throws Exception
{
@@ -207,11 +212,6 @@ public abstract class AbstractReleaseTestCase
return resolvedProjects;
}
- protected final Path getWorkingDirectory( String workingDir )
- {
- return Paths.get( getBasedir(), "target/test-classes" ).resolve( Paths.get( "projects", workingDir ) ) ;
- }
-
protected static Map<String,MavenProject> getProjectsAsMap( List<MavenProject> reactorProjects )
{
Map<String,MavenProject> map = new HashMap<>();
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
index 706ce99..1dee628 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
@@ -188,10 +188,8 @@ public class GenerateReleasePomsPhaseTest
List<File> releasePoms = new ArrayList<>();
- for ( Iterator<MavenProject> iterator = reactorProjects.iterator(); iterator.hasNext(); )
+ for ( MavenProject project : reactorProjects )
{
- MavenProject project = iterator.next();
-
releasePoms.add( ReleaseUtil.getReleasePom( project ) );
}
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 5f337b8..875327f 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
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.List;
import java.util.Objects;
@@ -59,11 +60,17 @@ public class RewritePomsForBranchPhaseTest
}
@Override
+ protected Path getWorkingDirectory( String workingDir )
+ {
+ return super.getWorkingDirectory( "rewrite-for-branch/" + workingDir );
+ }
+
+ @Override
protected List<MavenProject> prepareReactorProjects( String path )
throws Exception
{
String dir = "rewrite-for-branch/" + Objects.toString( path, "" );
- return createReactorProjects( dir, dir, null );
+ return createReactorProjects( dir, path, null );
}
@Override
@@ -407,7 +414,7 @@ public class RewritePomsForBranchPhaseTest
throws Exception
{
List<MavenProject> reactorProjects =
- createReactorProjects( "rewrite-for-branch/pom-with-parent-flat", "root-project" );
+ createReactorProjects( "rewrite-for-branch/pom-with-parent-flat", "pom-with-parent-flat", "root-project" );
ReleaseDescriptorBuilder builder = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
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 64fcb0c..17d46bc 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
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.LinkedList;
import java.util.List;
@@ -63,6 +64,12 @@ public class RewritePomsForDevelopmentPhaseTest
{
return "rewrite-poms-for-development";
}
+
+ @Override
+ protected Path getWorkingDirectory( String workingDir )
+ {
+ return super.getWorkingDirectory( "rewrite-for-development/" + workingDir );
+ }
@Test
public void testSimulateRewrite()
@@ -88,7 +95,7 @@ public class RewritePomsForDevelopmentPhaseTest
private List<MavenProject> createReactorProjectsWhenSimulated( String name )
throws Exception
{
- return createReactorProjects( "rewrite-for-release/" + name, "rewrite-for-development/" + name, null );
+ return createReactorProjects( "rewrite-for-release/" + name, name, null );
}
@Test
@@ -171,7 +178,7 @@ public class RewritePomsForDevelopmentPhaseTest
throws Exception
{
String dir = "rewrite-for-development/" + path;
- return createReactorProjects( dir, dir, null );
+ return createReactorProjects( dir, path, null );
}
@Override
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 a65051d..c83b978 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
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
@@ -58,13 +59,20 @@ public class RewritePomsForReleasePhaseTest
{
return "rewrite-poms-for-release";
}
+
+ @Override
+ protected Path getWorkingDirectory( String workingDir )
+ {
+ return super.getWorkingDirectory( "rewrite-for-release/" + workingDir );
+ }
+
@Override
protected List<MavenProject> prepareReactorProjects( String path )
throws Exception
{
String dir = "rewrite-for-release/" + Objects.toString( path, "" );
- return createReactorProjects( dir, dir, null );
+ return createReactorProjects( dir, path, null );
}
@Override
@@ -408,7 +416,7 @@ public class RewritePomsForReleasePhaseTest
throws Exception
{
List<MavenProject> reactorProjects =
- createReactorProjects( "rewrite-for-release/pom-with-parent-flat", "root-project" );
+ createReactorProjects( "rewrite-for-release/pom-with-parent-flat", "pom-with-parent-flat", "root-project" );
ReleaseDescriptorBuilder builder = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.
[maven-release] 01/05: Remove unused parameter
Posted by rf...@apache.org.
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 249de32e3e50f470bf34c6d8c97ce1eb3c3f4e77
Author: rfscholte <rf...@apache.org>
AuthorDate: Fri Mar 23 15:48:13 2018 +0100
Remove unused parameter
---
.../apache/maven/shared/release/phase/AbstractReleaseTestCase.java | 7 ++++++-
.../release/phase/AbstractRewritingReleasePhaseTestCase.java | 6 +++---
.../maven/shared/release/phase/GenerateReleasePomsPhaseTest.java | 2 +-
.../maven/shared/release/phase/RewritePomsForBranchPhaseTest.java | 2 +-
.../shared/release/phase/RewritePomsForDevelopmentPhaseTest.java | 2 +-
.../maven/shared/release/phase/RewritePomsForReleasePhaseTest.java | 2 +-
6 files changed, 13 insertions(+), 8 deletions(-)
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 0df6781..40334be 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
@@ -127,7 +127,7 @@ public abstract class AbstractReleaseTestCase
{
final Path testCaseRootFrom = Paths.get( getBasedir(), "src/test/resources" ).resolve( Paths.get( "projects", sourcePath ) ) ;
- final Path testCaseRootTo = Paths.get( getBasedir(), "target/test-classes" ).resolve( Paths.get( "projects", targetPath ) ) ;
+ final Path testCaseRootTo = getWorkingDirectory( targetPath );
// Recopy the test resources since they are modified in some tests
Files.walkFileTree( testCaseRootFrom, new SimpleFileVisitor<Path>() {
@@ -207,6 +207,11 @@ public abstract class AbstractReleaseTestCase
return resolvedProjects;
}
+ protected final Path getWorkingDirectory( String workingDir )
+ {
+ return Paths.get( getBasedir(), "target/test-classes" ).resolve( Paths.get( "projects", workingDir ) ) ;
+ }
+
protected static Map<String,MavenProject> getProjectsAsMap( List<MavenProject> reactorProjects )
{
Map<String,MavenProject> map = new HashMap<>();
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 b28fa91..afe16e6 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
@@ -490,7 +490,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
for ( int i = 0; i < 2; i++ )
{
String path = "basic-pom";
- List<MavenProject> reactorProjects = prepareReactorProjects( path, copyFiles );
+ List<MavenProject> reactorProjects = prepareReactorProjects( path );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
mapNextVersion( builder, "groupId:artifactId" );
builder.setAddSchema( true );
@@ -671,7 +671,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
protected List<MavenProject> createReactorProjects( String path )
throws Exception
{
- return prepareReactorProjects( path, true );
+ return prepareReactorProjects( path );
}
protected ReleaseDescriptorBuilder createDefaultConfiguration( List<MavenProject> reactorProjects )
@@ -735,7 +735,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
assertTrue( comparePomFiles( reactorProjects ) );
}
- protected abstract List<MavenProject> prepareReactorProjects( String path, boolean copyFiles )
+ protected abstract List<MavenProject> prepareReactorProjects( String path )
throws Exception;
protected void verifyReactorProjects( String path, boolean copyFiles )
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
index 744e143..706ce99 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
@@ -178,7 +178,7 @@ public class GenerateReleasePomsPhaseTest
* String, boolean)
*/
@Override
- protected List<MavenProject> prepareReactorProjects( String path, boolean copyFiles )
+ protected List<MavenProject> prepareReactorProjects( String path )
throws Exception
{
String dir = "generate-release-poms/" + path;
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 0eff85c..6441794 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
@@ -59,7 +59,7 @@ public class RewritePomsForBranchPhaseTest
}
@Override
- protected List<MavenProject> prepareReactorProjects( String path, boolean copyFiles )
+ protected List<MavenProject> prepareReactorProjects( String path )
throws Exception
{
String dir = "rewrite-for-branch/" + Objects.toString( path, "" );
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 5fcc549..6409a1d 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
@@ -167,7 +167,7 @@ public class RewritePomsForDevelopmentPhaseTest
}
@Override
- protected List<MavenProject> prepareReactorProjects( String path, boolean copyFiles )
+ protected List<MavenProject> prepareReactorProjects( String path )
throws Exception
{
String dir = "rewrite-for-development/" + path;
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 ebe9ef0..6afab3c 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
@@ -60,7 +60,7 @@ public class RewritePomsForReleasePhaseTest
}
@Override
- protected List<MavenProject> prepareReactorProjects( String path, boolean copyFiles )
+ protected List<MavenProject> prepareReactorProjects( String path )
throws Exception
{
String dir = "rewrite-for-release/" + Objects.toString( path, "" );
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.
[maven-release] 05/05: Remove usage commonBasedir from RewritePhases
Posted by rf...@apache.org.
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 1610ccb654613ce8d04853268a76826c133fa484
Author: rfscholte <rf...@apache.org>
AuthorDate: Fri Mar 23 20:39:34 2018 +0100
Remove usage commonBasedir from RewritePhases
---
.../release/phase/AbstractRewritePomsPhase.java | 32 +++++-----------
.../release/phase/RewritePomVersionsPhase.java | 5 +--
.../release/phase/RewritePomsForBranchPhase.java | 16 ++++----
.../phase/RewritePomsForDevelopmentPhase.java | 5 +--
.../release/phase/RewritePomsForReleasePhase.java | 14 +++----
.../phase/RewritePomsForBranchPhaseTest.java | 44 ++++++++++++++++------
6 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
index 6a8a116..6b1dfc2 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
@@ -20,8 +20,6 @@ package org.apache.maven.shared.release.phase;
*/
import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -168,28 +166,17 @@ public abstract class AbstractRewritePomsPhase
List<MavenProject> reactorProjects, boolean simulate, ReleaseResult result )
throws ReleaseExecutionException, ReleaseFailureException
{
- Path commonBasedir;
- try
- {
- commonBasedir = ReleaseUtil.getCommonBasedir( reactorProjects );
- }
- catch ( IOException e )
- {
- throw new ReleaseExecutionException( "Exception occurred while calculating common basedir: "
- + e.getMessage(), e );
- }
-
for ( MavenProject project : reactorProjects )
{
logInfo( result, "Transforming '" + project.getName() + "'..." );
- transformProject( project, releaseDescriptor, releaseEnvironment, commonBasedir, simulate, result );
+ transformProject( project, releaseDescriptor, releaseEnvironment, simulate, result );
}
}
private void transformProject( MavenProject project, ReleaseDescriptor releaseDescriptor,
- ReleaseEnvironment releaseEnvironment, Path commonBasedir,
- boolean simulate, ReleaseResult result )
+ ReleaseEnvironment releaseEnvironment, boolean simulate,
+ ReleaseResult result )
throws ReleaseExecutionException, ReleaseFailureException
{
File pomFile = ReleaseUtil.getStandardPom( project );
@@ -225,8 +212,8 @@ public abstract class AbstractRewritePomsPhase
}
}
- transformDocument( project, etl.getModel(), releaseDescriptor, commonBasedir, scmRepository,
- result, simulate );
+ transformDocument( project, etl.getModel(), releaseDescriptor, scmRepository, result,
+ simulate );
File outputFile;
if ( simulate )
@@ -243,8 +230,8 @@ public abstract class AbstractRewritePomsPhase
}
private void transformDocument( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
- Path commonBasedir, ScmRepository scmRepository,
- ReleaseResult result, boolean simulate )
+ ScmRepository scmRepository, ReleaseResult result,
+ boolean simulate )
throws ReleaseExecutionException, ReleaseFailureException
{
Model model = project.getModel();
@@ -337,8 +324,7 @@ public abstract class AbstractRewritePomsPhase
}
}
- transformScm( project, modelTarget, releaseDescriptor, projectId, scmRepository, result,
- commonBasedir );
+ transformScm( project, modelTarget, releaseDescriptor, projectId, scmRepository, result );
}
private void rewriteVersion( Model modelTarget, ReleaseDescriptor releaseDescriptor, String projectId,
@@ -567,7 +553,7 @@ public abstract class AbstractRewritePomsPhase
protected abstract void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
String projectId, ScmRepository scmRepository,
- ReleaseResult result, Path commonBasedir )
+ ReleaseResult result )
throws ReleaseExecutionException;
/**
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
index 2bbd7b6..95d06db 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
@@ -19,8 +19,6 @@ package org.apache.maven.shared.release.phase;
* under the License.
*/
-import java.nio.file.Path;
-
import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.repository.ScmRepository;
@@ -46,8 +44,7 @@ public class RewritePomVersionsPhase
@Override
protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
- String projectId, ScmRepository scmRepository, ReleaseResult result,
- Path commonBasedir )
+ String projectId, ScmRepository scmRepository, ReleaseResult result )
throws ReleaseExecutionException
{
// We are only updating versions no mods to scm needed
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
index 5259603..82e61b4 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
@@ -22,6 +22,7 @@ package org.apache.maven.shared.release.phase;
import java.io.IOException;
import java.nio.file.LinkOption;
import java.nio.file.Path;
+import java.nio.file.Paths;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.model.Model;
@@ -53,8 +54,7 @@ public class RewritePomsForBranchPhase
@Override
protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
- String projectId, ScmRepository scmRepository, ReleaseResult result,
- Path commonBasedir )
+ String projectId, ScmRepository scmRepository, ReleaseResult result )
throws ReleaseExecutionException
{
// If SCM is null in original model, it is inherited, no mods needed
@@ -66,7 +66,7 @@ public class RewritePomsForBranchPhase
{
try
{
- translateScm( project, releaseDescriptor, scmRoot, scmRepository, result, commonBasedir );
+ translateScm( project, releaseDescriptor, scmRoot, scmRepository, result );
}
catch ( IOException e )
{
@@ -90,8 +90,7 @@ public class RewritePomsForBranchPhase
try
{
- if ( translateScm( project, releaseDescriptor, scmRoot, scmRepository, result,
- commonBasedir ) )
+ if ( translateScm( project, releaseDescriptor, scmRoot, scmRepository, result ) )
{
modelTarget.setScm( scmRoot );
}
@@ -107,7 +106,7 @@ public class RewritePomsForBranchPhase
}
private boolean translateScm( MavenProject project, ReleaseDescriptor releaseDescriptor, Scm scmTarget,
- ScmRepository scmRepository, ReleaseResult relResult, Path commonBasedir )
+ ScmRepository scmRepository, ReleaseResult relResult )
throws IOException
{
ScmTranslator translator = getScmTranslators().get( scmRepository.getProvider() );
@@ -129,9 +128,10 @@ public class RewritePomsForBranchPhase
branchBase = "scm:svn:" + branchBase;
}
- Path workingDirectory = project.getBasedir().toPath().toRealPath( LinkOption.NOFOLLOW_LINKS );
+ Path projectBasedir = project.getBasedir().toPath().toRealPath( LinkOption.NOFOLLOW_LINKS );
+ Path workingDirectory = Paths.get( releaseDescriptor.getWorkingDirectory() );
- int count = ReleaseUtil.getBaseWorkingDirectoryParentCount( commonBasedir, workingDirectory );
+ int count = ReleaseUtil.getBaseWorkingDirectoryParentCount( workingDirectory, projectBasedir );
if ( scm.getConnection() != null )
{
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
index 3c6aa82..834ca0e 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
@@ -19,8 +19,6 @@ package org.apache.maven.shared.release.phase;
* under the License.
*/
-import java.nio.file.Path;
-
import org.apache.maven.model.Model;
import org.apache.maven.model.Scm;
import org.apache.maven.project.MavenProject;
@@ -48,8 +46,7 @@ public class RewritePomsForDevelopmentPhase
@Override
protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
- String projectId, ScmRepository scmRepository, ReleaseResult result,
- Path commonBasedir )
+ String projectId, ScmRepository scmRepository, ReleaseResult result )
throws ReleaseExecutionException
{
// If SCM is null in original model, it is inherited, no mods needed
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
index 83ad4c3..cc36600 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
@@ -53,8 +53,7 @@ public class RewritePomsForReleasePhase
@Override
protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
- String projectId, ScmRepository scmRepository, ReleaseResult result,
- Path commonBasedir )
+ String projectId, ScmRepository scmRepository, ReleaseResult result )
throws ReleaseExecutionException
{
// If SCM is null in original model, it is inherited, no mods needed
@@ -65,7 +64,7 @@ public class RewritePomsForReleasePhase
{
try
{
- translateScm( project, releaseDescriptor, scmRoot, scmRepository, result, commonBasedir );
+ translateScm( project, releaseDescriptor, scmRoot, scmRepository, result );
}
catch ( IOException e )
{
@@ -89,8 +88,7 @@ public class RewritePomsForReleasePhase
try
{
- if ( translateScm( project, releaseDescriptor, scmTarget, scmRepository, result,
- commonBasedir ) )
+ if ( translateScm( project, releaseDescriptor, scmTarget, scmRepository, result ) )
{
modelTarget.setScm( scmTarget );
}
@@ -106,7 +104,7 @@ public class RewritePomsForReleasePhase
}
private boolean translateScm( MavenProject project, ReleaseDescriptor releaseDescriptor, Scm scmTarget,
- ScmRepository scmRepository, ReleaseResult relResult, Path commonBasedir )
+ ScmRepository scmRepository, ReleaseResult relResult )
throws IOException
{
ScmTranslator translator = getScmTranslators().get( scmRepository.getProvider() );
@@ -131,8 +129,8 @@ public class RewritePomsForReleasePhase
Path projectBasedir = project.getBasedir().toPath().toRealPath( LinkOption.NOFOLLOW_LINKS );
Path workingDirectory = Paths.get( releaseDescriptor.getWorkingDirectory() );
- int count =
- ReleaseUtil.getBaseWorkingDirectoryParentCount( workingDirectory, projectBasedir );
+ int count = ReleaseUtil.getBaseWorkingDirectoryParentCount( workingDirectory, projectBasedir );
+
if ( scm.getConnection() != null )
{
String rootUrl = ReleaseUtil.realignScmUrl( count, scm.getConnection() );
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 5f337b8..9840d3e 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
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.List;
import java.util.Objects;
@@ -59,11 +60,17 @@ public class RewritePomsForBranchPhaseTest
}
@Override
+ protected Path getWorkingDirectory( String workingDir )
+ {
+ return super.getWorkingDirectory( "rewrite-for-branch/" + workingDir );
+ }
+
+ @Override
protected List<MavenProject> prepareReactorProjects( String path )
throws Exception
{
String dir = "rewrite-for-branch/" + Objects.toString( path, "" );
- return createReactorProjects( dir, dir, null );
+ return createReactorProjects( dir, path, null );
}
@Override
@@ -79,6 +86,7 @@ public class RewritePomsForBranchPhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
+ builder.setWorkingDirectory( getWorkingDirectory( "basic-pom" ).toString() );
builder.addReleaseVersion( "groupId:artifactId", NEXT_VERSION );
String expected = readTestProjectFile( "basic-pom/pom.xml" );
@@ -99,6 +107,7 @@ public class RewritePomsForBranchPhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-dashes-in-comment" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
+ builder.setWorkingDirectory( getWorkingDirectory( "basic-pom-with-dashes-in-comment" ).toString() );
builder.addReleaseVersion( "groupId:artifactId", NEXT_VERSION );
String expected = readTestProjectFile( "basic-pom-with-dashes-in-comment/pom.xml" );
@@ -158,6 +167,7 @@ public class RewritePomsForBranchPhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "pom-with-overridden-scm" );
ReleaseDescriptorBuilder builder = createConfigurationForWithParentNextVersion( reactorProjects );
+ builder.setWorkingDirectory( getWorkingDirectory( "pom-with-overridden-scm" ).toString() );
builder.addReleaseVersion( "groupId:subsubproject", NEXT_VERSION );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -225,7 +235,7 @@ public class RewritePomsForBranchPhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-scm-expression" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-scm-expression" );
mapNextVersion( builder, "groupId:artifactId" );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -239,7 +249,7 @@ public class RewritePomsForBranchPhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-tag-base" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-tag-base" );
builder.setScmBranchBase( "file://localhost/tmp/scm-repo/branches" );
mapNextVersion( builder, "groupId:artifactId" );
@@ -253,7 +263,7 @@ public class RewritePomsForBranchPhaseTest
throws Exception
{
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-tag-base-and-varying-scm-urls" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-tag-base-and-varying-scm-urls" );
builder.setScmBranchBase( "file://localhost/tmp/scm-repo/allprojects/branches" );
mapNextVersion( builder, "groupId:artifactId" );
@@ -280,7 +290,7 @@ public class RewritePomsForBranchPhaseTest
throws Exception
{
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-empty-scm" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-empty-scm" );
mapNextVersion( builder, "groupId:artifactId" );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -330,6 +340,7 @@ public class RewritePomsForBranchPhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-inherited-scm" );
ReleaseDescriptorBuilder builder = createConfigurationForWithParentNextVersion( reactorProjects );
+ builder.setWorkingDirectory( getWorkingDirectory( "basic-pom-inherited-scm" ).toString() );
builder.addReleaseVersion( "groupId:subsubproject", NEXT_VERSION );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -343,7 +354,7 @@ public class RewritePomsForBranchPhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "pom-with-parent-and-properties" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "pom-with-parent-and-properties" );
builder.addReleaseVersion( "groupId:artifactId", NEXT_VERSION );
builder.addReleaseVersion( "groupId:subproject1", ALTERNATIVE_NEXT_VERSION );
builder.addReleaseVersion( "groupId:subproject2", ALTERNATIVE_NEXT_VERSION );
@@ -360,7 +371,7 @@ public class RewritePomsForBranchPhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "pom-with-property-dependency-coordinate" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "pom-with-property-dependency-coordinate" );
builder.addReleaseVersion( "groupId:artifactId", NEXT_VERSION );
builder.addReleaseVersion( "groupId:subproject1-3.4", ALTERNATIVE_NEXT_VERSION );
builder.addReleaseVersion( "groupId:subproject2", ALTERNATIVE_NEXT_VERSION );
@@ -377,7 +388,7 @@ public class RewritePomsForBranchPhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "pom-with-scm-of-parent-ending-with-a-slash" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "pom-with-scm-of-parent-ending-with-a-slash" );
builder.addReleaseVersion( "groupId:artifactId", NEXT_VERSION );
builder.addReleaseVersion( "groupId:subproject1", ALTERNATIVE_NEXT_VERSION );
@@ -392,7 +403,7 @@ public class RewritePomsForBranchPhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "multimodule-with-deep-subprojects" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "multimodule-with-deep-subprojects" );
builder.addReleaseVersion( "groupId:artifactId", NEXT_VERSION );
builder.addReleaseVersion( "groupId:subproject1", ALTERNATIVE_NEXT_VERSION );
builder.addReleaseVersion( "groupId:subproject2", ALTERNATIVE_NEXT_VERSION );
@@ -407,8 +418,9 @@ public class RewritePomsForBranchPhaseTest
throws Exception
{
List<MavenProject> reactorProjects =
- createReactorProjects( "rewrite-for-branch/pom-with-parent-flat", "root-project" );
+ createReactorProjects( "rewrite-for-branch/pom-with-parent-flat", "pom-with-parent-flat", "root-project" );
ReleaseDescriptorBuilder builder = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
+ builder.setWorkingDirectory( getWorkingDirectory( "pom-with-parent-flat" ).toString() );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -421,7 +433,7 @@ public class RewritePomsForBranchPhaseTest
throws Exception
{
List<MavenProject> reactorProjects = createReactorProjects( "cdata-section" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "cdata-section" );
mapNextVersion( builder, "groupId:artifactId" );
AbstractRewritePomsPhase phase = (AbstractRewritePomsPhase) this.phase;
@@ -433,12 +445,22 @@ public class RewritePomsForBranchPhaseTest
}
@Override
+ @Deprecated
protected ReleaseDescriptorBuilder createDescriptorFromProjects( List<MavenProject> reactorProjects )
{
ReleaseDescriptorBuilder builder = super.createDescriptorFromProjects( reactorProjects );
builder.setScmReleaseLabel( "release-label" );
return builder;
}
+
+ protected ReleaseDescriptorBuilder createDescriptorFromProjects( List<MavenProject> reactorProjects, String workingDirectory )
+ {
+ ReleaseDescriptorBuilder builder = super.createDescriptorFromProjects( reactorProjects );
+ builder.setWorkingDirectory( getWorkingDirectory( workingDirectory ).toString() );
+ builder.setScmReleaseLabel( "release-label" );
+ return builder;
+ }
+
// MRELEASE-454
@Test
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.
[maven-release] 04/05: RewritePomsForReleasePhase uses
workingDirectory instead of commonBasedir
Posted by rf...@apache.org.
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 e375f1616d244acd12f17277f0e2df885d52067f
Author: rfscholte <rf...@apache.org>
AuthorDate: Fri Mar 23 20:05:19 2018 +0100
RewritePomsForReleasePhase uses workingDirectory instead of commonBasedir
---
.../release/phase/RewritePomsForReleasePhase.java | 6 ++--
...tractEditModeRewritingReleasePhaseTestCase.java | 1 +
.../AbstractRewritingReleasePhaseTestCase.java | 7 +++++
.../phase/RewritePomsForBranchPhaseTest.java | 11 ++-----
.../phase/RewritePomsForReleasePhaseTest.java | 34 +++++++++++++++-------
5 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
index 2c90bd3..83ad4c3 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
@@ -22,6 +22,7 @@ package org.apache.maven.shared.release.phase;
import java.io.IOException;
import java.nio.file.LinkOption;
import java.nio.file.Path;
+import java.nio.file.Paths;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.model.Model;
@@ -127,10 +128,11 @@ public class RewritePomsForReleasePhase
tagBase = "scm:svn:" + tagBase;
}
- Path workingDirectory = project.getBasedir().toPath().toRealPath( LinkOption.NOFOLLOW_LINKS );
+ Path projectBasedir = project.getBasedir().toPath().toRealPath( LinkOption.NOFOLLOW_LINKS );
+ Path workingDirectory = Paths.get( releaseDescriptor.getWorkingDirectory() );
int count =
- ReleaseUtil.getBaseWorkingDirectoryParentCount( commonBasedir, workingDirectory );
+ ReleaseUtil.getBaseWorkingDirectoryParentCount( workingDirectory, projectBasedir );
if ( scm.getConnection() != null )
{
String rootUrl = ReleaseUtil.realignScmUrl( count, scm.getConnection() );
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 9abaec8..040f98d 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
@@ -68,6 +68,7 @@ public abstract class AbstractEditModeRewritingReleasePhaseTestCase
{
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
+ builder.setWorkingDirectory( getWorkingDirectory( "basic-pom" ).toString() );
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 a8f2dff..0e2b10b 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
@@ -98,6 +98,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
{
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
+ builder.setWorkingDirectory( getWorkingDirectory( "basic-pom" ).toString() );
mapNextVersion( builder, "groupId:artifactId" );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -137,6 +138,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
{
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-encoding" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
+ builder.setWorkingDirectory( getWorkingDirectory( "basic-pom-with-encoding" ).toString() );
mapNextVersion( builder, "groupId:artifactId" );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -150,6 +152,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
{
List<MavenProject> reactorProjects = createReactorProjects( "pom-with-parent" );
ReleaseDescriptorBuilder builder = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
+ builder.setWorkingDirectory( getWorkingDirectory( "pom-with-parent" ).toString() );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -492,6 +495,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
String path = "basic-pom";
List<MavenProject> reactorProjects = prepareReactorProjects( path );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
+ builder.setWorkingDirectory( getWorkingDirectory( "basic-pom" ).toString() );
mapNextVersion( builder, "groupId:artifactId" );
builder.setAddSchema( true );
@@ -615,6 +619,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
{
List<MavenProject> reactorProjects = createReactorProjects( "whitespace-around-values" );
ReleaseDescriptorBuilder builder = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
+ builder.setWorkingDirectory( getWorkingDirectory( "whitespace-around-values" ).toString() );
mapNextVersion( builder, "groupId:subproject2" );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -628,6 +633,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
{
List<MavenProject> reactorProjects = createReactorProjects( "comments-around-values" );
ReleaseDescriptorBuilder builder = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
+ builder.setWorkingDirectory( getWorkingDirectory( "comments-around-values" ).toString() );
mapNextVersion( builder, "groupId:subproject2" );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -641,6 +647,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
{
List<MavenProject> reactorProjects = createReactorProjects( "cdata-around-values" );
ReleaseDescriptorBuilder builder = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
+ builder.setWorkingDirectory( getWorkingDirectory( "cdata-around-values" ).toString() );
mapNextVersion( builder, "groupId:subproject2" );
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 875327f..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
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
-import java.nio.file.Path;
import java.util.List;
import java.util.Objects;
@@ -60,17 +59,11 @@ public class RewritePomsForBranchPhaseTest
}
@Override
- protected Path getWorkingDirectory( String workingDir )
- {
- return super.getWorkingDirectory( "rewrite-for-branch/" + workingDir );
- }
-
- @Override
protected List<MavenProject> prepareReactorProjects( String path )
throws Exception
{
String dir = "rewrite-for-branch/" + Objects.toString( path, "" );
- return createReactorProjects( dir, path, null );
+ return createReactorProjects( dir, dir, null );
}
@Override
@@ -414,7 +407,7 @@ public class RewritePomsForBranchPhaseTest
throws Exception
{
List<MavenProject> reactorProjects =
- createReactorProjects( "rewrite-for-branch/pom-with-parent-flat", "pom-with-parent-flat", "root-project" );
+ createReactorProjects( "rewrite-for-branch/pom-with-parent-flat", "root-project" );
ReleaseDescriptorBuilder builder = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
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 c83b978..8c7d01c 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
@@ -88,6 +88,7 @@ public class RewritePomsForReleasePhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
+ builder.setWorkingDirectory( getWorkingDirectory( "basic-pom" ).toString() );
builder.addReleaseVersion( "groupId:artifactId", NEXT_VERSION );
String expected = readTestProjectFile( "basic-pom/pom.xml" );
@@ -108,6 +109,7 @@ public class RewritePomsForReleasePhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-dashes-in-comment" );
ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom( reactorProjects );
+ builder.setWorkingDirectory( getWorkingDirectory( "basic-pom-with-dashes-in-comment" ).toString() );
builder.addReleaseVersion( "groupId:artifactId", NEXT_VERSION );
String expected = readTestProjectFile( "basic-pom-with-dashes-in-comment/pom.xml" );
@@ -165,6 +167,7 @@ public class RewritePomsForReleasePhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "pom-with-overridden-scm" );
ReleaseDescriptorBuilder builder = createConfigurationForWithParentNextVersion( reactorProjects );
+ builder.setWorkingDirectory( getWorkingDirectory( "pom-with-overridden-scm" ).toString() );
builder.addReleaseVersion( "groupId:subsubproject", NEXT_VERSION );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -232,7 +235,7 @@ public class RewritePomsForReleasePhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-scm-expression" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-scm-expression" );
mapNextVersion( builder, "groupId:artifactId" );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -246,7 +249,7 @@ public class RewritePomsForReleasePhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-tag-base" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-tag-base" );
builder.setScmTagBase( "file://localhost/tmp/scm-repo/releases" );
mapNextVersion( builder, "groupId:artifactId" );
@@ -260,7 +263,7 @@ public class RewritePomsForReleasePhaseTest
throws Exception
{
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-tag-base-and-varying-scm-urls" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-tag-base-and-varying-scm-urls" );
builder.setScmTagBase( "file://localhost/tmp/scm-repo/allprojects/releases" );
mapNextVersion( builder, "groupId:artifactId" );
@@ -287,7 +290,7 @@ public class RewritePomsForReleasePhaseTest
throws Exception
{
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-empty-scm" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-empty-scm" );
mapNextVersion( builder, "groupId:artifactId" );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -339,6 +342,7 @@ public class RewritePomsForReleasePhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-inherited-scm" );
ReleaseDescriptorBuilder builder = createConfigurationForWithParentNextVersion( reactorProjects );
+ builder.setWorkingDirectory( getWorkingDirectory( "basic-pom-inherited-scm" ).toString() );
builder.addReleaseVersion( "groupId:subsubproject", NEXT_VERSION );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -352,7 +356,7 @@ public class RewritePomsForReleasePhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "pom-with-parent-and-properties" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "pom-with-parent-and-properties" );
builder.addReleaseVersion( "groupId:artifactId", NEXT_VERSION );
builder.addReleaseVersion( "groupId:subproject1", ALTERNATIVE_NEXT_VERSION );
builder.addReleaseVersion( "groupId:subproject2", ALTERNATIVE_NEXT_VERSION );
@@ -369,7 +373,7 @@ public class RewritePomsForReleasePhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "pom-with-property-dependency-coordinate" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "pom-with-property-dependency-coordinate" );
builder.addReleaseVersion( "groupId:artifactId", NEXT_VERSION );
builder.addReleaseVersion( "groupId:subproject1-3.4", ALTERNATIVE_NEXT_VERSION );
builder.addReleaseVersion( "groupId:subproject2", ALTERNATIVE_NEXT_VERSION );
@@ -386,7 +390,7 @@ public class RewritePomsForReleasePhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "pom-with-scm-of-parent-ending-with-a-slash" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "pom-with-scm-of-parent-ending-with-a-slash" );
builder.addReleaseVersion( "groupId:artifactId", NEXT_VERSION );
builder.addReleaseVersion( "groupId:subproject1", ALTERNATIVE_NEXT_VERSION );
@@ -401,7 +405,7 @@ public class RewritePomsForReleasePhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "multimodule-with-deep-subprojects" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "multimodule-with-deep-subprojects" );
builder.addReleaseVersion( "groupId:artifactId", NEXT_VERSION );
builder.addReleaseVersion( "groupId:subproject1", ALTERNATIVE_NEXT_VERSION );
builder.addReleaseVersion( "groupId:subproject2", ALTERNATIVE_NEXT_VERSION );
@@ -418,6 +422,7 @@ public class RewritePomsForReleasePhaseTest
List<MavenProject> reactorProjects =
createReactorProjects( "rewrite-for-release/pom-with-parent-flat", "pom-with-parent-flat", "root-project" );
ReleaseDescriptorBuilder builder = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
+ builder.setWorkingDirectory( getWorkingDirectory( "pom-with-parent-flat" ).toString() );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -430,7 +435,7 @@ public class RewritePomsForReleasePhaseTest
throws Exception
{
List<MavenProject> reactorProjects = createReactorProjects( "cdata-section" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "cdata-section" );
mapNextVersion( builder, "groupId:artifactId" );
RewritePomsForReleasePhase phase = (RewritePomsForReleasePhase) this.phase;
@@ -442,12 +447,21 @@ public class RewritePomsForReleasePhaseTest
}
@Override
+ @Deprecated
protected ReleaseDescriptorBuilder createDescriptorFromProjects( List<MavenProject> reactorProjects )
{
ReleaseDescriptorBuilder builder = super.createDescriptorFromProjects( reactorProjects );
builder.setScmReleaseLabel( "release-label" );
return builder;
}
+
+ protected ReleaseDescriptorBuilder createDescriptorFromProjects( List<MavenProject> reactorProjects, String workingDirectory )
+ {
+ ReleaseDescriptorBuilder builder = super.createDescriptorFromProjects( reactorProjects );
+ builder.setScmReleaseLabel( "release-label" );
+ builder.setWorkingDirectory( getWorkingDirectory( workingDirectory ).toString() );
+ return builder;
+ }
@Test
public void testRewritePomWithExternallyReleasedParent()
@@ -455,7 +469,7 @@ public class RewritePomsForReleasePhaseTest
{
List<MavenProject> reactorProjects = createReactorProjects( "pom-with-externally-released-parent" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "pom-with-externally-released-parent" );
builder.addDependencyReleaseVersion( "external:parent-artifactId", "1" );
builder.addDependencyDevelopmentVersion( "external:parent-artifactId", "2-SNAPSHOT" );
builder.addReleaseVersion( "groupId:subproject1", ALTERNATIVE_NEXT_VERSION );
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.
[maven-release] 02/05: Switch from commonbasedir to workingdirectory
Posted by rf...@apache.org.
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.