Remove unused formal parameters

pzygielo · slachiewicz · commit d91b784796e9 · 2021-12-12T10:32:11.000+01:00
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
@@ -280,7 +280,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 )
@@ -400,7 +400,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/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 @@ 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/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 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/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 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

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ private void transformDocument( MavenProject project, Model modelTarget, Release`
`280`	`280`
`281`	`281`	`String projectId = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );`
`282`	`282`
`283`		`- rewriteVersion( modelTarget, releaseDescriptor, projectId, project, parentVersion );`
	`283`	`+ rewriteVersion( modelTarget, releaseDescriptor, projectId, project );`
`284`	`284`
`285`	`285`	`Build buildTarget = modelTarget.getBuild();`
`286`	`286`	`if ( buildTarget != null )`
`@@ -400,7 +400,7 @@ else if ( buildOutputTimestamp.length() <= 1 )`
`400`	`400`	`}`
`401`	`401`
`402`	`402`	`private void rewriteVersion( Model modelTarget, ReleaseDescriptor releaseDescriptor, String projectId,`
`403`		`- MavenProject project, String parentVersion )`
	`403`	`+ MavenProject project )`
`404`	`404`	`throws ReleaseFailureException`
`405`	`405`	`{`
`406`	`406`	`String version = getNextVersion( releaseDescriptor, projectId );`
Original file line number	Diff line number	Diff line change
`@@ -134,22 +134,20 @@ private void generateReleasePoms( ReleaseDescriptor releaseDescriptor, ReleaseEn`
`134`	`134`	`{`
`135`	`135`	`logInfo( result, "Generating release POM for '" + project.getName() + "'..." );`
`136`	`136`
`137`		`- releasePoms.add( generateReleasePom( project, releaseDescriptor, releaseEnvironment, reactorProjects,`
`138`		`- simulate, result ) );`
	`137`	`+ releasePoms.add( generateReleasePom( project, releaseDescriptor, releaseEnvironment, result ) );`
`139`	`138`	`}`
`140`	`139`
`141`	`140`	`addReleasePomsToScm( releaseDescriptor, releaseEnvironment, reactorProjects, simulate, result, releasePoms );`
`142`	`141`	`}`
`143`	`142`
`144`	`143`	`private File generateReleasePom( MavenProject project, ReleaseDescriptor releaseDescriptor,`
`145`		`- ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects,`
`146`		`- boolean simulate, ReleaseResult result )`
	`144`	`+ ReleaseEnvironment releaseEnvironment,`
	`145`	`+ ReleaseResult result )`
`147`	`146`	`throws ReleaseExecutionException, ReleaseFailureException`
`148`	`147`	`{`
`149`	`148`	`// create release pom`
`150`	`149`
`151`		`- Model releasePom = createReleaseModel( project, releaseDescriptor, releaseEnvironment, reactorProjects,`
`152`		`- result );`
	`150`	`+ Model releasePom = createReleaseModel( project, releaseDescriptor, releaseEnvironment, result );`
`153`	`151`
`154`	`152`	`// write release pom to file`
`155`	`153`
`@@ -212,7 +210,7 @@ private void addReleasePomsToScm( ReleaseDescriptor releaseDescriptor, ReleaseEn`
`212`	`210`	`}`
`213`	`211`
`214`	`212`	`private Model createReleaseModel( MavenProject project, ReleaseDescriptor releaseDescriptor,`
`215`		`- ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects,`
	`213`	`+ ReleaseEnvironment releaseEnvironment,`
`216`	`214`	`ReleaseResult result )`
`217`	`215`	`throws ReleaseFailureException, ReleaseExecutionException`
`218`	`216`	`{`
`@@ -229,7 +227,7 @@ private Model createReleaseModel( MavenProject project, ReleaseDescriptor releas`
`229`	`227`	`// update project version`
`230`	`228`	`String projectVersion = releaseModel.getVersion();`
`231`	`229`	`String releaseVersion =`
`232`		`- getNextVersion( releaseDescriptor, project.getGroupId(), project.getArtifactId(), projectVersion );`
	`230`	`+ getNextVersion( releaseDescriptor, project.getGroupId(), project.getArtifactId() );`
`233`	`231`	`releaseModel.setVersion( releaseVersion );`
`234`	`232`
`235`	`233`	`String originalFinalName = releaseModel.getBuild().getFinalName();`
`@@ -416,8 +414,7 @@ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvir`
`416`	`414`	`return execute( releaseDescriptor, releaseEnvironment, reactorProjects, true );`
`417`	`415`	`}`
`418`	`416`
`419`		`- private String getNextVersion( ReleaseDescriptor releaseDescriptor, String groupId, String artifactId,`
`420`		`- String version )`
	`417`	`+ private String getNextVersion( ReleaseDescriptor releaseDescriptor, String groupId, String artifactId )`
`421`	`418`	`throws ReleaseFailureException`
`422`	`419`	`{`
`423`	`420`	`// TODO: share with RewritePomsForReleasePhase.rewriteVersion`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnviro`
`116`	`116`
`117`	`117`	`String projectId = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );`
`118`	`118`
`119`		`- String nextVersion = resolveNextVersion( project, projectId, releaseDescriptor, result );`
	`119`	`+ String nextVersion = resolveNextVersion( project, projectId, releaseDescriptor );`
`120`	`120`
`121`	`121`	`if ( !convertToSnapshot )`
`122`	`122`	`{`
`@@ -169,7 +169,7 @@ else if ( releaseDescriptor.isBranchCreation() && convertToBranch )`
`169`	`169`	`{`
`170`	`170`	`String projectId = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );`
`171`	`171`
`172`		`- String nextVersion = resolveNextVersion( project, projectId, releaseDescriptor, result );`
	`172`	`+ String nextVersion = resolveNextVersion( project, projectId, releaseDescriptor );`
`173`	`173`
`174`	`174`	`if ( !convertToSnapshot )`
`175`	`175`	`{`
`@@ -193,8 +193,7 @@ else if ( releaseDescriptor.isBranchCreation() && convertToBranch )`
`193`	`193`
`194`	`194`	`private String resolveNextVersion( MavenProject project,`
`195`	`195`	`String projectId,`
`196`		`- ReleaseDescriptor releaseDescriptor,`
`197`		`- ReleaseResult result )`
	`196`	`+ ReleaseDescriptor releaseDescriptor )`
`198`	`197`	`throws ReleaseExecutionException`
`199`	`198`	`{`
`200`	`199`	`String defaultVersion;`
Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,11 @@ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnviro`
`45`	`45`	`List<MavenProject> reactorProjects )`
`46`	`46`	`throws ReleaseExecutionException`
`47`	`47`	`{`
`48`		`- return runLogic( releaseDescriptor, releaseEnvironment, reactorProjects, false );`
	`48`	`+ return runLogic( releaseDescriptor, releaseEnvironment, false );`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`private ReleaseResult runLogic( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,`
`52`		`- List<MavenProject> reactorProjects, boolean simulate )`
	`52`	`+ boolean simulate )`
`53`	`53`	`throws ReleaseExecutionException`
`54`	`54`	`{`
`55`	`55`	`String additionalArguments = getAdditionalArguments( releaseDescriptor );`
`@@ -134,7 +134,7 @@ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvir`
`134`	`134`	`List<MavenProject> reactorProjects )`
`135`	`135`	`throws ReleaseExecutionException`
`136`	`136`	`{`
`137`		`- return runLogic( releaseDescriptor, releaseEnvironment, reactorProjects, true );`
	`137`	`+ return runLogic( releaseDescriptor, releaseEnvironment, true );`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`@Override`