mirror of https://github.com/apache/maven.git
repair formatting mishap
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163617 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
49552c8688
commit
2e7b575246
|
@ -542,7 +542,7 @@ public class DefaultPluginManager
|
||||||
{
|
{
|
||||||
org.apache.maven.model.Plugin plugin = (org.apache.maven.model.Plugin) iterator.next();
|
org.apache.maven.model.Plugin plugin = (org.apache.maven.model.Plugin) iterator.next();
|
||||||
|
|
||||||
// TODO: groupID not handled
|
// TODO: groupID not handled
|
||||||
if ( pluginId.equals( plugin.getArtifactId() ) )
|
if ( pluginId.equals( plugin.getArtifactId() ) )
|
||||||
{
|
{
|
||||||
return CollectionUtils.mergeMaps( plugin.getConfiguration(), map );
|
return CollectionUtils.mergeMaps( plugin.getConfiguration(), map );
|
||||||
|
@ -563,9 +563,9 @@ public class DefaultPluginManager
|
||||||
return message.toString();
|
return message.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------
|
// ----------------------------------------------------------------------
|
||||||
// Lifecycle
|
// Lifecycle
|
||||||
// ----------------------------------------------------------------------
|
// ----------------------------------------------------------------------
|
||||||
|
|
||||||
public void contextualize( Context context )
|
public void contextualize( Context context )
|
||||||
throws ContextException
|
throws ContextException
|
||||||
|
@ -582,10 +582,10 @@ public class DefaultPluginManager
|
||||||
"plexus-artifact-container", "wagon-provider-api",
|
"plexus-artifact-container", "wagon-provider-api",
|
||||||
"classworlds"} );
|
"classworlds"} );
|
||||||
|
|
||||||
// TODO: move this to be configurable from the Maven component
|
// TODO: move this to be configurable from the Maven component
|
||||||
remotePluginRepositories = new ArrayList();
|
remotePluginRepositories = new ArrayList();
|
||||||
|
|
||||||
// TODO: needs to be configured from the POM element
|
// TODO: needs to be configured from the POM element
|
||||||
|
|
||||||
MavenSettings settings = null;
|
MavenSettings settings = null;
|
||||||
try
|
try
|
||||||
|
@ -607,9 +607,9 @@ public class DefaultPluginManager
|
||||||
remotePluginRepositories.add( pluginRepository );
|
remotePluginRepositories.add( pluginRepository );
|
||||||
}
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------
|
// ----------------------------------------------------------------------
|
||||||
// Artifact resolution
|
// Artifact resolution
|
||||||
// ----------------------------------------------------------------------
|
// ----------------------------------------------------------------------
|
||||||
|
|
||||||
private void resolveTransitiveDependencies( MavenSession context, ArtifactResolver artifactResolver,
|
private void resolveTransitiveDependencies( MavenSession context, ArtifactResolver artifactResolver,
|
||||||
MavenProjectBuilder mavenProjectBuilder )
|
MavenProjectBuilder mavenProjectBuilder )
|
||||||
|
@ -627,9 +627,9 @@ public class DefaultPluginManager
|
||||||
project.addArtifacts( result.getArtifacts().values() );
|
project.addArtifacts( result.getArtifacts().values() );
|
||||||
}
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------
|
// ----------------------------------------------------------------------
|
||||||
// Artifact downloading
|
// Artifact downloading
|
||||||
// ----------------------------------------------------------------------
|
// ----------------------------------------------------------------------
|
||||||
|
|
||||||
private void downloadDependencies( MavenSession context, ArtifactResolver artifactResolver )
|
private void downloadDependencies( MavenSession context, ArtifactResolver artifactResolver )
|
||||||
throws GoalExecutionException
|
throws GoalExecutionException
|
||||||
|
|
Loading…
Reference in New Issue