Skip to content

Commit f5980b0

Browse files
[MINSTALL-185] Install all artifacts in one request
1 parent 569b31a commit f5980b0

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/main/java/org/apache/maven/plugins/install/InstallMojo.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,9 @@ public void execute()
122122
{
123123
if ( !installAtEnd )
124124
{
125-
installProject( project );
125+
InstallRequest request = new InstallRequest();
126+
processProject( project, request );
127+
installProject( request );
126128
putState( State.INSTALLED );
127129
}
128130
else
@@ -137,14 +139,16 @@ public void execute()
137139

138140
if ( allProjectsMarked( allProjectsUsingPlugin ) )
139141
{
142+
InstallRequest request = new InstallRequest();
140143
for ( MavenProject reactorProject : allProjectsUsingPlugin )
141144
{
142145
State state = getState( reactorProject );
143146
if ( state == State.TO_BE_INSTALLED )
144147
{
145-
installProject( reactorProject );
148+
processProject( reactorProject, request );
146149
}
147150
}
151+
installProject( request );
148152
}
149153
}
150154

@@ -190,11 +194,11 @@ private boolean hasExecution( Plugin plugin )
190194
return false;
191195
}
192196

193-
private void installProject( MavenProject project ) throws MojoExecutionException
197+
private void installProject( InstallRequest request ) throws MojoExecutionException
194198
{
195199
try
196200
{
197-
repositorySystem.install( session.getRepositorySession(), processProject( project ) );
201+
repositorySystem.install( session.getRepositorySession(), request );
198202
}
199203
catch ( InstallationException e )
200204
{
@@ -203,14 +207,12 @@ private void installProject( MavenProject project ) throws MojoExecutionExceptio
203207
}
204208

205209
/**
206-
* Processes passed in {@link MavenProject} and produces {@link InstallRequest} out of it.
210+
* Processes passed in {@link MavenProject} and prepares content of {@link InstallRequest} out of it.
207211
*
208212
* @throws MojoExecutionException if project is badly set up.
209213
*/
210-
private InstallRequest processProject( MavenProject project ) throws MojoExecutionException
214+
private void processProject( MavenProject project, InstallRequest request ) throws MojoExecutionException
211215
{
212-
InstallRequest request = new InstallRequest();
213-
214216
if ( isFile( project.getFile() ) )
215217
{
216218
request.addArtifact( RepositoryUtils.toArtifact( new ProjectArtifact( project ) ) );
@@ -245,8 +247,6 @@ else if ( !project.getAttachedArtifacts().isEmpty() )
245247
getLog().debug( "Attaching for install: " + attached.getId() );
246248
request.addArtifact( RepositoryUtils.toArtifact( attached ) );
247249
}
248-
249-
return request;
250250
}
251251

252252
private boolean isFile( File file )

0 commit comments

Comments
 (0)