Remove unused formal parameters

apache · Dec 5, 2021 · 758fa31 · 758fa31
1 parent 67dc2f8
commit 758fa31
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/...manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java b/...manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
@@ -255,7 +255,7 @@ private void transformDocument( MavenProject project, Model modelTarget, Release
 
         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 )
@@ -375,7 +375,7 @@ else if ( buildOutputTimestamp.length() <= 1 )
     }
 
     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/...manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java b/...manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
@@ -134,22 +134,20 @@ private void generateReleasePoms( ReleaseDescriptor releaseDescriptor, ReleaseEn
         {
             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 @@ private void addReleasePomsToScm( ReleaseDescriptor releaseDescriptor, ReleaseEn
     }
 
     private Model createReleaseModel( MavenProject project, ReleaseDescriptor releaseDescriptor,
-                                      ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects,
+                                      ReleaseEnvironment releaseEnvironment,
                                       ReleaseResult result )
         throws ReleaseFailureException, ReleaseExecutionException
     {
@@ -229,7 +227,7 @@ private Model createReleaseModel( MavenProject project, ReleaseDescriptor releas
         // 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 ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvir
         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/...release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java b/...release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
@@ -116,7 +116,7 @@ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnviro
 
             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 @@ else if ( releaseDescriptor.isBranchCreation() && convertToBranch )
             {
                 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 @@ else if ( releaseDescriptor.isBranchCreation() && convertToBranch )
 
     private String resolveNextVersion( MavenProject project,
                                    String projectId,
-                                   ReleaseDescriptor releaseDescriptor,
-                                   ReleaseResult result )
+                                   ReleaseDescriptor releaseDescriptor )
         throws ReleaseExecutionException
     {
         String defaultVersion;

diff --git a/...ase-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java b/...ase-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
@@ -45,11 +45,11 @@ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnviro
                                   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 ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvir
                                    List<MavenProject> reactorProjects )
         throws ReleaseExecutionException
     {
-        return runLogic( releaseDescriptor, releaseEnvironment, reactorProjects, true );
+        return runLogic( releaseDescriptor, releaseEnvironment, true );
     }
 
     @Override