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 2008/11/16 03:38:14 UTC
svn commit: r717964 - in /maven/components/trunk: ./ maven-compat/
maven-core/src/main/java/org/apache/maven/execution/
maven-core/src/main/java/org/apache/maven/lifecycle/
maven-core/src/main/java/org/apache/maven/plugin/
maven-core/src/main/java/org/...
Author: jvanzyl
Date: Sat Nov 15 18:38:13 2008
New Revision: 717964
URL: http://svn.apache.org/viewvc?rev=717964&view=rev
Log:
o use the class lookup method which will now automatically partition lookups based on the class
submitted by: Dain Sundstrom
Modified:
maven/components/trunk/maven-compat/pom.xml
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenRealmManagerTest.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParserTest.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManagerTest.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultMojoBindingFactoryTest.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java
maven/components/trunk/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/ClassLoaderXmlBindingLoaderTest.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectHelperTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
maven/components/trunk/pom.xml
Modified: maven/components/trunk/maven-compat/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/pom.xml?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/pom.xml (original)
+++ maven/components/trunk/maven-compat/pom.xml Sat Nov 15 18:38:13 2008
@@ -45,6 +45,14 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
+ <version>1.0-beta-3-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-beta-3-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java Sat Nov 15 18:38:13 2008
@@ -129,6 +129,18 @@
return container.lookup( role, roleHint );
}
+ public <T> T lookup( Class<T> type )
+ throws ComponentLookupException
+ {
+ return container.lookup( type );
+ }
+
+ public <T> T lookup( Class<T> type, String roleHint )
+ throws ComponentLookupException
+ {
+ return container.lookup( type, roleHint );
+ }
+
public List lookupList( String role )
throws ComponentLookupException
{
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Sat Nov 15 18:38:13 2008
@@ -367,7 +367,7 @@
* from the core Maven realm, and contains the specific build-extension
* components referenced in that project, the lookup realms must be managed for
* each project that's used to fire off a mojo execution. This helps ensure
- * that unsafe {@link PlexusContainer#lookup(String)} and related calls will
+ * that unsafe {@link PlexusContainer#lookup} and related calls will
* have access to these build-extension components.
* <br />
* This method simply restores the original Maven-core lookup realm when a
@@ -386,7 +386,7 @@
* from the core Maven realm, and contains the specific build-extension
* components referenced in that project, the lookup realms must be managed for
* each project that's used to fire off a mojo execution. This helps ensure
- * that unsafe {@link PlexusContainer#lookup(String)} and related calls will
+ * that unsafe {@link PlexusContainer#lookup} and related calls will
* have access to these build-extension components.
* <br />
* This method is meant to find a project-specific realm, if one exists, for
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=717964&r1=717963&r2=717964&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 Sat Nov 15 18:38:13 2008
@@ -815,12 +815,12 @@
getLogger().debug(
"Looking up mojo " + mojoDescriptor.getRoleHint() + " in realm "
+ pluginRealm.getId() + " - descRealmId="
- + mojoDescriptor.getRealmId() );
+ + mojoDescriptor.getRealm() );
Mojo mojo;
try
{
- mojo = (Mojo) container.lookup( Mojo.ROLE, mojoDescriptor.getRoleHint(), pluginRealm );
+ mojo = container.lookup( Mojo.class, mojoDescriptor.getRoleHint() );
}
catch ( ComponentLookupException e )
{
@@ -1344,11 +1344,11 @@
// so that this meethod could entirely be handled by a plexus lookup?
if ( StringUtils.isNotEmpty( configuratorId ) )
{
- configurator = (ComponentConfigurator) container.lookup( ComponentConfigurator.ROLE, configuratorId, realm );
+ configurator = container.lookup( ComponentConfigurator.class, configuratorId );
}
else
{
- configurator = (ComponentConfigurator) container.lookup( ComponentConfigurator.ROLE, "basic", realm );
+ configurator = container.lookup( ComponentConfigurator.class, "basic" );
}
ConfigurationListener listener = new DebugConfigurationListener( getLogger() );
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java Sat Nov 15 18:38:13 2008
@@ -186,7 +186,7 @@
// that allows most of the extension to stay hidden, and the
// specific local extension components are still accessible
// from the project-level realm.
- comp.setRealmId( realm.getId() );
+ comp.setRealm( realm );
// Finally, add the extension component's descriptor (with projectRealm
// set as the lookup realm) to the container.
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenRealmManagerTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenRealmManagerTest.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenRealmManagerTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenRealmManagerTest.java Sat Nov 15 18:38:13 2008
@@ -21,7 +21,7 @@
{
super.setUp();
- factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
+ factory = lookup( ArtifactFactory.class );
}
public void test_ReuseSingleExtensionRealmFromMultipleProjectRealms_UsingTwoManagerInstances()
@@ -57,9 +57,7 @@
mgr1.importExtensionsIntoProjectRealm( "org.group", pAid1, "2", ext1 );
- String targetClass = ArtifactFactory.ROLE;
-
- Object result1 = getContainer().lookup( targetClass, "test", mgr1.getProjectRealm( "org.group", pAid1, "2" ) );
+ ArtifactFactory result1 = getContainer().lookup( ArtifactFactory.class, "test" );
assertNotNull( result1 );
@@ -72,7 +70,7 @@
// ext2 doesn't have a file associated with it, but it SHOULD succeed anyway.
mgr2.importExtensionsIntoProjectRealm( "org.group", pAid2, "2", ext2 );
- Object result2 = getContainer().lookup( targetClass, "test", mgr2.getProjectRealm( "org.group", pAid2, "2" ) );
+ ArtifactFactory result2 = getContainer().lookup( ArtifactFactory.class, "test" );
assertNotNull( result2 );
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParserTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParserTest.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParserTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParserTest.java Sat Nov 15 18:38:13 2008
@@ -27,11 +27,11 @@
{
super.setUp();
- parser = (LegacyLifecycleMappingParser) lookup( LegacyLifecycleMappingParser.ROLE, "default" );
+ parser = lookup( LegacyLifecycleMappingParser.class, "default" );
- testComponent = (LegacyLifecycleParsingTestComponent) lookup( LegacyLifecycleParsingTestComponent.ROLE, "default" );
- testMapping = (LifecycleMapping) lookup( LifecycleMapping.ROLE, "test-mapping" );
- testMapping2 = (LifecycleMapping) lookup( LifecycleMapping.ROLE, "test-mapping2" );
+ testComponent = lookup( LegacyLifecycleParsingTestComponent.class, "default" );
+ testMapping = lookup( LifecycleMapping.class, "test-mapping" );
+ testMapping2 = lookup( LifecycleMapping.class, "test-mapping2" );
}
public void tearDown()
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManagerTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManagerTest.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManagerTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManagerTest.java Sat Nov 15 18:38:13 2008
@@ -44,7 +44,7 @@
{
super.setUp();
- mgr = (LifecycleBindingManager) lookup( LifecycleBindingManager.ROLE, "default" );
+ mgr = lookup( LifecycleBindingManager.class, "default" );
}
public void testLookup()
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultMojoBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultMojoBindingFactoryTest.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultMojoBindingFactoryTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultMojoBindingFactoryTest.java Sat Nov 15 18:38:13 2008
@@ -17,7 +17,7 @@
{
super.setUp();
- factory = (MojoBindingFactory) lookup( MojoBindingFactory.ROLE, "default" );
+ factory = lookup( MojoBindingFactory.class, "default" );
}
public void testPrefixGoalSpec_PrefixReferenceNotAllowed()
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.java Sat Nov 15 18:38:13 2008
@@ -44,8 +44,8 @@
throws Exception
{
super.setUp();
- buildPlanner = (DefaultBuildPlanner) lookup( BuildPlanner.class.getName(), "default" );
- pluginLoader = (TestPluginLoader) lookup( PluginLoader.class.getName(), "default" );
+ buildPlanner = (DefaultBuildPlanner) lookup( BuildPlanner.class );
+ pluginLoader = (TestPluginLoader) lookup( PluginLoader.class );
}
public void test_constructBuildPlan_ForkedPhaseFromMojoBoundInThatPhase()
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java Sat Nov 15 18:38:13 2008
@@ -39,6 +39,7 @@
import org.apache.maven.settings.Settings;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.MutablePlexusContainer;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
import org.codehaus.plexus.logging.Logger;
@@ -73,8 +74,8 @@
throws Exception
{
super.setUp();
- factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
- pathTranslator = (PathTranslator) lookup( PathTranslator.ROLE );
+ factory = lookup( ArtifactFactory.class );
+ pathTranslator = lookup( PathTranslator.class );
}
public void testPluginDescriptorExpressionReference()
@@ -108,7 +109,7 @@
null,
Artifact.SCOPE_COMPILE );
- List deps = new ArrayList();
+ List<Artifact> deps = new ArrayList<Artifact>();
deps.add( depArtifact );
exec.getMojoDescriptor().getPluginDescriptor().setArtifacts( deps );
@@ -139,7 +140,7 @@
null,
Artifact.SCOPE_COMPILE );
- List deps = new ArrayList();
+ List<Artifact> deps = new ArrayList<Artifact>();
deps.add( depArtifact );
exec.getMojoDescriptor().getPluginDescriptor().setArtifacts( deps );
@@ -419,12 +420,11 @@
Properties executionProperties )
throws Exception
{
- ArtifactRepositoryLayout repoLayout =
- (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "legacy" );
+ ArtifactRepositoryLayout repoLayout = lookup( ArtifactRepositoryLayout.class, "legacy" );
ArtifactRepository repo = new DefaultArtifactRepository( "local", "target/repo", repoLayout );
- PlexusContainer container = getContainer();
+ MutablePlexusContainer container = (MutablePlexusContainer) getContainer();
MavenSession session = createSession( container, repo );
MojoDescriptor mojo = new MojoDescriptor();
@@ -442,7 +442,7 @@
String version )
throws Exception
{
- ArtifactFactory artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
+ ArtifactFactory artifactFactory = lookup( ArtifactFactory.class );
// TODO: used to be SCOPE_COMPILE, check
return artifactFactory.createBuildArtifact( groupId, artifactId, version, "jar" );
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java Sat Nov 15 18:38:13 2008
@@ -105,7 +105,7 @@
public void transferError( TransferEvent transferEvent )
{
// TODO: can't use getLogger() because this isn't currently instantiated as a component
- transferEvent.getException().printStackTrace();
+ // transferEvent.getException().printStackTrace();
}
/**
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Sat Nov 15 18:38:13 2008
@@ -324,7 +324,7 @@
ArtifactNotFoundException, InvalidPluginException, PluginManagerException,
PluginNotFoundException, PluginVersionNotFoundException
{
- PluginManager pluginManager = (PluginManager) container.lookup( PluginManager.ROLE );
+ PluginManager pluginManager = container.lookup( PluginManager.class );
// MavenSession session = new MavenSession( container, request, null, null, projectSessions );
MavenSession session = new MavenSession( container, request, null, null );
@@ -611,7 +611,7 @@
ContainerConfiguration cc = new DefaultContainerConfiguration()
.addComponentDiscoverer( new MavenPluginDiscoverer() )
.addComponentDiscoveryListener( new MavenPluginCollector() )
- .setClassWorld( classWorld ).setParentContainer( configuration.getParentContainer() ).setName( "embedder" );
+ .setClassWorld( classWorld ).setName( "embedder" );
container = new DefaultPlexusContainer( cc );
}
@@ -646,23 +646,23 @@
modelWriter = new MavenXpp3Writer();
- maven = (Maven) container.lookup( Maven.ROLE );
+ maven = container.lookup( Maven.class );
- mavenProjectBuilder = (MavenProjectBuilder) container.lookup( MavenProjectBuilder.ROLE );
+ mavenProjectBuilder = container.lookup( MavenProjectBuilder.class );
// ----------------------------------------------------------------------
// Artifact related components
// ----------------------------------------------------------------------
- artifactFactory = (ArtifactFactory) container.lookup( ArtifactFactory.ROLE );
+ artifactFactory = container.lookup( ArtifactFactory.class );
- artifactResolver = (ArtifactResolver) container.lookup( ArtifactResolver.ROLE, "default" );
+ artifactResolver = container.lookup( ArtifactResolver.class );
- populator = (MavenExecutionRequestPopulator) container.lookup( MavenExecutionRequestPopulator.ROLE );
+ populator = container.lookup( MavenExecutionRequestPopulator.class );
- buildPlanner = (BuildPlanner) container.lookup( BuildPlanner.class );
+ buildPlanner = container.lookup( BuildPlanner.class );
- artifactHandlerManager = (ArtifactHandlerManager) container.lookup( ArtifactHandlerManager.ROLE );
+ artifactHandlerManager = container.lookup( ArtifactHandlerManager.class );
// This is temporary as we can probably cache a single request and use it for default values and
// simply cascade values in from requests used for individual executions.
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java Sat Nov 15 18:38:13 2008
@@ -50,6 +50,7 @@
import org.apache.maven.wagon.repository.RepositoryPermissions;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.MutablePlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.context.Context;
@@ -89,7 +90,7 @@
private ArtifactRepositoryLayout defaultArtifactRepositoryLayout;
- private PlexusContainer container;
+ private MutablePlexusContainer container;
private WagonManager wagonManager;
@@ -574,7 +575,7 @@
private void resolveParameters( Settings settings )
throws ComponentLookupException, ComponentLifecycleException, SettingsConfigurationException
{
- WagonManager wagonManager = (WagonManager) container.lookup( WagonManager.ROLE );
+ WagonManager wagonManager = container.lookup( WagonManager.class );
try
{
@@ -715,6 +716,6 @@
public void contextualize( Context context )
throws ContextException
{
- container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
+ container = (MutablePlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
}
}
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java Sat Nov 15 18:38:13 2008
@@ -86,12 +86,12 @@
.setMavenEmbedderLogger( new MavenEmbedderConsoleLogger() ) );
}
- protected Map getPluginExtensionComponents( Plugin plugin )
+ protected Map<String, ArtifactHandler> getPluginExtensionComponents( Plugin plugin )
throws PluginManagerException
{
try
{
- return getPlexusContainer().lookupMap( ArtifactHandler.ROLE );
+ return getPlexusContainer().lookupMap( ArtifactHandler.class );
}
catch ( ComponentLookupException e )
{
Modified: maven/components/trunk/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/ClassLoaderXmlBindingLoaderTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/ClassLoaderXmlBindingLoaderTest.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/ClassLoaderXmlBindingLoaderTest.java (original)
+++ maven/components/trunk/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/ClassLoaderXmlBindingLoaderTest.java Sat Nov 15 18:38:13 2008
@@ -37,7 +37,7 @@
public void testComponentAccess_ParseSingleCleanBinding()
throws Exception
{
- LifecycleBindingLoader loader = (LifecycleBindingLoader) lookup( LifecycleBindingLoader.ROLE, "single-clean-mapping" );
+ LifecycleBindingLoader loader = lookup( LifecycleBindingLoader.class, "single-clean-mapping" );
LifecycleBindings bindings = loader.getBindings();
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java Sat Nov 15 18:38:13 2008
@@ -28,6 +28,7 @@
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.profiles.activation.ProfileActivator;
import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.MutablePlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
@@ -41,7 +42,7 @@
public class DefaultProfileManager
implements ProfileManager
{
- private PlexusContainer container;
+ private MutablePlexusContainer container;
private Map profilesById = new LinkedHashMap();
@@ -53,7 +54,7 @@
*/
public DefaultProfileManager( PlexusContainer container, ProfileActivationContext profileActivationContext )
{
- this.container = container;
+ this.container = (MutablePlexusContainer) container;
if ( profileActivationContext == null )
{
this.profileActivationContext = createDefaultActivationContext();
@@ -70,7 +71,7 @@
*/
public DefaultProfileManager( PlexusContainer container )
{
- this.container = container;
+ this.container = (MutablePlexusContainer) container;
profileActivationContext = createDefaultActivationContext();
}
@@ -259,16 +260,14 @@
private boolean isActive( Profile profile, ProfileActivationContext context )
throws ProfileActivationException
{
- List activators = null;
+ List<ProfileActivator> activators = null;
try
{
- activators = container.lookupList( ProfileActivator.ROLE );
+ activators = container.lookupList( ProfileActivator.class );
- for ( Iterator activatorIterator = activators.iterator(); activatorIterator.hasNext(); )
+ for ( ProfileActivator activator : activators )
{
- ProfileActivator activator = (ProfileActivator) activatorIterator.next();
-
if ( activator.canDetermineActivation( profile, context ) )
{
if ( activator.isActive( profile, context ) )
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java Sat Nov 15 18:38:13 2008
@@ -84,7 +84,7 @@
try
{
- activator = (ProfileActivator) container.lookup( ProfileActivator.ROLE, type );
+ activator = container.lookup( ProfileActivator.class, type );
}
catch ( ComponentLookupException e )
{
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java Sat Nov 15 18:38:13 2008
@@ -51,12 +51,12 @@
if ( getContainer().hasComponent( MavenProjectBuilder.ROLE, "test" ) )
{
- projectBuilder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE, "test" );
+ projectBuilder = lookup( MavenProjectBuilder.class, "test" );
}
else
{
// default over to the main project builder...
- projectBuilder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
+ projectBuilder = lookup( MavenProjectBuilder.class );
}
}
@@ -95,8 +95,7 @@
protected ArtifactRepository getLocalRepository()
throws Exception
{
- ArtifactRepositoryLayout repoLayout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE,
- "legacy" );
+ ArtifactRepositoryLayout repoLayout = lookup( ArtifactRepositoryLayout.class, "legacy" );
ArtifactRepository r = new DefaultArtifactRepository( "local",
"file://" + getLocalRepositoryPath().getAbsolutePath(),
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java Sat Nov 15 18:38:13 2008
@@ -50,7 +50,7 @@
{
super.setUp();
- projectBuilder = (DefaultMavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
+ projectBuilder = lookup( MavenProjectBuilder.class );
localRepoDir = new File( System.getProperty( "java.io.tmpdir" ), "local-repo." + System.currentTimeMillis() );
localRepoDir.mkdirs();
@@ -115,8 +115,7 @@
protected ArtifactRepository getLocalRepository()
throws Exception
{
- ArtifactRepositoryLayout repoLayout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE,
- "legacy" );
+ ArtifactRepositoryLayout repoLayout = lookup( ArtifactRepositoryLayout.class, "legacy" );
ArtifactRepository r = new DefaultArtifactRepository( "local", "file://" + localRepoDir.getAbsolutePath(),
repoLayout );
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectHelperTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectHelperTest.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectHelperTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectHelperTest.java Sat Nov 15 18:38:13 2008
@@ -20,8 +20,8 @@
{
super.setUp();
- mavenProjectHelper = (MavenProjectHelper) lookup( MavenProjectHelper.ROLE );
- artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
+ mavenProjectHelper = lookup( MavenProjectHelper.class );
+ artifactFactory = lookup( ArtifactFactory.class );
}
public void testShouldThrowExceptionWhenDuplicateAttachmentIsAdded()
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java Sat Nov 15 18:38:13 2008
@@ -38,9 +38,9 @@
File f = getFileForClasspathResource( dir + "project-with-scoped-dependencies.xml" );
// assertEquals( TestArtifactResolver.class, getContainer().lookup( ArtifactResolver.ROLE ).getClass() );
- TestProjectBuilder builder = (TestProjectBuilder) getContainer().lookup( MavenProjectBuilder.ROLE, "test" );
+ TestProjectBuilder builder = (TestProjectBuilder) getContainer().lookup( MavenProjectBuilder.class, "test" );
- TestArtifactResolver testArtifactResolver = (TestArtifactResolver) getContainer().lookup( TestArtifactResolver.class.getName() );
+ TestArtifactResolver testArtifactResolver = getContainer().lookup( TestArtifactResolver.class );
builder.setArtifactResolver( testArtifactResolver );
builder.setArtifactMetadataSource( testArtifactResolver.source() );
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java Sat Nov 15 18:38:13 2008
@@ -38,7 +38,7 @@
{
super.setUp();
- projectBuilder = (DefaultMavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
+ projectBuilder = lookup( MavenProjectBuilder.class );
}
public void testStandaloneSuperPomContainsInjectedExternalProfileRepositories()
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java Sat Nov 15 18:38:13 2008
@@ -66,7 +66,7 @@
deps.add( dep1 );
deps.add( dep2 );
- ArtifactFactory factory = ( ArtifactFactory ) lookup( ArtifactFactory.ROLE );
+ ArtifactFactory factory = lookup( ArtifactFactory.class );
ArtifactFilter dependencyFilter = new ScopeArtifactFilter( Artifact.SCOPE_COMPILE );
@@ -105,7 +105,7 @@
MavenProject project = new MavenProject( model );
- ArtifactFactory factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
+ ArtifactFactory factory = lookup( ArtifactFactory.class );
project.setArtifacts( project.createArtifacts( factory, null, null ) );
@@ -158,7 +158,7 @@
injector.injectDefaults( model );
- ArtifactFactory factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
+ ArtifactFactory factory = lookup( ArtifactFactory.class );
project.setArtifacts( project.createArtifacts( factory, null, null ) );
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java Sat Nov 15 18:38:13 2008
@@ -223,7 +223,7 @@
MavenXpp3Reader reader = new MavenXpp3Reader();
- validator = (ModelValidator) lookup( ModelValidator.ROLE );
+ validator = lookup( ModelValidator.class );
model = reader.read( input );
Modified: maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java (original)
+++ maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java Sat Nov 15 18:38:13 2008
@@ -38,6 +38,7 @@
* Provides methods for marshalling and unmarshalling XML that does not contain attributes.
*/
public final class ModelMarshaller
+ implements ModelPropertiesGenerator
{
/**
@@ -47,6 +48,16 @@
{
}
+ public List<ModelProperty> generateModelProperties( InputStream inputStream, String baseUri, Set<String> collections )
+ throws IOException
+ {
+ return marshallXmlToModelProperties( inputStream, baseUri, collections );
+ }
+
+ public void registerModelPropertyListener( String uri )
+ {
+ }
+
/**
* Returns list of model properties transformed from the specified input stream.
*
Modified: maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java (original)
+++ maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java Sat Nov 15 18:38:13 2008
@@ -77,7 +77,7 @@
try
{
PersistedToolchains pers = readToolchainSettings ();
- Map factories = container.lookupMap( ToolchainFactory.ROLE );
+ Map<String, ToolchainFactory> factories = container.lookupMap( ToolchainFactory.class );
List toRet = new ArrayList( );
if ( pers != null )
{
@@ -88,7 +88,7 @@
while ( it.hasNext() )
{
ToolchainModel toolchainModel = (ToolchainModel) it.next();
- ToolchainFactory fact = (ToolchainFactory) factories.get( toolchainModel.getType() );
+ ToolchainFactory fact = factories.get( toolchainModel.getType() );
if ( fact != null )
{
toRet.add( fact.createToolchain( toolchainModel ) );
@@ -100,11 +100,9 @@
}
}
}
- Iterator it = factories.values().iterator();
- while ( it.hasNext() )
+ for ( ToolchainFactory toolchainFactory : factories.values() )
{
- ToolchainFactory fact = (ToolchainFactory) it.next();
- ToolchainPrivate tool = fact.createDefaultToolchain();
+ ToolchainPrivate tool = toolchainFactory.createDefaultToolchain();
if ( tool != null )
{
toRet.add( tool );
@@ -136,7 +134,7 @@
{
try
{
- ToolchainFactory fact = (ToolchainFactory) container.lookup(ToolchainFactory.ROLE, type);
+ ToolchainFactory fact = container.lookup(ToolchainFactory.class, type);
return fact.createToolchain( model );
}
catch ( ComponentLookupException ex )
Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=717964&r1=717963&r2=717964&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Sat Nov 15 18:38:13 2008
@@ -156,7 +156,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- <version>1.0-beta-1.2</version>
+ <version>1.0-beta-3-SNAPSHOT</version>
<executions>
<execution>
<goals>
@@ -280,12 +280,12 @@
<properties>
<artifactVersion>3.0-alpha-2-SNAPSHOT</artifactVersion>
<aspectjVersion>1.5.3</aspectjVersion>
- <classWorldsVersion>1.2-alpha-13</classWorldsVersion>
+ <classWorldsVersion>1.2</classWorldsVersion>
<commonsCliVersion>1.0</commonsCliVersion>
<doxiaVersion>1.0-alpha-9</doxiaVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion>
<junitVersion>3.8.1</junitVersion>
- <plexusVersion>1.0-beta-1.2</plexusVersion>
+ <plexusVersion>1.0-beta-2-SNAPSHOT</plexusVersion>
<plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
<plexusInterpolationVersion>1.1</plexusInterpolationVersion>
<plexusUtilsVersion>1.5.5</plexusUtilsVersion>
Re: svn commit: r717964 - in /maven/components/trunk: ./ maven-compat/
maven-core/src/main/java/org/apache/maven/execution/ maven-core/src/main/java/org/apache/maven/lifecycle/
maven-core/src/main/java/org/apache/maven/plugin/ maven-core/src/main/java/org/...
Posted by Benjamin Bentmann <be...@udo.edu>.
Jason van Zyl wrote:
> Fixed, sorry about that.
>
> A build with Maven now works
Hm, I still get the missing dependency error for
plexus-container-default:jar:1.0-beta-2-SNAPSHOT
when doing "mvn clean package" on trunk.
Either the repo URL in the POM needs to be updated or the snapshots are
simply not deployed at all, e.g. I don't see it either on [0] or on [1],
though not sure whether you employ any other snapshot repos.
Benjamin
[0] http://snapshots.repository.codehaus.org/org/codehaus/plexus/
[1]
http://oss.repository.sonatype.org/content/repositories/plexus-snapshots/org/codehaus/plexus/plexus-container-default/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r717964 - in /maven/components/trunk: ./ maven-compat/ maven-core/src/main/java/org/apache/maven/execution/ maven-core/src/main/java/org/apache/maven/lifecycle/ maven-core/src/main/java/org/apache/maven/plugin/ maven-core/src/main/java/org/...
Posted by Jason van Zyl <jv...@sonatype.com>.
Fixed, sorry about that.
A build with Maven now works, but I still have a problem with the
bootstrap. Cleaning up all the realm lookups revealed a nasty bug in
ClassWorlds which I'm fixing now.
On 16-Nov-08, at 5:12 AM, Benjamin Bentmann wrote:
> Hi Jason,
>
>> Author: jvanzyl
>> Date: Sat Nov 15 18:38:13 2008
>> New Revision: 717964
>> URL: http://svn.apache.org/viewvc?rev=717964&view=rev
>> Log:
>> o use the class lookup method which will now automatically
>> partition lookups based on the class
>> submitted by: Dain Sundstrom
>> [...]
>> Modified: maven/components/trunk/maven-compat/pom.xml
>> URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/pom.xml?rev=717964&r1=717963&r2=717964&view=diff
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- maven/components/trunk/maven-compat/pom.xml (original)
>> +++ maven/components/trunk/maven-compat/pom.xml Sat Nov 15 18:38:13
>> 2008
>> @@ -45,6 +45,14 @@
>> <plugin>
>> <groupId>org.codehaus.plexus</groupId>
>> <artifactId>plexus-component-metadata</artifactId>
>> + <version>1.0-beta-3-SNAPSHOT</version>
>> + <dependencies>
>> + <dependency>
>> + <groupId>org.codehaus.plexus</groupId>
>> + <artifactId>plexus-container-default</artifactId>
>> + <version>1.0-beta-3-SNAPSHOT</version>
>> + </dependency>
>> + </dependencies>
>> </plugin>
>> </plugins>
>> </build>
>> Modified: maven/components/trunk/pom.xml
>> URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=717964&r1=717963&r2=717964&view=diff
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- maven/components/trunk/pom.xml (original)
>> +++ maven/components/trunk/pom.xml Sat Nov 15 18:38:13 2008
>> @@ -156,7 +156,7 @@
>> <plugin>
>> <groupId>org.codehaus.plexus</groupId>
>> <artifactId>plexus-component-metadata</artifactId>
>> - <version>1.0-beta-1.2</version>
>> + <version>1.0-beta-3-SNAPSHOT</version>
>> <executions>
>> <execution>
>> <goals>
>> @@ -280,12 +280,12 @@
>> <properties>
>> <artifactVersion>3.0-alpha-2-SNAPSHOT</artifactVersion>
>> <aspectjVersion>1.5.3</aspectjVersion>
>> - <classWorldsVersion>1.2-alpha-13</classWorldsVersion>
>> + <classWorldsVersion>1.2</classWorldsVersion>
>> <commonsCliVersion>1.0</commonsCliVersion>
>> <doxiaVersion>1.0-alpha-9</doxiaVersion>
>> <easyMockVersion>1.2_Java1.3</easyMockVersion>
>> <junitVersion>3.8.1</junitVersion>
>> - <plexusVersion>1.0-beta-1.2</plexusVersion>
>> + <plexusVersion>1.0-beta-2-SNAPSHOT</plexusVersion>
>> <plexusInteractivityVersion>1.0-alpha-6</
>> plexusInteractivityVersion>
>> <plexusInterpolationVersion>1.1</plexusInterpolationVersion>
>> <plexusUtilsVersion>1.5.5</plexusUtilsVersion>
>
> Just wondering: The plugin dependency is set to version 1.0-beta-3-
> SNAPSHOT but the property plexusVersion is set to 1.0-beta-2-
> SNAPSHOT. Is that right?
>
> The rather annoying problem while trying to build trunk:
>
>> [ERROR] BUILD ERROR
>> [INFO]
>> ------------------------------------------------------------------------
>> [INFO] Failed to resolve artifact.
>> Missing:
>> ----------
>> 1) org.codehaus.plexus:plexus-container-default:jar:1.0-beta-2-
>> SNAPSHOT
>> [...]
>> Path to dependency:
>> 1) org.apache.maven:maven-lifecycle:jar:3.0-SNAPSHOT
>> 2) org.codehaus.plexus:plexus-container-default:jar:1.0-
>> beta-2-SNAPSHOT
>> ----------
>> 1 required artifact is missing.
>> for artifact:
>> org.apache.maven:maven-lifecycle:jar:3.0-SNAPSHOT
>> from the specified remote repositories:
>> codehaus.snapshots (http://snapshots.repository.codehaus.org/),
>> apache.snapshots (http://people.apache.org/repo/m2-snapshot-repository/
>> ),
>> central (http://repo1.maven.org/maven2)
>
> i.e. the snapshots are not available unless locally built. Can you
> have a look at this please?
>
>
> Benjamin
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
Thanks,
Jason
----------------------------------------------------------
Jason van Zyl
Founder, Apache Maven
jason at sonatype dot com
----------------------------------------------------------
We know what we are, but know not what we may be.
-- Shakespeare
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r717964 - in /maven/components/trunk: ./ maven-compat/
maven-core/src/main/java/org/apache/maven/execution/ maven-core/src/main/java/org/apache/maven/lifecycle/
maven-core/src/main/java/org/apache/maven/plugin/ maven-core/src/main/java/org/...
Posted by Benjamin Bentmann <be...@udo.edu>.
Hi Jason,
> Author: jvanzyl
> Date: Sat Nov 15 18:38:13 2008
> New Revision: 717964
>
> URL: http://svn.apache.org/viewvc?rev=717964&view=rev
> Log:
> o use the class lookup method which will now automatically partition lookups based on the class
> submitted by: Dain Sundstrom
>
> [...]
>
> Modified: maven/components/trunk/maven-compat/pom.xml
> URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/pom.xml?rev=717964&r1=717963&r2=717964&view=diff
> ==============================================================================
> --- maven/components/trunk/maven-compat/pom.xml (original)
> +++ maven/components/trunk/maven-compat/pom.xml Sat Nov 15 18:38:13 2008
> @@ -45,6 +45,14 @@
> <plugin>
> <groupId>org.codehaus.plexus</groupId>
> <artifactId>plexus-component-metadata</artifactId>
> + <version>1.0-beta-3-SNAPSHOT</version>
> + <dependencies>
> + <dependency>
> + <groupId>org.codehaus.plexus</groupId>
> + <artifactId>plexus-container-default</artifactId>
> + <version>1.0-beta-3-SNAPSHOT</version>
> + </dependency>
> + </dependencies>
> </plugin>
> </plugins>
> </build>
>
>
> Modified: maven/components/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=717964&r1=717963&r2=717964&view=diff
> ==============================================================================
> --- maven/components/trunk/pom.xml (original)
> +++ maven/components/trunk/pom.xml Sat Nov 15 18:38:13 2008
> @@ -156,7 +156,7 @@
> <plugin>
> <groupId>org.codehaus.plexus</groupId>
> <artifactId>plexus-component-metadata</artifactId>
> - <version>1.0-beta-1.2</version>
> + <version>1.0-beta-3-SNAPSHOT</version>
> <executions>
> <execution>
> <goals>
> @@ -280,12 +280,12 @@
> <properties>
> <artifactVersion>3.0-alpha-2-SNAPSHOT</artifactVersion>
> <aspectjVersion>1.5.3</aspectjVersion>
> - <classWorldsVersion>1.2-alpha-13</classWorldsVersion>
> + <classWorldsVersion>1.2</classWorldsVersion>
> <commonsCliVersion>1.0</commonsCliVersion>
> <doxiaVersion>1.0-alpha-9</doxiaVersion>
> <easyMockVersion>1.2_Java1.3</easyMockVersion>
> <junitVersion>3.8.1</junitVersion>
> - <plexusVersion>1.0-beta-1.2</plexusVersion>
> + <plexusVersion>1.0-beta-2-SNAPSHOT</plexusVersion>
> <plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
> <plexusInterpolationVersion>1.1</plexusInterpolationVersion>
> <plexusUtilsVersion>1.5.5</plexusUtilsVersion>
Just wondering: The plugin dependency is set to version
1.0-beta-3-SNAPSHOT but the property plexusVersion is set to
1.0-beta-2-SNAPSHOT. Is that right?
The rather annoying problem while trying to build trunk:
> [ERROR] BUILD ERROR
> [INFO] ------------------------------------------------------------------------
> [INFO] Failed to resolve artifact.
>
> Missing:
> ----------
> 1) org.codehaus.plexus:plexus-container-default:jar:1.0-beta-2-SNAPSHOT
>
> [...]
>
> Path to dependency:
> 1) org.apache.maven:maven-lifecycle:jar:3.0-SNAPSHOT
> 2) org.codehaus.plexus:plexus-container-default:jar:1.0-beta-2-SNAPSHOT
>
> ----------
> 1 required artifact is missing.
>
> for artifact:
> org.apache.maven:maven-lifecycle:jar:3.0-SNAPSHOT
>
> from the specified remote repositories:
> codehaus.snapshots (http://snapshots.repository.codehaus.org/),
> apache.snapshots (http://people.apache.org/repo/m2-snapshot-repository/),
> central (http://repo1.maven.org/maven2)
i.e. the snapshots are not available unless locally built. Can you have
a look at this please?
Benjamin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org