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:50 UTC
[maven-release] 01/05: Remove unused parameter
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.