This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
The following commit(s) were added to refs/heads/master by this push:
new d91b784 Remove unused formal parameters
d91b784 is described below
commit d91b784796e93171171bbcd27c2dc7c97a186c82
Author: Piotrek Żygieło <[email protected]>
AuthorDate: Tue Apr 14 14:15:35 2020 +0200
Remove unused formal parameters
---
.../shared/release/phase/AbstractRewritePomsPhase.java | 4 ++--
.../shared/release/phase/GenerateReleasePomsPhase.java | 17 +++++++----------
.../maven/shared/release/phase/MapVersionsPhase.java | 7 +++----
.../shared/release/phase/RunPerformGoalsPhase.java | 6 +++---
4 files changed, 15 insertions(+), 19 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 7c5a047..f9eba32 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
@@ -280,7 +280,7 @@ public abstract class AbstractRewritePomsPhase
String projectId = ArtifactUtils.versionlessKey( project.getGroupId(),
project.getArtifactId() );
- rewriteVersion( modelTarget, releaseDescriptor, projectId, project,
parentVersion );
+ rewriteVersion( modelTarget, releaseDescriptor, projectId, project );
Build buildTarget = modelTarget.getBuild();
if ( buildTarget != null )
@@ -400,7 +400,7 @@ public abstract class AbstractRewritePomsPhase
}
private void rewriteVersion( Model modelTarget, ReleaseDescriptor
releaseDescriptor, String projectId,
- MavenProject project, String parentVersion )
+ MavenProject project )
throws ReleaseFailureException
{
String version = getNextVersion( releaseDescriptor, projectId );
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..fc63814 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
@@ -134,22 +134,20 @@ public class GenerateReleasePomsPhase
{
logInfo( result, "Generating release POM for '" +
project.getName() + "'..." );
- releasePoms.add( generateReleasePom( project, releaseDescriptor,
releaseEnvironment, reactorProjects,
- simulate, result ) );
+ releasePoms.add( generateReleasePom( project, releaseDescriptor,
releaseEnvironment, result ) );
}
addReleasePomsToScm( releaseDescriptor, releaseEnvironment,
reactorProjects, simulate, result, releasePoms );
}
private File generateReleasePom( MavenProject project, ReleaseDescriptor
releaseDescriptor,
- ReleaseEnvironment releaseEnvironment,
List<MavenProject> reactorProjects,
- boolean simulate, ReleaseResult result )
+ ReleaseEnvironment releaseEnvironment,
+ ReleaseResult result )
throws ReleaseExecutionException, ReleaseFailureException
{
// create release pom
- Model releasePom = createReleaseModel( project, releaseDescriptor,
releaseEnvironment, reactorProjects,
- result );
+ Model releasePom = createReleaseModel( project, releaseDescriptor,
releaseEnvironment, result );
// write release pom to file
@@ -212,7 +210,7 @@ public class GenerateReleasePomsPhase
}
private Model createReleaseModel( MavenProject project, ReleaseDescriptor
releaseDescriptor,
- ReleaseEnvironment releaseEnvironment,
List<MavenProject> reactorProjects,
+ ReleaseEnvironment releaseEnvironment,
ReleaseResult result )
throws ReleaseFailureException, ReleaseExecutionException
{
@@ -229,7 +227,7 @@ public class GenerateReleasePomsPhase
// update project version
String projectVersion = releaseModel.getVersion();
String releaseVersion =
- getNextVersion( releaseDescriptor, project.getGroupId(),
project.getArtifactId(), projectVersion );
+ getNextVersion( releaseDescriptor, project.getGroupId(),
project.getArtifactId() );
releaseModel.setVersion( releaseVersion );
String originalFinalName = releaseModel.getBuild().getFinalName();
@@ -416,8 +414,7 @@ public class GenerateReleasePomsPhase
return execute( releaseDescriptor, releaseEnvironment,
reactorProjects, true );
}
- private String getNextVersion( ReleaseDescriptor releaseDescriptor, String
groupId, String artifactId,
- String version )
+ private String getNextVersion( ReleaseDescriptor releaseDescriptor, String
groupId, String artifactId )
throws ReleaseFailureException
{
// TODO: share with RewritePomsForReleasePhase.rewriteVersion
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
index 68d2e7a..3d405eb 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
@@ -116,7 +116,7 @@ public class MapVersionsPhase
String projectId = ArtifactUtils.versionlessKey(
project.getGroupId(), project.getArtifactId() );
- String nextVersion = resolveNextVersion( project, projectId,
releaseDescriptor, result );
+ String nextVersion = resolveNextVersion( project, projectId,
releaseDescriptor );
if ( !convertToSnapshot )
{
@@ -169,7 +169,7 @@ public class MapVersionsPhase
{
String projectId = ArtifactUtils.versionlessKey(
project.getGroupId(), project.getArtifactId() );
- String nextVersion = resolveNextVersion( project, projectId,
releaseDescriptor, result );
+ String nextVersion = resolveNextVersion( project, projectId,
releaseDescriptor );
if ( !convertToSnapshot )
{
@@ -193,8 +193,7 @@ public class MapVersionsPhase
private String resolveNextVersion( MavenProject project,
String projectId,
- ReleaseDescriptor releaseDescriptor,
- ReleaseResult result )
+ ReleaseDescriptor releaseDescriptor )
throws ReleaseExecutionException
{
String defaultVersion;
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
index 7c63a5f..2e3a843 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
@@ -45,11 +45,11 @@ public class RunPerformGoalsPhase
List<MavenProject> reactorProjects )
throws ReleaseExecutionException
{
- return runLogic( releaseDescriptor, releaseEnvironment,
reactorProjects, false );
+ return runLogic( releaseDescriptor, releaseEnvironment, false );
}
private ReleaseResult runLogic( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment,
- List<MavenProject> reactorProjects, boolean
simulate )
+ boolean simulate )
throws ReleaseExecutionException
{
String additionalArguments = getAdditionalArguments( releaseDescriptor
);
@@ -134,7 +134,7 @@ public class RunPerformGoalsPhase
List<MavenProject> reactorProjects )
throws ReleaseExecutionException
{
- return runLogic( releaseDescriptor, releaseEnvironment,
reactorProjects, true );
+ return runLogic( releaseDescriptor, releaseEnvironment, true );
}
@Override
