@@ -122,7 +122,9 @@ public void execute()
122
122
{
123
123
if ( !installAtEnd )
124
124
{
125
- installProject ( project );
125
+ InstallRequest request = new InstallRequest ();
126
+ processProject ( project , request );
127
+ installProject ( request );
126
128
putState ( State .INSTALLED );
127
129
}
128
130
else
@@ -137,14 +139,16 @@ public void execute()
137
139
138
140
if ( allProjectsMarked ( allProjectsUsingPlugin ) )
139
141
{
142
+ InstallRequest request = new InstallRequest ();
140
143
for ( MavenProject reactorProject : allProjectsUsingPlugin )
141
144
{
142
145
State state = getState ( reactorProject );
143
146
if ( state == State .TO_BE_INSTALLED )
144
147
{
145
- installProject ( reactorProject );
148
+ processProject ( reactorProject , request );
146
149
}
147
150
}
151
+ installProject ( request );
148
152
}
149
153
}
150
154
@@ -190,11 +194,11 @@ private boolean hasExecution( Plugin plugin )
190
194
return false ;
191
195
}
192
196
193
- private void installProject ( MavenProject project ) throws MojoExecutionException
197
+ private void installProject ( InstallRequest request ) throws MojoExecutionException
194
198
{
195
199
try
196
200
{
197
- repositorySystem .install ( session .getRepositorySession (), processProject ( project ) );
201
+ repositorySystem .install ( session .getRepositorySession (), request );
198
202
}
199
203
catch ( InstallationException e )
200
204
{
@@ -203,14 +207,12 @@ private void installProject( MavenProject project ) throws MojoExecutionExceptio
203
207
}
204
208
205
209
/**
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.
207
211
*
208
212
* @throws MojoExecutionException if project is badly set up.
209
213
*/
210
- private InstallRequest processProject ( MavenProject project ) throws MojoExecutionException
214
+ private void processProject ( MavenProject project , InstallRequest request ) throws MojoExecutionException
211
215
{
212
- InstallRequest request = new InstallRequest ();
213
-
214
216
if ( isFile ( project .getFile () ) )
215
217
{
216
218
request .addArtifact ( RepositoryUtils .toArtifact ( new ProjectArtifact ( project ) ) );
@@ -245,8 +247,6 @@ else if ( !project.getAttachedArtifacts().isEmpty() )
245
247
getLog ().debug ( "Attaching for install: " + attached .getId () );
246
248
request .addArtifact ( RepositoryUtils .toArtifact ( attached ) );
247
249
}
248
-
249
- return request ;
250
250
}
251
251
252
252
private boolean isFile ( File file )
0 commit comments