You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/01/14 22:45:09 UTC
svn commit: r611945 [1/2] - in /maven/components/trunk:
maven-core/src/main/aspect/org/apache/maven/errors/
maven-core/src/main/java/org/apache/maven/errors/
maven-core/src/main/java/org/apache/maven/lifecycle/
maven-core/src/main/resources/META-INF/pl...
Author: jdcasey
Date: Mon Jan 14 13:44:59 2008
New Revision: 611945
URL: http://svn.apache.org/viewvc?rev=611945&view=rev
Log:
Adding more error-reporting fixes and unit tests.
Added:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/pom.xml (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/ComponentOne.java (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/ComponentTwo.java (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/TestPlugin.java (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/resources/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/resources/META-INF/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/resources/META-INF/plexus/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/resources/META-INF/plexus/components.xml (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/project/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/project/pom.xml (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/pom.xml (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/src/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/src/main/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/src/main/java/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/src/main/java/org/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/src/main/java/org/plugin/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/src/main/java/org/plugin/TestPlugin.java (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/project/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/project/pom.xml (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/pom.xml (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/java/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/java/org/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/java/org/ext/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/java/org/ext/App.java (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/resources/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/resources/META-INF/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/resources/META-INF/plexus/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/resources/META-INF/plexus/components.xml (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/project/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/project/pom.xml (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/errortest/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/errortest/test-maven-ext/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/errortest/test-maven-ext-dep/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/errortest/test-maven-ext-dep/1/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/errortest/test-maven-ext-dep/1/test-maven-ext-dep-1.pom (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/errortest/test-maven-ext/1/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/project/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/project/pom.xml (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/local-repo/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/local-repo/org/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/local-repo/org/apache/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/local-repo/org/apache/maven/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/local-repo/org/apache/maven/errortest/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/local-repo/org/apache/maven/errortest/test-maven-ext/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/local-repo/org/apache/maven/errortest/test-maven-ext/1/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/project/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/project/pom.xml (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportInvalidMavenVersion/
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportInvalidMavenVersion/pom.xml (with props)
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportLifecycleLoaderErrorWhileValidatingTask/
Modified:
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/AbstractCoreReporterAspect.aj
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/BuildFailureReporterAspect.aj
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/ExtensionErrorReporterAspect.aj
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/MavenExecErrorReporterAspect.aj
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorTips.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportBadNonDependencyProjectArtifactVersion/pom.xml
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
Modified: maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/AbstractCoreReporterAspect.aj
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/AbstractCoreReporterAspect.aj?rev=611945&r1=611944&r2=611945&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/AbstractCoreReporterAspect.aj (original)
+++ maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/AbstractCoreReporterAspect.aj Mon Jan 14 13:44:59 2008
@@ -3,6 +3,9 @@
public abstract aspect AbstractCoreReporterAspect
{
+ protected pointcut notWithinAspect():
+ !within( *.*Aspect+ );
+
protected CoreErrorReporter getReporter()
{
return CoreReporterManager.getReporter();
Modified: maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/BuildFailureReporterAspect.aj
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/BuildFailureReporterAspect.aj?rev=611945&r1=611944&r2=611945&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/BuildFailureReporterAspect.aj (original)
+++ maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/BuildFailureReporterAspect.aj Mon Jan 14 13:44:59 2008
@@ -1,7 +1,6 @@
package org.apache.maven.errors;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.lifecycle.TaskValidationResult;
import org.apache.maven.lifecycle.LifecycleLoaderException;
import org.apache.maven.lifecycle.LifecycleSpecificationException;
import org.apache.maven.plugin.loader.PluginLoaderException;
@@ -9,17 +8,24 @@
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.lifecycle.model.MojoBinding;
import org.apache.maven.lifecycle.LifecycleExecutor;
+import org.apache.maven.lifecycle.DefaultLifecycleExecutor;
import org.apache.maven.NoGoalsSpecifiedException;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.execution.ReactorManager;
import org.apache.maven.AggregatedBuildFailureException;
import org.apache.maven.ProjectBuildFailureException;
import org.apache.maven.Maven;
+import org.apache.maven.plugin.loader.PluginLoader;
+import org.apache.maven.lifecycle.binding.MojoBindingFactory;
-public aspect BuildFailureReporterAspect
+public privileged aspect BuildFailureReporterAspect
extends AbstractCoreReporterAspect
{
+ private pointcut within_le_execute( MavenSession session, ReactorManager reactorManager ):
+ withincode( void LifecycleExecutor+.execute( MavenSession, ReactorManager, .. ) )
+ && args( session, reactorManager, .. );
+
private pointcut le_execute( MavenSession session, ReactorManager reactorManager ):
execution( void LifecycleExecutor+.execute( MavenSession, ReactorManager, .. ) )
&& args( session, reactorManager, .. );
@@ -35,12 +41,15 @@
* </code>
* </pre>
*/
- after( ReactorManager reactorManager, NoGoalsSpecifiedException err ):
+ NoGoalsSpecifiedException around( ReactorManager reactorManager ):
cflow( le_execute( MavenSession, reactorManager ) )
- && execution( NoGoalsSpecifiedException.new( .. ) )
- && this( err )
+ && call( NoGoalsSpecifiedException.new( .. ) )
{
+ NoGoalsSpecifiedException err = proceed( reactorManager );
+
getReporter().reportNoGoalsSpecifiedException( reactorManager.getTopLevelProject(), err );
+
+ return err;
}
private pointcut aggregatedBuildFailureException_ctor( MojoBinding binding, MojoFailureException cause ):
@@ -113,9 +122,8 @@
getReporter().reportProjectCycle( err );
}
- private pointcut le_isTaskValid( MavenSession session, MavenProject rootProject ):
- execution( TaskValidationResult LifecycleExecutor+.isTaskValid( .., MavenSession, MavenProject ) )
- && args( .., session, rootProject );
+ private pointcut within_le_getMojoDescriptorForDirectInvocation():
+ withincode( * DefaultLifecycleExecutor.getMojoDescriptorForDirectInvocation( String, MavenSession, MavenProject ) );
/**
* Call stack is:
@@ -129,15 +137,20 @@
* </code>
* </pre>
*/
- before( MavenSession session, MavenProject rootProject, PluginLoaderException cause, TaskValidationResult result ):
- cflow( le_isTaskValid( session, rootProject ) )
- && execution( TaskValidationResult.new( .., PluginLoaderException ) )
- && args( .., cause )
- && this( result )
- {
- getReporter().reportPluginErrorWhileValidatingTask( session, rootProject, cause, result );
+ after( MojoBinding binding, MavenSession session, MavenProject rootProject ) throwing ( PluginLoaderException cause ):
+ within_le_getMojoDescriptorForDirectInvocation()
+ && call( * PluginLoader+.loadPlugin( MojoBinding, MavenProject, MavenSession ) )
+ && args( binding, rootProject, session )
+ {
+ getReporter().reportPluginErrorWhileValidatingTask( binding.getGoal(), session, rootProject, cause );
}
+// before():
+// call( * MojoBindingFactory+.parseMojoBinding( String, MavenProject, MavenSession, boolean ) )
+// {
+// System.out.println( "Boo" );
+// }
+
/**
* Call stack is:
* <br/>
@@ -150,13 +163,12 @@
* </code>
* </pre>
*/
- before( MavenSession session, MavenProject rootProject, LifecycleSpecificationException cause, TaskValidationResult result ):
- cflow( le_isTaskValid( session, rootProject ) )
- && execution( TaskValidationResult.new( .., LifecycleSpecificationException ) )
- && args( .., cause )
- && this( result )
+ after( String task, MavenSession session, MavenProject rootProject ) throwing ( LifecycleSpecificationException cause ):
+ within_le_getMojoDescriptorForDirectInvocation()
+ && call( * MojoBindingFactory+.parseMojoBinding( String, MavenProject, MavenSession, .. ) )
+ && args( task, rootProject, session, .. )
{
- getReporter().reportLifecycleSpecErrorWhileValidatingTask( session, rootProject, cause, result );
+ getReporter().reportLifecycleSpecErrorWhileValidatingTask( task, session, rootProject, cause );
}
/**
@@ -171,13 +183,12 @@
* </code>
* </pre>
*/
- before( MavenSession session, MavenProject rootProject, LifecycleLoaderException cause, TaskValidationResult result ):
- cflow( le_isTaskValid( session, rootProject ) )
- && execution( TaskValidationResult.new( .., LifecycleLoaderException ) )
- && args( .., cause )
- && this( result )
+ after( String task, MavenSession session, MavenProject rootProject ) throwing ( LifecycleLoaderException cause ):
+ within_le_getMojoDescriptorForDirectInvocation()
+ && call( * MojoBindingFactory+.parseMojoBinding( String, MavenProject, MavenSession, .. ) )
+ && args( task, rootProject, session, .. )
{
- getReporter().reportLifecycleLoaderErrorWhileValidatingTask( session, rootProject, cause, result );
+ getReporter().reportLifecycleLoaderErrorWhileValidatingTask( task, session, rootProject, cause );
}
}
Modified: maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/ExtensionErrorReporterAspect.aj
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/ExtensionErrorReporterAspect.aj?rev=611945&r1=611944&r2=611945&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/ExtensionErrorReporterAspect.aj (original)
+++ maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/ExtensionErrorReporterAspect.aj Mon Jan 14 13:44:59 2008
@@ -31,7 +31,6 @@
import org.apache.maven.execution.RuntimeInformation;
import java.io.File;
-import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -47,17 +46,6 @@
getReporter().handleSuperPomBuildingError( cause );
}
- private pointcut within_dbes_checkModulesForExtensions():
- withincode( * DefaultBuildExtensionScanner.checkModulesForExtensions( File, Model, MavenExecutionRequest, List, List, List ) );
-
- before( File pomFile, IOException cause ):
- within_dbes_checkModulesForExtensions()
- && call( ExtensionScanningException.new( String, File, String, IOException ) )
- && args( *, pomFile, *, cause )
- {
- getReporter().reportPomFileCanonicalizationError( pomFile, cause );
- }
-
private pointcut dbes_scanInternal( File pomFile, MavenExecutionRequest request ):
execution( void DefaultBuildExtensionScanner.scanInternal( File, MavenExecutionRequest, .. ) )
&& args( pomFile, request, .. );
@@ -123,7 +111,7 @@
&& within_dem_addPluginAsExtension()
&& call_eme_ctor_RealmManagementException( cause )
{
- getReporter().reportErrorManagingRealmForExtensionPlugin( plugin, originModel, remoteRepos, request, cause );
+ getReporter().reportErrorConfiguringExtensionPluginRealm( plugin, originModel, remoteRepos, request, cause );
}
before( Plugin plugin, Model originModel, List remoteRepos, MavenExecutionRequest request, ArtifactNotFoundException cause ):
Modified: maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/MavenExecErrorReporterAspect.aj
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/MavenExecErrorReporterAspect.aj?rev=611945&r1=611944&r2=611945&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/MavenExecErrorReporterAspect.aj (original)
+++ maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/MavenExecErrorReporterAspect.aj Mon Jan 14 13:44:59 2008
@@ -10,10 +10,8 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
-import org.codehaus.plexus.util.FileUtils;
import java.io.File;
-import java.io.IOException;
import java.util.List;
public aspect MavenExecErrorReporterAspect
@@ -49,36 +47,21 @@
return currentProject;
}
- before( MavenExecutionException err ):
+ MavenExecutionException around():
cflow( dm_getProjects( MavenExecutionRequest ) )
&& cflow( dm_collectProjects( ArtifactRepository, ProfileManager ) )
- && execution( MavenExecutionException.new( String, File ) )
- && this( err )
+ && call( MavenExecutionException.new( String, File ) )
{
+ MavenExecutionException err = proceed();
+
getReporter().reportInvalidMavenVersion( currentProject, mavenVersion, err );
+
+ return err;
}
after(): dm_collectProjects( ArtifactRepository, ProfileManager )
{
currentProject = null;
- }
-
- after( File basedir, String includes, String excludes ) throwing( IOException cause ):
- cflow( dm_getProjects( MavenExecutionRequest ) )
- && cflow( execution( * DefaultMaven.getProjectFiles( MavenExecutionRequest ) ) )
- && call( * FileUtils.getFiles( File, String, String ) )
- && args( basedir, includes, excludes )
- {
- getReporter().reportPomFileScanningError( basedir, includes, excludes, cause );
- }
-
- after( File pomFile ) throwing( IOException cause ):
- cflow( dm_getProjects( MavenExecutionRequest ) )
- && cflow( dm_collectProjects( ArtifactRepository, ProfileManager ) )
- && call( File File.getCanonicalFile() )
- && target( pomFile )
- {
- getReporter().reportPomFileCanonicalizationError( pomFile, cause );
}
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java?rev=611945&r1=611944&r2=611945&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java Mon Jan 14 13:44:59 2008
@@ -17,7 +17,6 @@
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.lifecycle.LifecycleLoaderException;
import org.apache.maven.lifecycle.LifecycleSpecificationException;
-import org.apache.maven.lifecycle.TaskValidationResult;
import org.apache.maven.lifecycle.model.MojoBinding;
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
@@ -46,7 +45,6 @@
import org.codehaus.plexus.logging.Logger;
import java.io.File;
-import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -64,6 +62,8 @@
void reportErrorConfiguringExtensionPluginRealm( Plugin plugin, Model originModel, List remoteRepos, MavenExecutionRequest request, PluginManagerException cause );
+ void reportErrorConfiguringExtensionPluginRealm( Plugin plugin, Model originModel, List remoteRepos, MavenExecutionRequest request, RealmManagementException cause );
+
void reportErrorFormulatingBuildPlan( List tasks, MavenProject configuringProject, String targetDescription, LifecycleException cause );
void reportErrorInterpolatingModel( Model model, Map inheritedValues, File pomFile, MavenExecutionRequest request, ModelInterpolationException cause );
@@ -72,8 +72,6 @@
void reportErrorManagingRealmForExtension( Artifact extensionArtifact, Artifact projectArtifact, List remoteRepos, MavenExecutionRequest request, RealmManagementException cause );
- void reportErrorManagingRealmForExtensionPlugin( Plugin plugin, Model originModel, List remoteRepos, MavenExecutionRequest request, RealmManagementException cause );
-
void reportErrorResolvingExtensionDependencies( Artifact extensionArtifact, Artifact projectArtifact, List remoteRepos, MavenExecutionRequest request, ArtifactResolutionResult resolutionResult, ExtensionManagerException err );
void reportErrorResolvingExtensionDirectDependencies( Artifact extensionArtifact, Artifact projectArtifact, List remoteRepos, MavenExecutionRequest request, ArtifactMetadataRetrievalException cause );
@@ -92,9 +90,9 @@
void reportInvalidPluginExecutionEnvironment( MojoBinding binding, MavenProject project, PluginExecutionException cause );
- void reportLifecycleLoaderErrorWhileValidatingTask( MavenSession session, MavenProject rootProject, LifecycleLoaderException cause, TaskValidationResult result );
+ void reportLifecycleLoaderErrorWhileValidatingTask( String task, MavenSession session, MavenProject rootProject, LifecycleLoaderException cause );
- void reportLifecycleSpecErrorWhileValidatingTask( MavenSession session, MavenProject rootProject, LifecycleSpecificationException cause, TaskValidationResult result );
+ void reportLifecycleSpecErrorWhileValidatingTask( String task, MavenSession session, MavenProject rootProject, LifecycleSpecificationException cause );
void reportMissingArtifactWhileAddingExtensionPlugin( Plugin plugin, Model originModel, List remoteRepos, MavenExecutionRequest request, ArtifactNotFoundException cause );
@@ -108,11 +106,7 @@
void reportNoGoalsSpecifiedException( MavenProject rootProject, NoGoalsSpecifiedException error );
- void reportPluginErrorWhileValidatingTask( MavenSession session, MavenProject rootProject, PluginLoaderException cause, TaskValidationResult result );
-
- void reportPomFileCanonicalizationError( File pomFile, IOException cause );
-
- void reportPomFileScanningError( File basedir, String includes, String excludes, IOException cause );
+ void reportPluginErrorWhileValidatingTask( String task, MavenSession session, MavenProject rootProject, PluginLoaderException cause );
void reportProjectCycle( ProjectCycleException error );
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorTips.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorTips.java?rev=611945&r1=611944&r2=611945&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorTips.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorTips.java Mon Jan 14 13:44:59 2008
@@ -9,7 +9,6 @@
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.execution.RealmManagementException;
import org.apache.maven.lifecycle.LifecycleException;
-import org.apache.maven.lifecycle.TaskValidationResult;
import org.apache.maven.lifecycle.model.MojoBinding;
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
@@ -67,7 +66,7 @@
return null;
}
- public static List getTaskValidationTips( TaskValidationResult result, Exception cause )
+ public static List getTaskValidationTips( String task, Exception cause )
{
// TODO Auto-generated method stub
return null;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java?rev=611945&r1=611944&r2=611945&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java Mon Jan 14 13:44:59 2008
@@ -21,7 +21,6 @@
import org.apache.maven.lifecycle.LifecycleLoaderException;
import org.apache.maven.lifecycle.LifecycleSpecificationException;
import org.apache.maven.lifecycle.MojoBindingUtils;
-import org.apache.maven.lifecycle.TaskValidationResult;
import org.apache.maven.lifecycle.model.MojoBinding;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
@@ -56,7 +55,6 @@
import org.codehaus.plexus.util.dag.CycleDetectedException;
import java.io.File;
-import java.io.IOException;
import java.io.StringWriter;
import java.util.HashMap;
import java.util.Iterator;
@@ -251,58 +249,58 @@
registerBuildError( error, writer.toString(), cause );
}
- public void reportLifecycleLoaderErrorWhileValidatingTask( MavenSession session,
+ public void reportLifecycleLoaderErrorWhileValidatingTask( String task,
+ MavenSession session,
MavenProject rootProject,
- LifecycleLoaderException cause,
- TaskValidationResult result )
+ LifecycleLoaderException cause )
{
StringWriter writer = new StringWriter();
writer.write( NEWLINE );
writer.write( "Invalid mojo or lifecycle phase: " );
- writer.write( result.getInvalidTask() );
+ writer.write( task );
writer.write( NEWLINE );
writer.write( NEWLINE );
writer.write( "Original error message was: " );
writer.write( cause.getMessage() );
- addTips( CoreErrorTips.getTaskValidationTips( result, cause ), writer );
+ addTips( CoreErrorTips.getTaskValidationTips( task, cause ), writer );
registerBuildError( cause, writer.toString(), cause.getCause() );
}
- public void reportLifecycleSpecErrorWhileValidatingTask( MavenSession session,
+ public void reportLifecycleSpecErrorWhileValidatingTask( String task,
+ MavenSession session,
MavenProject rootProject,
- LifecycleSpecificationException cause,
- TaskValidationResult result )
+ LifecycleSpecificationException cause )
{
StringWriter writer = new StringWriter();
writer.write( NEWLINE );
writer.write( "Invalid mojo or lifecycle phase: " );
- writer.write( result.getInvalidTask() );
+ writer.write( task );
writer.write( NEWLINE );
writer.write( NEWLINE );
writer.write( "Original error message was: " );
writer.write( cause.getMessage() );
- addTips( CoreErrorTips.getTaskValidationTips( result, cause ), writer );
+ addTips( CoreErrorTips.getTaskValidationTips( task, cause ), writer );
registerBuildError( cause, writer.toString(), cause.getCause() );
}
- public void reportPluginErrorWhileValidatingTask( MavenSession session,
+ public void reportPluginErrorWhileValidatingTask( String task,
+ MavenSession session,
MavenProject rootProject,
- PluginLoaderException cause,
- TaskValidationResult result )
+ PluginLoaderException cause )
{
StringWriter writer = new StringWriter();
writer.write( NEWLINE );
writer.write( "Invalid mojo or lifecycle phase: " );
- writer.write( result.getInvalidTask() );
+ writer.write( task );
writer.write( NEWLINE );
writer.write( NEWLINE );
@@ -314,7 +312,7 @@
writer.write( "Original error message was: " );
writer.write( cause.getMessage() );
- addTips( CoreErrorTips.getTaskValidationTips( result, cause ), writer );
+ addTips( CoreErrorTips.getTaskValidationTips( task, cause ), writer );
registerBuildError( cause, writer.toString(), cause.getCause() );
}
@@ -895,56 +893,6 @@
registerBuildError( err, writer.toString() );
}
- public void reportPomFileScanningError( File basedir,
- String includes,
- String excludes,
- IOException cause )
- {
- StringWriter writer = new StringWriter();
-
- writer.write( NEWLINE );
- writer.write( "Maven encountered an error while scanning for POM files to build." );
- writer.write( NEWLINE );
- writer.write( NEWLINE );
-
- writer.write( "In base directory: " );
- writer.write( String.valueOf( basedir ) );
- writer.write( NEWLINE );
- writer.write( "with include pattern(s):" );
- writer.write( includes );
- writer.write( NEWLINE );
- writer.write( "and exclude pattern(s):" );
- writer.write( excludes );
- writer.write( NEWLINE );
- writer.write( NEWLINE );
- writer.write( "Error message: " );
- writer.write( cause.getMessage() );
-
- addTips( CoreErrorTips.getPomFileScanningErrorTips( basedir, includes, excludes ), writer );
-
- registerBuildError( cause, writer.toString(), cause.getCause() );
- }
-
- public void reportPomFileCanonicalizationError( File pomFile,
- IOException cause )
- {
- StringWriter writer = new StringWriter();
-
- writer.write( NEWLINE );
- writer.write( "Maven encountered an error while standardizing your POM's File instance." );
- writer.write( NEWLINE );
- writer.write( NEWLINE );
-
- writer.write( "POM file: " );
- writer.write( String.valueOf( pomFile ) );
- writer.write( NEWLINE );
- writer.write( NEWLINE );
- writer.write( "Error message: " );
- writer.write( cause.getMessage() );
-
- registerBuildError( cause, writer.toString(), cause.getCause() );
- }
-
public void handleSuperPomBuildingError( ProjectBuildingException exception )
{
ProjectErrorReporter projectReporter = ProjectReporterManager.getReporter();
@@ -1197,7 +1145,7 @@
registerBuildError( cause, writer.toString(), cause.getCause() );
}
- public void reportErrorManagingRealmForExtensionPlugin( Plugin plugin,
+ public void reportErrorConfiguringExtensionPluginRealm( Plugin plugin,
Model originModel,
List remoteRepos,
MavenExecutionRequest request,
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=611945&r1=611944&r2=611945&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 Mon Jan 14 13:44:59 2008
@@ -739,9 +739,9 @@
return segments;
}
- private MojoDescriptor getMojoDescriptorForDirectInvocation( final String task,
- final MavenSession session,
- final MavenProject project )
+ private MojoDescriptor getMojoDescriptorForDirectInvocation( String task,
+ MavenSession session,
+ MavenProject project )
throws LifecycleSpecificationException, PluginLoaderException, LifecycleLoaderException
{
// we don't need to include report configuration here, since we're just looking for
@@ -756,6 +756,7 @@
binding,
project,
session );
+
MojoDescriptor mojoDescriptor = descriptor.getMojo( binding.getGoal() );
return mojoDescriptor;
Modified: maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=611945&r1=611944&r2=611945&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml Mon Jan 14 13:44:59 2008
@@ -262,7 +262,7 @@
</requirement>
<requirement>
<role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
- <role-hint>default</role-hint>
+ <role-hint>maven-strict</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.artifact.manager.WagonManager</role>
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=611945&r1=611944&r2=611945&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 Mon Jan 14 13:44:59 2008
@@ -339,18 +339,24 @@
if ( request.getLocalRepository() == null )
{
- request.setLocalRepository( createLocalRepository( request.getSettings(), configuration ) );
+ request.setLocalRepository( createLocalRepository( request, request.getSettings(), configuration ) );
}
}
- public ArtifactRepository createLocalRepository( Settings settings,
+ public ArtifactRepository createLocalRepository( MavenExecutionRequest request,
+ Settings settings,
Configuration configuration )
throws MavenEmbedderException
{
String localRepositoryPath = null;
- if ( configuration.getLocalRepository() != null )
+ if ( request.getLocalRepositoryPath() != null )
+ {
+ localRepositoryPath = request.getLocalRepositoryPath().getAbsolutePath();
+ }
+
+ if ( StringUtils.isEmpty( localRepositoryPath ) && ( configuration.getLocalRepository() != null ) )
{
localRepositoryPath = configuration.getLocalRepository().getAbsolutePath();
}
Modified: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportBadNonDependencyProjectArtifactVersion/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportBadNonDependencyProjectArtifactVersion/pom.xml?rev=611945&r1=611944&r2=611945&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportBadNonDependencyProjectArtifactVersion/pom.xml (original)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportBadNonDependencyProjectArtifactVersion/pom.xml Mon Jan 14 13:44:59 2008
@@ -24,12 +24,12 @@
<version>1</version>
<build>
- <extensions>
- <extension>
+ <plugins>
+ <plugin>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>[3.1,</version>
- </extension>
- </extensions>
+ </plugin>
+ </plugins>
</build>
</project>
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/pom.xml?rev=611945&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/pom.xml (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/pom.xml Mon Jan 14 13:44:59 2008
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>test-maven-ext-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <version>1</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/ComponentOne.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/ComponentOne.java?rev=611945&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/ComponentOne.java (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/ComponentOne.java Mon Jan 14 13:44:59 2008
@@ -0,0 +1,8 @@
+package org.plugin;
+
+public class ComponentOne
+{
+
+ private ComponentTwo two;
+
+}
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/ComponentOne.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/ComponentOne.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/ComponentTwo.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/ComponentTwo.java?rev=611945&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/ComponentTwo.java (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/ComponentTwo.java Mon Jan 14 13:44:59 2008
@@ -0,0 +1,8 @@
+package org.plugin;
+
+public class ComponentTwo
+{
+
+ private ComponentOne one;
+
+}
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/ComponentTwo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/ComponentTwo.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/TestPlugin.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/TestPlugin.java?rev=611945&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/TestPlugin.java (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/TestPlugin.java Mon Jan 14 13:44:59 2008
@@ -0,0 +1,39 @@
+package org.plugin;
+
+import org.apache.maven.plugin.Mojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.logging.Log;
+
+/**
+ * @goal test
+ *
+ * @author jdcasey
+ */
+public class TestPlugin
+ implements Mojo
+{
+
+ private Log log;
+
+ /**
+ * @component
+ */
+ private ComponentOne one;
+
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ }
+
+ public Log getLog()
+ {
+ return log;
+ }
+
+ public void setLog( Log log )
+ {
+ this.log = log;
+ }
+
+}
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/TestPlugin.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/java/org/plugin/TestPlugin.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/resources/META-INF/plexus/components.xml?rev=611945&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/resources/META-INF/plexus/components.xml (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/resources/META-INF/plexus/components.xml Mon Jan 14 13:44:59 2008
@@ -0,0 +1,25 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.test.ComponentOne</role>
+ <role-hint>default</role-hint>
+ <implementation>org.test.ComponentOne</implementation>
+ <requirements>
+ <requirement>
+ <role>org.test.ComponentTwo</role>
+ </requirement>
+ </requirements>
+ </component>
+
+ <component>
+ <role>org.test.ComponentTwo</role>
+ <role-hint>default</role-hint>
+ <implementation>org.test.ComponentTwo</implementation>
+ <requirements>
+ <requirement>
+ <role>org.test.ComponentOne</role>
+ </requirement>
+ </requirements>
+ </component>
+ </components>
+</component-set>
\ No newline at end of file
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/project/pom.xml?rev=611945&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/project/pom.xml (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/project/pom.xml Mon Jan 14 13:44:59 2008
@@ -0,0 +1,36 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>testReportErrorConfiguringExtensionPluginRealm</artifactId>
+ <version>1</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>test-maven-ext-plugin</artifactId>
+ <version>1</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/project/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/project/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/pom.xml?rev=611945&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/pom.xml (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/pom.xml Mon Jan 14 13:44:59 2008
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>testReportErrorFormulatingBuildPlan-maven-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <version>1</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/src/main/java/org/plugin/TestPlugin.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/src/main/java/org/plugin/TestPlugin.java?rev=611945&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/src/main/java/org/plugin/TestPlugin.java (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/src/main/java/org/plugin/TestPlugin.java Mon Jan 14 13:44:59 2008
@@ -0,0 +1,35 @@
+package org.plugin;
+
+import org.apache.maven.plugin.Mojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.logging.Log;
+
+/**
+ * @goal test
+ * @execute goal="my:something:else:that:is:wrong"
+ *
+ * @author jdcasey
+ */
+public class TestPlugin
+ implements Mojo
+{
+
+ private Log log;
+
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ }
+
+ public Log getLog()
+ {
+ return log;
+ }
+
+ public void setLog( Log log )
+ {
+ this.log = log;
+ }
+
+}
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/src/main/java/org/plugin/TestPlugin.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/src/main/java/org/plugin/TestPlugin.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/project/pom.xml?rev=611945&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/project/pom.xml (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/project/pom.xml Mon Jan 14 13:44:59 2008
@@ -0,0 +1,25 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>testReportErrorFormulatingBuildPlan</artifactId>
+ <version>1</version>
+</project>
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/project/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/project/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/pom.xml?rev=611945&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/pom.xml (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/pom.xml Mon Jan 14 13:44:59 2008
@@ -0,0 +1,7 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>test-maven-ext</artifactId>
+ <version>1</version>
+</project>
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/java/org/ext/App.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/java/org/ext/App.java?rev=611945&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/java/org/ext/App.java (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/java/org/ext/App.java Mon Jan 14 13:44:59 2008
@@ -0,0 +1,13 @@
+package org.ext;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/java/org/ext/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/java/org/ext/App.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/resources/META-INF/plexus/components.xml?rev=611945&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/resources/META-INF/plexus/components.xml (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/resources/META-INF/plexus/components.xml Mon Jan 14 13:44:59 2008
@@ -0,0 +1 @@
+this is an error.
\ No newline at end of file
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/ext/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/project/pom.xml?rev=611945&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/project/pom.xml (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/project/pom.xml Mon Jan 14 13:44:59 2008
@@ -0,0 +1,35 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>testReportErrorManagingRealmForExtension</artifactId>
+ <version>1</version>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>test-maven-ext</artifactId>
+ <version>1</version>
+ </extension>
+ </extensions>
+ </build>
+</project>
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/project/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorManagingRealmForExtension/project/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/errortest/test-maven-ext-dep/1/test-maven-ext-dep-1.pom
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/errortest/test-maven-ext-dep/1/test-maven-ext-dep-1.pom?rev=611945&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/errortest/test-maven-ext-dep/1/test-maven-ext-dep-1.pom (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/errortest/test-maven-ext-dep/1/test-maven-ext-dep-1.pom Mon Jan 14 13:44:59 2008
@@ -0,0 +1,26 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>test-maven-ext-dep</artifactId>
+ <version>1</ver>
+
+</project>
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/errortest/test-maven-ext-dep/1/test-maven-ext-dep-1.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/errortest/test-maven-ext-dep/1/test-maven-ext-dep-1.pom
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom?rev=611945&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom Mon Jan 14 13:44:59 2008
@@ -0,0 +1,34 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>test-maven-ext</artifactId>
+ <version>1</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>test-maven-ext-dep</artifactId>
+ <version>1</version>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/project/pom.xml?rev=611945&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/project/pom.xml (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/project/pom.xml Mon Jan 14 13:44:59 2008
@@ -0,0 +1,35 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>testReportErrorResolvingExtensionDependencies</artifactId>
+ <version>1</version>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>test-maven-ext</artifactId>
+ <version>1</version>
+ </extension>
+ </extensions>
+ </build>
+</project>
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/project/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDependencies/project/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom?rev=611945&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom Mon Jan 14 13:44:59 2008
@@ -0,0 +1,34 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>test-maven-ext</artifactId>
+ <version>1</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>[3.8,</version>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/project/pom.xml?rev=611945&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/project/pom.xml (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/project/pom.xml Mon Jan 14 13:44:59 2008
@@ -0,0 +1,35 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>testReportErrorResolvingExtensionDirectDependencies</artifactId>
+ <version>1</version>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>test-maven-ext</artifactId>
+ <version>1</version>
+ </extension>
+ </extensions>
+ </build>
+</project>
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/project/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorResolvingExtensionDirectDependencies/project/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportInvalidMavenVersion/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportInvalidMavenVersion/pom.xml?rev=611945&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportInvalidMavenVersion/pom.xml (added)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportInvalidMavenVersion/pom.xml Mon Jan 14 13:44:59 2008
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.errortest</groupId>
+ <artifactId>testReportInvalidMavenVersion</artifactId>
+ <version>1</version>
+
+ <prerequisites>
+ <maven>10</maven>
+ </prerequisites>
+
+</project>
\ No newline at end of file
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportInvalidMavenVersion/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportInvalidMavenVersion/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"