This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch mavenproject2model
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 1168890783b84cbeaae3a3d3a9c8e6c48d025fc0
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Sat Apr 7 20:22:47 2018 +0200
ResourceGenerator.clean will use releaseDescriptor to get pom files of
reactor
---
.../shared/release/phase/ResourceGenerator.java | 3 ++-
.../maven/shared/release/DefaultReleaseManager.java | 6 +++---
.../release/phase/AbstractBackupPomsPhase.java | 20 ++++----------------
.../release/phase/AbstractRewritePomsPhase.java | 2 +-
.../shared/release/phase/CreateBackupPomsPhase.java | 21 ++++++++++++++-------
.../release/phase/GenerateReleasePomsPhase.java | 2 +-
.../release/phase/RestoreBackupPomsPhase.java | 10 +++++++---
.../maven/shared/release/util/ReleaseUtil.java | 6 ++++++
.../release/phase/AbstractBackupPomsPhaseTest.java | 21 +++++++++++++++++++++
.../AbstractRewritingReleasePhaseTestCase.java | 10 +++++++++-
.../release/phase/CreateBackupPomsPhaseTest.java | 19 ++++++++++++-------
.../shared/release/phase/ReleasePhaseStub.java | 2 +-
.../release/phase/RestoreBackupPomsPhaseTest.java | 4 ++--
.../phase/RewritePomsForBranchPhaseTest.java | 9 ++++++---
.../phase/RewritePomsForDevelopmentPhaseTest.java | 13 +++++++++----
.../phase/RewritePomsForReleasePhaseTest.java | 9 ++++++---
16 files changed, 104 insertions(+), 53 deletions(-)
diff --git
a/maven-release-api/src/main/java/org/apache/maven/shared/release/phase/ResourceGenerator.java
b/maven-release-api/src/main/java/org/apache/maven/shared/release/phase/ResourceGenerator.java
index 8f85e3e..4618aed 100644
---
a/maven-release-api/src/main/java/org/apache/maven/shared/release/phase/ResourceGenerator.java
+++
b/maven-release-api/src/main/java/org/apache/maven/shared/release/phase/ResourceGenerator.java
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.ReleaseResult;
+import org.apache.maven.shared.release.config.ReleaseDescriptor;
/**
* Additional interface for ReleasePhase if the phase generates resources,
which should be cleaned up afterwards.
@@ -38,5 +39,5 @@ public interface ResourceGenerator
* @param reactorProjects the reactor projects
* @return the release result
*/
- ReleaseResult clean( List<MavenProject> reactorProjects );
+ ReleaseResult clean( ReleaseDescriptor releaseDescriptor,
List<MavenProject> reactorProjects );
}
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
index 2eb77d6..10db03e 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
@@ -529,8 +529,6 @@ public class DefaultReleaseManager
ReleaseDescriptor releaseDescriptor =
ReleaseUtils.buildReleaseDescriptor(
cleanRequest.getReleaseDescriptorBuilder() );
- configStore.delete( releaseDescriptor );
-
Strategy releaseStrategy = getStrategy(
releaseDescriptor.getReleaseStrategyId() );
Set<String> phases = new LinkedHashSet<>();
@@ -543,10 +541,12 @@ public class DefaultReleaseManager
if ( phase instanceof ResourceGenerator )
{
- ( (ResourceGenerator) phase ).clean(
cleanRequest.getReactorProjects() );
+ ( (ResourceGenerator) phase ).clean( releaseDescriptor,
cleanRequest.getReactorProjects() );
}
}
+ configStore.delete( releaseDescriptor );
+
updateListener( cleanRequest.getReleaseManagerListener(), "cleanup",
PHASE_END );
}
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhase.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhase.java
index b2a7e8e..65a63ab 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhase.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhase.java
@@ -19,9 +19,6 @@ package org.apache.maven.shared.release.phase;
* under the License.
*/
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.release.util.ReleaseUtil;
-
import java.io.File;
/**
@@ -32,23 +29,14 @@ public abstract class AbstractBackupPomsPhase
{
private final String backupSuffix = ".releaseBackup";
- protected File getPomBackup( MavenProject project )
+ protected File getPomBackup( String pomLocation )
{
- File pomFile = ReleaseUtil.getStandardPom( project );
-
- if ( pomFile != null )
- {
- return new File( pomFile.getAbsolutePath() + backupSuffix );
- }
- else
- {
- return null;
- }
+ return new File( pomLocation + backupSuffix );
}
- protected void deletePomBackup( MavenProject project )
+ protected void deletePomBackup( String pomLocation )
{
- File pomBackup = getPomBackup( project );
+ File pomBackup = getPomBackup( pomLocation );
if ( pomBackup != null && pomBackup.exists() )
{
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 8acbda8..e60d1c7 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
@@ -138,7 +138,7 @@ public abstract class AbstractRewritePomsPhase
}
@Override
- public ReleaseResult clean( List<MavenProject> reactorProjects )
+ public ReleaseResult clean( ReleaseDescriptor releaseDescriptor,
List<MavenProject> reactorProjects )
{
ReleaseResult result = new ReleaseResult();
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java
index bf07fd6..1b22db1 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java
@@ -22,6 +22,7 @@ package org.apache.maven.shared.release.phase;
import java.io.IOException;
import java.util.List;
+import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseFailureException;
@@ -47,11 +48,11 @@ public class CreateBackupPomsPhase
ReleaseResult result = new ReleaseResult();
// remove previous backups, if any
- clean( reactorProjects );
+ clean( releaseDescriptor, reactorProjects );
for ( MavenProject project : reactorProjects )
{
- createPomBackup( project );
+ createPomBackup( releaseDescriptor, project );
}
result.setResultCode( ReleaseResult.SUCCESS );
@@ -60,13 +61,15 @@ public class CreateBackupPomsPhase
}
@Override
- public ReleaseResult clean( List<MavenProject> reactorProjects )
+ public ReleaseResult clean( ReleaseDescriptor releaseDescriptor,
List<MavenProject> reactorProjects )
{
ReleaseResult result = new ReleaseResult();
for ( MavenProject project : reactorProjects )
{
- deletePomBackup( project );
+ String versionlessKey = ArtifactUtils.versionlessKey(
project.getGroupId(), project.getArtifactId() );
+
+ deletePomBackup( releaseDescriptor.getProjectPomFile(
versionlessKey ) );
}
result.setResultCode( ReleaseResult.SUCCESS );
@@ -82,15 +85,19 @@ public class CreateBackupPomsPhase
return execute( releaseDescriptor, releaseEnvironment, reactorProjects
);
}
- private void createPomBackup( MavenProject project )
+ private void createPomBackup( ReleaseDescriptor releaseDescriptor,
MavenProject project )
throws ReleaseExecutionException
{
+ String projectKey = ArtifactUtils.versionlessKey(
project.getGroupId(), project.getArtifactId() );
+
+ String pomLocation = releaseDescriptor.getProjectPomFile( projectKey );
+
// delete any existing backup first
- deletePomBackup( project );
+ deletePomBackup( pomLocation );
try
{
- FileUtils.copyFile( ReleaseUtil.getStandardPom( project ),
getPomBackup( project ) );
+ FileUtils.copyFile( ReleaseUtil.getStandardPom( project ),
getPomBackup( pomLocation ) );
}
catch ( IOException e )
{
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
index 7b6004f..b6e7c6a 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
@@ -673,7 +673,7 @@ public class GenerateReleasePomsPhase
* @see
org.apache.maven.shared.release.phase.AbstractReleasePhase#clean(java.util.List)
*/
@Override
- public ReleaseResult clean( List<MavenProject> reactorProjects )
+ public ReleaseResult clean( ReleaseDescriptor releaseDescriptor,
List<MavenProject> reactorProjects )
{
ReleaseResult result = new ReleaseResult();
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java
index f746eed..76c0750 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java
@@ -19,6 +19,7 @@ package org.apache.maven.shared.release.phase;
* under the License.
*/
+import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -35,7 +36,6 @@ import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
-import org.apache.maven.shared.release.util.ReleaseUtil;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.util.FileUtils;
@@ -86,7 +86,11 @@ public class RestoreBackupPomsPhase
MavenProject project )
throws ReleaseExecutionException, ReleaseFailureException
{
- File pomBackup = getPomBackup( project );
+ String projectKey = ArtifactUtils.versionlessKey(
project.getGroupId(), project.getArtifactId() );
+
+ String pomLocation = releaseDescriptor.getProjectPomFile( projectKey );
+
+ File pomBackup = getPomBackup( pomLocation );
if ( !pomBackup.exists() )
{
@@ -133,7 +137,7 @@ public class RestoreBackupPomsPhase
try
{
- FileUtils.copyFile( getPomBackup( project ),
ReleaseUtil.getStandardPom( project ) );
+ FileUtils.copyFile( getPomBackup( pomLocation ), new File(
pomLocation ) );
}
catch ( IOException e )
{
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 beeab5c..d974b80 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
@@ -65,6 +65,12 @@ public class ReleaseUtil
// noop
}
+ /**
+ * Get the MavenProject from the reactorProjects that is marked as
executionRoot
+ *
+ * @param reactorProjects should not be {@code null} or empty
+ * @return the MavenProject of the executionRoot
+ */
public static MavenProject getRootProject( List<MavenProject>
reactorProjects )
{
MavenProject project = reactorProjects.get( 0 );
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
index ce8e00e..c717a7b 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
@@ -1,5 +1,7 @@
package org.apache.maven.shared.release.phase;
+import org.apache.maven.artifact.ArtifactUtils;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -23,6 +25,9 @@ import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.PlexusJUnit4TestCase;
+import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder;
+import org.apache.maven.shared.release.config.ReleaseUtils;
import org.codehaus.plexus.util.ReaderFactory;
import java.io.File;
@@ -90,4 +95,20 @@ public abstract class AbstractBackupPomsPhaseTest
return project;
}
+ protected ReleaseDescriptorBuilder createReleaseDescriptorBuilder(
List<MavenProject> reactorProjects )
+ {
+ ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
+
+ for ( MavenProject reactorProject : reactorProjects )
+ {
+ String projectKey =
+ ArtifactUtils.versionlessKey( reactorProject.getGroupId(),
reactorProject.getArtifactId() );
+
+ // would normally be relative to workingdirectory
+ builder.addProjectPomFile( projectKey,
reactorProject.getFile().getAbsolutePath() );
+ }
+
+ return builder;
+ }
+
}
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 0f72873..46d19a2 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
@@ -652,8 +652,11 @@ public abstract class AbstractRewritingReleasePhaseTestCase
public void testCleanNoProjects()
throws Exception
{
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects(
Collections.<MavenProject>emptyList(), "" );
+
// This occurs when it is release:perform run standalone. Just check
there are no errors.
- ( (ResourceGenerator) phase ).clean(
Collections.<MavenProject>emptyList() );
+ ( (ResourceGenerator) phase ).clean(
ReleaseUtils.buildReleaseDescriptor( builder ),
+
Collections.<MavenProject>emptyList() );
}
protected ReleaseDescriptorBuilder createUnmappedConfiguration(
List<MavenProject> reactorProjects, String workingDirectory )
@@ -746,6 +749,11 @@ public abstract class AbstractRewritingReleasePhaseTestCase
private ReleaseDescriptorBuilder createDescriptorFromProjects(
ReleaseDescriptorBuilder builder, List<MavenProject> reactorProjects )
{
+ if ( reactorProjects.isEmpty() )
+ {
+ return builder;
+ }
+
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects
);
for ( MavenProject project : reactorProjects )
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
index 44e43ee..527d79e 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
@@ -23,10 +23,11 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.io.File;
-import java.util.Iterator;
import java.util.List;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder;
+import org.apache.maven.shared.release.config.ReleaseUtils;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
import org.apache.maven.shared.release.util.ReleaseUtil;
import org.junit.Test;
@@ -80,8 +81,10 @@ public class CreateBackupPomsPhaseTest
throws Exception
{
List<MavenProject> projects = getReactorProjects( getTestPath( path )
);
+
+ ReleaseDescriptorBuilder builder = createReleaseDescriptorBuilder(
projects );
- phase.execute( null, new DefaultReleaseEnvironment(), projects );
+ phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new
DefaultReleaseEnvironment(), projects );
testProjectBackups( projects, true );
}
@@ -91,7 +94,9 @@ public class CreateBackupPomsPhaseTest
{
List<MavenProject> projects = getReactorProjects( getTestPath( path )
);
- phase.simulate( null, new DefaultReleaseEnvironment(), projects );
+ ReleaseDescriptorBuilder builder = createReleaseDescriptorBuilder(
projects );
+
+ phase.simulate( ReleaseUtils.buildReleaseDescriptor( builder ), new
DefaultReleaseEnvironment(), projects );
testProjectBackups( projects, true );
}
@@ -101,7 +106,9 @@ public class CreateBackupPomsPhaseTest
{
List<MavenProject> projects = getReactorProjects( getTestPath( path )
);
- ( (ResourceGenerator) phase ).clean( projects );
+ ReleaseDescriptorBuilder builder = createReleaseDescriptorBuilder(
projects );
+
+ ( (ResourceGenerator) phase ).clean(
ReleaseUtils.buildReleaseDescriptor( builder ), projects );
testProjectBackups( projects, false );
}
@@ -109,10 +116,8 @@ public class CreateBackupPomsPhaseTest
protected void testProjectBackups( List<MavenProject> reactorProjects,
boolean created )
throws Exception
{
- for( Iterator<MavenProject> projects = reactorProjects.iterator();
projects.hasNext(); )
+ for ( MavenProject project : reactorProjects )
{
- MavenProject project = projects.next();
-
File pomFile = project.getFile();
File backupFile = new File( pomFile.getAbsolutePath() +
releaseBackupSuffix );
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.java
index 7d28bdf..67b0b96 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.java
@@ -74,7 +74,7 @@ public class ReleasePhaseStub
}
@Override
- public ReleaseResult clean( List<MavenProject> reactorProjects )
+ public ReleaseResult clean( ReleaseDescriptor releaseDescriptor,
List<MavenProject> reactorProjects )
{
ReleaseResult result = new ReleaseResult();
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
index dacb66a..a8418c5 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
@@ -83,8 +83,8 @@ public class RestoreBackupPomsPhaseTest
throws Exception
{
List<MavenProject> projects = getReactorProjects( getTestPath( path )
);
-
- ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
+
+ ReleaseDescriptorBuilder builder = createReleaseDescriptorBuilder(
projects );
builder.setScmSourceUrl( "scm:svn:http://myhost/myrepo"; );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new
DefaultReleaseEnvironment(), projects );
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 49642af..84e6a13 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
@@ -30,6 +30,7 @@ import java.util.List;
import java.util.Objects;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder;
import org.apache.maven.shared.release.config.ReleaseUtils;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
@@ -131,12 +132,14 @@ public class RewritePomsForBranchPhaseTest
File testFile = getTestFile(
"target/test-classes/projects/rewrite-for-branch/basic-pom/pom.xml.branch" );
testFile.delete();
assertFalse( testFile.exists() );
+
+ ReleaseDescriptor descriptor = ReleaseUtils.buildReleaseDescriptor(
builder );
- phase.simulate( ReleaseUtils.buildReleaseDescriptor( builder ), new
DefaultReleaseEnvironment(), reactorProjects );
+ phase.simulate( descriptor, new DefaultReleaseEnvironment(),
reactorProjects );
assertTrue( testFile.exists() );
- ( (ResourceGenerator) phase ).clean( reactorProjects );
+ ( (ResourceGenerator) phase ).clean( descriptor, reactorProjects );
assertFalse( testFile.exists() );
}
@@ -153,7 +156,7 @@ public class RewritePomsForBranchPhaseTest
testFile.delete();
assertFalse( testFile.exists() );
- ( (ResourceGenerator) phase ).clean( reactorProjects );
+ ( (ResourceGenerator) phase ).clean(
ReleaseUtils.buildReleaseDescriptor( builder ), reactorProjects );
assertFalse( testFile.exists() );
}
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 953694c..4be2839 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
@@ -32,6 +32,7 @@ import java.util.List;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.model.Scm;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder;
import org.apache.maven.shared.release.config.ReleaseUtils;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
@@ -136,11 +137,12 @@ public class RewritePomsForDevelopmentPhaseTest
testFile.delete();
assertFalse( testFile.exists() );
- phase.simulate( ReleaseUtils.buildReleaseDescriptor( builder ), new
DefaultReleaseEnvironment(), reactorProjects );
+ ReleaseDescriptor descriptor = ReleaseUtils.buildReleaseDescriptor(
builder );
+ phase.simulate( descriptor, new DefaultReleaseEnvironment(),
reactorProjects );
assertTrue( testFile.exists() );
- ( (ResourceGenerator) phase ).clean( reactorProjects );
+ ( (ResourceGenerator) phase ).clean( descriptor, reactorProjects );
assertFalse( testFile.exists() );
}
@@ -150,12 +152,15 @@ public class RewritePomsForDevelopmentPhaseTest
throws Exception
{
List<MavenProject> reactorProjects = createReactorProjects(
"basic-pom" );
-
+ ReleaseDescriptorBuilder builder = createDescriptorFromBasicPom(
reactorProjects, "basic-pom" );
+
File testFile = getTestFile(
"target/test-classes/projects/rewrite-for-development/basic-pom/pom.xml.next" );
testFile.delete();
assertFalse( testFile.exists() );
- ( (ResourceGenerator) phase ).clean( reactorProjects );
+ ReleaseDescriptor descriptor = ReleaseUtils.buildReleaseDescriptor(
builder );
+
+ ( (ResourceGenerator) phase ).clean( descriptor, reactorProjects );
assertFalse( testFile.exists() );
}
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 e25678e..ecac5fa 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
@@ -31,6 +31,7 @@ import java.util.List;
import java.util.Objects;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder;
import org.apache.maven.shared.release.config.ReleaseUtils;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
@@ -134,11 +135,12 @@ public class RewritePomsForReleasePhaseTest
testFile.delete();
assertFalse( testFile.exists() );
- phase.simulate( ReleaseUtils.buildReleaseDescriptor( builder ), new
DefaultReleaseEnvironment(), reactorProjects );
+ ReleaseDescriptor descriptor = ReleaseUtils.buildReleaseDescriptor(
builder );
+ phase.simulate( descriptor, new DefaultReleaseEnvironment(),
reactorProjects );
assertTrue( testFile.exists() );
- ( (ResourceGenerator) phase ).clean( reactorProjects );
+ ( (ResourceGenerator) phase ).clean( descriptor, reactorProjects );
assertFalse( testFile.exists() );
}
@@ -148,12 +150,13 @@ public class RewritePomsForReleasePhaseTest
throws Exception
{
List<MavenProject> reactorProjects = createReactorProjects(
"basic-pom" );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects(
reactorProjects, "basic-pom" );
File testFile = getTestFile(
"target/test-classes/projects/rewrite-for-release/basic-pom/pom.xml.tag" );
testFile.delete();
assertFalse( testFile.exists() );
- ( (ResourceGenerator) phase ).clean( reactorProjects );
+ ( (ResourceGenerator) phase ).clean(
ReleaseUtils.buildReleaseDescriptor( builder ), reactorProjects );
assertFalse( testFile.exists() );
}
--
To stop receiving notification emails like this one, please contact
rfscho...@apache.org.
