Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o use released version of plexus 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587419 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2007-10-23 08:23:35 +00:00
parent cb5debaec2
commit def0ed7957
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.properties
View File

@ -16,7 +16,7 @@
# under the License. # under the License.
classworlds.version=1.2-alpha-10 classworlds.version=1.2-alpha-10
plexus.version=1.0-alpha-34-SNAPSHOT plexus.version=1.0-alpha-34
plexus-utils.version=1.4.5 plexus-utils.version=1.4.5
maven-artifact.version=3.0-SNAPSHOT maven-artifact.version=3.0-SNAPSHOT
commons-cli.version=1.0 commons-cli.version=1.0

1
maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
View File

@ -82,7 +82,6 @@ public class DefaultExtensionManager
extends AbstractLogEnabled extends AbstractLogEnabled
implements ExtensionManager, Contextualizable implements ExtensionManager, Contextualizable
{ {
private ArtifactFactory artifactFactory; private ArtifactFactory artifactFactory;
private ArtifactResolver artifactResolver; private ArtifactResolver artifactResolver;

14
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
View File

@ -1255,25 +1255,19 @@ public class DefaultPluginManager
// so that this meethod could entirely be handled by a plexus lookup? // so that this meethod could entirely be handled by a plexus lookup?
if ( StringUtils.isNotEmpty( configuratorId ) ) if ( StringUtils.isNotEmpty( configuratorId ) )
{ {
configurator = (ComponentConfigurator) pluginContainer.lookup( configurator = (ComponentConfigurator) pluginContainer.lookup( ComponentConfigurator.ROLE, configuratorId, pluginRealm );
ComponentConfigurator.ROLE,
configuratorId,
pluginRealm );
} }
else else
{ {
configurator = (ComponentConfigurator) pluginContainer.lookup( configurator = (ComponentConfigurator) pluginContainer.lookup( ComponentConfigurator.ROLE, "basic", pluginRealm );
ComponentConfigurator.ROLE,
"basic", pluginRealm );
} }
ConfigurationListener listener = new DebugConfigurationListener( getLogger() ); ConfigurationListener listener = new DebugConfigurationListener( getLogger() );
getLogger().debug( "Configuring mojo '" + mojoDescriptor.getId() + "' -->" ); getLogger().debug( "Configuring mojo '" + mojoDescriptor.getId() + "' with " + configuratorId + " configurator -->" );
// This needs to be able to use methods // This needs to be able to use methods
configurator.configureComponent( plugin, configuration, expressionEvaluator, configurator.configureComponent( plugin, configuration, expressionEvaluator, pluginRealm, listener );
pluginRealm, listener );
getLogger().debug( "-- end configuration --" ); getLogger().debug( "-- end configuration --" );
} }

5
pom.xml
View File

@ -116,6 +116,9 @@ under the License.
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.3</version> <version>2.3</version>
<configuration>
<forkMode>never</forkMode>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@ -131,7 +134,7 @@ under the License.
<module>maven-embedder</module> <module>maven-embedder</module>
</modules> </modules>
<properties> <properties>
<plexusVersion>1.0-alpha-34-SNAPSHOT</plexusVersion> <plexusVersion>1.0-alpha-34</plexusVersion>
<wagonVersion>1.0-beta-2</wagonVersion> <wagonVersion>1.0-beta-2</wagonVersion>
</properties> </properties>
<dependencies> <dependencies>