You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/10/23 10:23:35 UTC
svn commit: r587419 - in /maven/components/trunk: build.properties
maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
pom.xml
Author: jvanzyl
Date: Tue Oct 23 01:23:35 2007
New Revision: 587419
URL: http://svn.apache.org/viewvc?rev=587419&view=rev
Log:
o use released version of plexus
Modified:
maven/components/trunk/build.properties
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/pom.xml
Modified: maven/components/trunk/build.properties
URL: http://svn.apache.org/viewvc/maven/components/trunk/build.properties?rev=587419&r1=587418&r2=587419&view=diff
==============================================================================
--- maven/components/trunk/build.properties (original)
+++ maven/components/trunk/build.properties Tue Oct 23 01:23:35 2007
@@ -16,7 +16,7 @@
# under the License.
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
maven-artifact.version=3.0-SNAPSHOT
commons-cli.version=1.0
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java?rev=587419&r1=587418&r2=587419&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java Tue Oct 23 01:23:35 2007
@@ -82,7 +82,6 @@
extends AbstractLogEnabled
implements ExtensionManager, Contextualizable
{
-
private ArtifactFactory artifactFactory;
private ArtifactResolver artifactResolver;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=587419&r1=587418&r2=587419&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Tue Oct 23 01:23:35 2007
@@ -1255,25 +1255,19 @@
// so that this meethod could entirely be handled by a plexus lookup?
if ( StringUtils.isNotEmpty( configuratorId ) )
{
- configurator = (ComponentConfigurator) pluginContainer.lookup(
- ComponentConfigurator.ROLE,
- configuratorId,
- pluginRealm );
+ configurator = (ComponentConfigurator) pluginContainer.lookup( ComponentConfigurator.ROLE, configuratorId, pluginRealm );
}
else
{
- configurator = (ComponentConfigurator) pluginContainer.lookup(
- ComponentConfigurator.ROLE,
- "basic", pluginRealm );
+ configurator = (ComponentConfigurator) pluginContainer.lookup( ComponentConfigurator.ROLE, "basic", pluginRealm );
}
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
- configurator.configureComponent( plugin, configuration, expressionEvaluator,
- pluginRealm, listener );
+ configurator.configureComponent( plugin, configuration, expressionEvaluator, pluginRealm, listener );
getLogger().debug( "-- end configuration --" );
}
Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=587419&r1=587418&r2=587419&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Tue Oct 23 01:23:35 2007
@@ -116,6 +116,9 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.3</version>
+ <configuration>
+ <forkMode>never</forkMode>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -131,7 +134,7 @@
<module>maven-embedder</module>
</modules>
<properties>
- <plexusVersion>1.0-alpha-34-SNAPSHOT</plexusVersion>
+ <plexusVersion>1.0-alpha-34</plexusVersion>
<wagonVersion>1.0-beta-2</wagonVersion>
</properties>
<dependencies>