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 2009/04/30 20:49:47 UTC
svn commit: r770390 [2/3] - in /maven/components/branches/MNG-2766:
apache-maven/src/test/java/org/apache/maven/settings/
maven-compat/src/main/java/org/apache/maven/artifact/
maven-compat/src/main/java/org/apache/maven/artifact/deployer/
maven-compat/...
Modified: maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java Thu Apr 30 18:49:42 2009
@@ -38,15 +38,16 @@
* under the License.
*/
-import junit.framework.Assert;
-import org.codehaus.plexus.util.FileUtils;
-
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import junit.framework.Assert;
+
+import org.codehaus.plexus.util.FileUtils;
+
public class TestFileManager
{
Modified: maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java Thu Apr 30 18:49:42 2009
@@ -1,11 +1,5 @@
package org.apache.maven.artifact.transform;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeSet;
-
import org.apache.maven.artifact.ArtifactScopeEnum;
import org.apache.maven.artifact.resolver.metadata.ArtifactMetadata;
import org.apache.maven.artifact.resolver.metadata.MetadataGraph;
Modified: maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java Thu Apr 30 18:49:42 2009
@@ -1,9 +1,9 @@
package org.apache.maven.artifact.transform;
-import org.codehaus.plexus.PlexusTestCase;
-
import java.util.List;
+import org.codehaus.plexus.PlexusTestCase;
+
/** @author Jason van Zyl */
public class TransformationManagerTest
extends PlexusTestCase
Modified: maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java Thu Apr 30 18:49:42 2009
@@ -19,10 +19,10 @@
* under the License.
*/
-import junit.framework.TestCase;
-
import java.util.List;
+import junit.framework.TestCase;
+
import org.apache.maven.artifact.Artifact;
/**
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java Thu Apr 30 18:49:42 2009
@@ -19,13 +19,13 @@
* under the License.
*/
+import java.util.HashSet;
+import java.util.Set;
+
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter;
import org.codehaus.plexus.component.annotations.Component;
-import java.util.HashSet;
-import java.util.Set;
-
/**
* @author Jason van Zyl
* @version $Id$
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Thu Apr 30 18:49:42 2009
@@ -17,6 +17,7 @@
import java.io.File;
import java.io.IOException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -79,6 +80,12 @@
public MavenExecutionResult execute( MavenExecutionRequest request )
{
+ // Need a general way to inject standard properties
+ if ( request.getStartTime() != null )
+ {
+ request.getProperties().put( "${build.timestamp}", new SimpleDateFormat( "yyyyMMdd-hhmm" ).format( request.getStartTime() ) );
+ }
+
request.setStartTime( new Date() );
MavenExecutionResult result = new DefaultMavenExecutionResult();
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/Maven.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/Maven.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/Maven.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/Maven.java Thu Apr 30 18:49:42 2009
@@ -23,7 +23,6 @@
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionResult;
-import org.apache.maven.execution.ReactorManager;
/**
* @author Jason van Zyl
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java Thu Apr 30 18:49:42 2009
@@ -1,10 +1,10 @@
package org.apache.maven;
+import java.util.List;
+
import org.apache.maven.execution.ReactorManager;
import org.codehaus.plexus.util.dag.CycleDetectedException;
-import java.util.List;
-
/**
* Exception which occurs when creating a new {@link ReactorManager} instance,
* due to failure to sort the current projects. The embedded {@link CycleDetectedException}
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java Thu Apr 30 18:49:42 2009
@@ -30,6 +30,7 @@
- plugin execution failure due to something that is know to possibly go wrong (like compilation failure)
- plugin execution error due to something that is not expected to go wrong (the compiler executable missing)
- md5 checksum doesn't match for local artifact, need to redownload this
+- asking to use a plugin for which you do not have a version defined - tools to easily select versions
brett:
- transitive dependency problems - tracking down
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java Thu Apr 30 18:49:42 2009
@@ -701,7 +701,6 @@
projectBuildingConfiguration.setLocalRepository( getLocalRepository() );
projectBuildingConfiguration.setExecutionProperties( getProperties() );
projectBuildingConfiguration.setGlobalProfileManager( getProfileManager() );
- projectBuildingConfiguration.setBuildStartTime( getStartTime() );
projectBuildingConfiguration.setRemoteRepositories( getRemoteRepositories() );
}
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Thu Apr 30 18:49:42 2009
@@ -299,12 +299,9 @@
MojoDescriptor md = getMojoDescriptor( s, session.getCurrentProject(), session.getLocalRepository() );
// need to know if this plugin belongs to a phase in the lifecycle that's running
- if ( md.getPhase() != null && lifecycle.getPhases().contains( md.getPhase() ) )
- {
- if ( phaseToMojoMapping.get( md.getPhase() ) != null )
- {
- phaseToMojoMapping.get( md.getPhase() ).add( s );
- }
+ if ( md.getPhase() != null && phaseToMojoMapping.get( md.getPhase() ) != null )
+ {
+ phaseToMojoMapping.get( md.getPhase() ).add( s );
}
//TODO Here we need to break when we have reached the desired phase.
@@ -590,4 +587,201 @@
return dom;
}
+
+ // These are checks that should be available in real time to IDEs
+
+ /*
+ checkRequiredMavenVersion( plugin, localRepository, project.getRemoteArtifactRepositories() );
+ // Validate against non-editable (@readonly) parameters, to make sure users aren't trying to override in the POM.
+ //validatePomConfiguration( mojoDescriptor, pomConfiguration );
+ //checkDeprecatedParameters( mojoDescriptor, pomConfiguration );
+ //checkRequiredParameters( mojoDescriptor, pomConfiguration, expressionEvaluator );
+
+ public void checkRequiredMavenVersion( Plugin plugin, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
+ throws PluginVersionResolutionException, InvalidPluginException
+ {
+ // if we don't have the required Maven version, then ignore an update
+ if ( ( pluginProject.getPrerequisites() != null ) && ( pluginProject.getPrerequisites().getMaven() != null ) )
+ {
+ DefaultArtifactVersion requiredVersion = new DefaultArtifactVersion( pluginProject.getPrerequisites().getMaven() );
+
+ if ( runtimeInformation.getApplicationInformation().getVersion().compareTo( requiredVersion ) < 0 )
+ {
+ throw new PluginVersionResolutionException( plugin.getGroupId(), plugin.getArtifactId(), "Plugin requires Maven version " + requiredVersion );
+ }
+ }
+ }
+
+ private void checkDeprecatedParameters( MojoDescriptor mojoDescriptor, PlexusConfiguration extractedMojoConfiguration )
+ throws PlexusConfigurationException
+ {
+ if ( ( extractedMojoConfiguration == null ) || ( extractedMojoConfiguration.getChildCount() < 1 ) )
+ {
+ return;
+ }
+
+ List<Parameter> parameters = mojoDescriptor.getParameters();
+
+ if ( ( parameters != null ) && !parameters.isEmpty() )
+ {
+ for ( Parameter param : parameters )
+ {
+ if ( param.getDeprecated() != null )
+ {
+ boolean warnOfDeprecation = false;
+ PlexusConfiguration child = extractedMojoConfiguration.getChild( param.getName() );
+
+ if ( ( child != null ) && ( child.getValue() != null ) )
+ {
+ warnOfDeprecation = true;
+ }
+ else if ( param.getAlias() != null )
+ {
+ child = extractedMojoConfiguration.getChild( param.getAlias() );
+ if ( ( child != null ) && ( child.getValue() != null ) )
+ {
+ warnOfDeprecation = true;
+ }
+ }
+
+ if ( warnOfDeprecation )
+ {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append( "In mojo: " ).append( mojoDescriptor.getGoal() ).append( ", parameter: " ).append( param.getName() );
+
+ if ( param.getAlias() != null )
+ {
+ buffer.append( " (alias: " ).append( param.getAlias() ).append( ")" );
+ }
+
+ buffer.append( " is deprecated:" ).append( "\n\n" ).append( param.getDeprecated() ).append( "\n" );
+
+ logger.warn( buffer.toString() );
+ }
+ }
+ }
+ }
+ }
+
+ private void checkRequiredParameters( MojoDescriptor goal, PlexusConfiguration configuration, ExpressionEvaluator expressionEvaluator )
+ throws PluginConfigurationException
+ {
+ // TODO: this should be built in to the configurator, as we presently double process the expressions
+
+ List<Parameter> parameters = goal.getParameters();
+
+ if ( parameters == null )
+ {
+ return;
+ }
+
+ List<Parameter> invalidParameters = new ArrayList<Parameter>();
+
+ for ( int i = 0; i < parameters.size(); i++ )
+ {
+ Parameter parameter = parameters.get( i );
+
+ if ( parameter.isRequired() )
+ {
+ // the key for the configuration map we're building.
+ String key = parameter.getName();
+
+ Object fieldValue = null;
+ String expression = null;
+ PlexusConfiguration value = configuration.getChild( key, false );
+ try
+ {
+ if ( value != null )
+ {
+ expression = value.getValue( null );
+
+ fieldValue = expressionEvaluator.evaluate( expression );
+
+ if ( fieldValue == null )
+ {
+ fieldValue = value.getAttribute( "default-value", null );
+ }
+ }
+
+ if ( ( fieldValue == null ) && StringUtils.isNotEmpty( parameter.getAlias() ) )
+ {
+ value = configuration.getChild( parameter.getAlias(), false );
+ if ( value != null )
+ {
+ expression = value.getValue( null );
+ fieldValue = expressionEvaluator.evaluate( expression );
+ if ( fieldValue == null )
+ {
+ fieldValue = value.getAttribute( "default-value", null );
+ }
+ }
+ }
+ }
+ catch ( ExpressionEvaluationException e )
+ {
+ throw new PluginConfigurationException( goal.getPluginDescriptor(), e.getMessage(), e );
+ }
+
+ // only mark as invalid if there are no child nodes
+ if ( ( fieldValue == null ) && ( ( value == null ) || ( value.getChildCount() == 0 ) ) )
+ {
+ parameter.setExpression( expression );
+ invalidParameters.add( parameter );
+ }
+ }
+ }
+
+ if ( !invalidParameters.isEmpty() )
+ {
+ throw new PluginParameterException( goal, invalidParameters );
+ }
+ }
+
+ private void validatePomConfiguration( MojoDescriptor goal, PlexusConfiguration pomConfiguration )
+ throws PluginConfigurationException
+ {
+ List<Parameter> parameters = goal.getParameters();
+
+ if ( parameters == null )
+ {
+ return;
+ }
+
+ for ( int i = 0; i < parameters.size(); i++ )
+ {
+ Parameter parameter = parameters.get( i );
+
+ // the key for the configuration map we're building.
+ String key = parameter.getName();
+
+ PlexusConfiguration value = pomConfiguration.getChild( key, false );
+
+ if ( ( value == null ) && StringUtils.isNotEmpty( parameter.getAlias() ) )
+ {
+ key = parameter.getAlias();
+ value = pomConfiguration.getChild( key, false );
+ }
+
+ if ( value != null )
+ {
+ // Make sure the parameter is either editable/configurable, or else is NOT specified in the POM
+ if ( !parameter.isEditable() )
+ {
+ StringBuffer errorMessage = new StringBuffer().append( "ERROR: Cannot override read-only parameter: " );
+ errorMessage.append( key );
+ errorMessage.append( " in goal: " ).append( goal.getFullGoalName() );
+
+ throw new PluginConfigurationException( goal.getPluginDescriptor(), errorMessage.toString() );
+ }
+
+ String deprecated = parameter.getDeprecated();
+ if ( StringUtils.isNotEmpty( deprecated ) )
+ {
+ logger.warn( "DEPRECATED [" + parameter.getName() + "]: " + deprecated );
+ }
+ }
+ }
+ }
+
+ */
}
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Thu Apr 30 18:49:42 2009
@@ -43,13 +43,11 @@
import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.execution.RuntimeInformation;
+import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
import org.apache.maven.monitor.logging.DefaultLog;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
import org.apache.maven.project.DuplicateArtifactAttachmentException;
@@ -64,7 +62,6 @@
import org.codehaus.plexus.component.configurator.ComponentConfigurationException;
import org.codehaus.plexus.component.configurator.ComponentConfigurator;
import org.codehaus.plexus.component.configurator.ConfigurationListener;
-import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
import org.codehaus.plexus.component.discovery.ComponentDiscoverer;
import org.codehaus.plexus.component.discovery.ComponentDiscoveryEvent;
@@ -87,13 +84,9 @@
import org.codehaus.plexus.util.xml.Xpp3Dom;
// TODO: get plugin groups
-// TODO: separate out project downloading
-// TODO: template method plugin validation as its framework specific
+// TODO: separate out project downloading, something should decide before the plugin executes. it should not happen inside this
// TODO: the antrun plugin has its own configurator, the only plugin that does. might need to think about how that works
// TODO: remove the coreArtifactFilterManager
-// TODO: remove the runtimeInformation
-// TODO: move deprecated parameter check outside of the plugin manager
-// TODO: move checkRequiredMavenVersion to lifecycle executor, don't run 5 out of 10 plugins and then blow up ...
@Component(role = PluginManager.class)
public class DefaultPluginManager
@@ -114,9 +107,6 @@
@Requirement
private ResolutionErrorHandler resolutionErrorHandler;
- @Requirement
- protected RuntimeInformation runtimeInformation;
-
private Map<String, PluginDescriptor> pluginDescriptors;
public DefaultPluginManager()
@@ -150,17 +140,19 @@
return addPlugin( plugin, project, localRepository );
}
catch ( ArtifactResolutionException e )
+ // PluginResolutionException - a problem that occurs resolving the plugin artifact or its deps
{
throw new PluginLoaderException( plugin, "Failed to load plugin. Reason: " + e.getMessage(), e );
}
catch ( ArtifactNotFoundException e )
+ // PluginNotFoundException - the plugin itself cannot be found in any repositories
{
throw new PluginLoaderException( plugin, "Failed to load plugin. Reason: " + e.getMessage(), e );
}
- catch ( InvalidPluginException e )
- {
- throw new PluginLoaderException( plugin, "Failed to load plugin. Reason: " + e.getMessage(), e );
- }
+// catch ( InvalidPluginException e )
+// {
+// throw new PluginLoaderException( plugin, "Failed to load plugin. Reason: " + e.getMessage(), e );
+// }
catch ( PluginVersionResolutionException e )
{
throw new PluginLoaderException( plugin, "Failed to load plugin. Reason: " + e.getMessage(), e );
@@ -181,19 +173,16 @@
}
protected PluginDescriptor addPlugin( Plugin plugin, MavenProject project, ArtifactRepository localRepository )
- throws ArtifactNotFoundException, ArtifactResolutionException, InvalidPluginException, PluginVersionResolutionException, PluginContainerException, PluginVersionNotFoundException
+ throws ArtifactNotFoundException, ArtifactResolutionException, PluginVersionResolutionException, PluginContainerException, PluginVersionNotFoundException
{
resolvePluginVersion( plugin, project );
- //MavenProject pluginProject = buildPluginProject( plugin, localRepository, new ArrayList( project.getRemoteArtifactRepositories() ) );
-
Artifact pluginArtifact = repositorySystem.createPluginArtifact( plugin );
- //checkRequiredMavenVersion( plugin, pluginProject, localRepository, new ArrayList( project.getRemoteArtifactRepositories() ) );
-
+ //TODO: this is assuming plugins in the reactor. must be replaced with a reactor local repository implementation
pluginArtifact = project.replaceWithActiveArtifact( pluginArtifact );
- ArtifactResolutionRequest request = new ArtifactResolutionRequest( pluginArtifact, localRepository, new ArrayList( project.getRemoteArtifactRepositories() ) );
+ ArtifactResolutionRequest request = new ArtifactResolutionRequest( pluginArtifact, localRepository, project.getRemoteArtifactRepositories() );
ArtifactResolutionResult result = repositorySystem.resolve( request );
@@ -244,75 +233,39 @@
// its dependencies while filtering out what's in the core
// layering on the project level plugin dependencies
- private Set<Artifact> getPluginArtifacts( Artifact pluginArtifact, Plugin plugin, MavenProject project, ArtifactRepository localRepository )
- throws InvalidPluginException, ArtifactNotFoundException, ArtifactResolutionException
+ private Set<Artifact> getPluginArtifacts( Artifact pluginArtifact, Plugin pluginAsSpecifiedinPom, MavenProject project, ArtifactRepository localRepository )
+ throws ArtifactNotFoundException, ArtifactResolutionException
{
AndArtifactFilter filter = new AndArtifactFilter();
filter.add( coreArtifactFilterManager.getCoreArtifactFilter() );
filter.add( new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME_PLUS_SYSTEM ) );
- Set<Artifact> projectPluginDependencies;
+ Set<Artifact> dependenciesToResolveForPlugin = new LinkedHashSet<Artifact>();
// The case where we have a plugin that can host multiple versions of a particular tool. Say the
// Antlr plugin which has many versions and you may want the plugin to execute with version 2.7.1 of
// Antlr versus 2.7.2. In this case the project itself would specify dependencies within the plugin
// element.
- try
- {
- projectPluginDependencies = repositorySystem.createArtifacts( plugin.getDependencies(), null, filter, project );
- }
- catch ( VersionNotFoundException e )
- {
- InvalidDependencyVersionException ee = new InvalidDependencyVersionException( e.getProjectId(), e.getDependency(), e.getPomFile(), e.getCauseException() );
- throw new InvalidPluginException( "Plugin '" + plugin + "' is invalid: " + e.getMessage(), ee );
- }
-
- Map<String, Artifact> pluginManagedDependencies = new HashMap<String, Artifact>();
-
- List<Artifact> pluginArtifacts = new ArrayList<Artifact>();
-
- /*
- try
- {
- Artifact pluginPomArtifact = repositorySystem.createProjectArtifact( pluginArtifact.getGroupId(), pluginArtifact.getArtifactId(), pluginArtifact.getVersion() );
-
- // This does not populate the artifacts of the dependenct projects
- MavenProject pluginProject = mavenProjectBuilder.buildFromRepository( pluginPomArtifact, new ArrayList( project.getRemoteArtifactRepositories() ), localRepository );
-
- // This needs to be changed so that the resolver deals with this
- for ( Dependency d : pluginProject.getDependencies() )
- {
- pluginArtifacts.add( repositorySystem.createArtifact( d.getGroupId(), d.getArtifactId(), d.getVersion(), d.getScope(), d.getType() ) );
- }
-
- if ( pluginProject != null )
- {
- pluginManagedDependencies = pluginProject.getManagedVersionMap();
- }
- }
- catch ( ProjectBuildingException e )
+ // These dependencies might called override dependencies. We want anything in this set of override
+ // any of the resolved dependencies of the plugin artifact.
+
+ // We would almost always want the everything to be resolved from the root but we have this special case
+ // of overrides from the project itself which confused the interface.
+
+ for( Dependency dependencySpecifiedInProject : pluginAsSpecifiedinPom.getDependencies() )
{
- throw new InvalidPluginException( "Error resolving plugin POM " + e.getMessage() );
+ dependenciesToResolveForPlugin.add( repositorySystem.createDependencyArtifact( dependencySpecifiedInProject ) );
}
- */
-
- Set<Artifact> dependencies = new LinkedHashSet<Artifact>();
-
- // resolve the plugin dependencies specified in <plugin><dependencies> first:
- dependencies.addAll( projectPluginDependencies );
-
- // followed by the plugin's default artifact set
- dependencies.addAll( pluginArtifacts );
-
+
ArtifactResolutionRequest request = new ArtifactResolutionRequest()
.setArtifact( pluginArtifact )
- .setArtifactDependencies( dependencies )
+ // So this in fact are overrides ...
+ .setArtifactDependencies( dependenciesToResolveForPlugin )
.setLocalRepository( localRepository )
- .setRemoteRepostories( new ArrayList( project.getRemoteArtifactRepositories() ) )
- .setManagedVersionMap( pluginManagedDependencies )
+ .setRemoteRepostories( project.getRemoteArtifactRepositories() )
.setFilter( filter )
- .setResolveDependencies( true )
+ .setResolveTransitively( true )
.setResolveRoot( true ); // We are setting this to false because the artifact itself has been resolved.
ArtifactResolutionResult result = repositorySystem.resolve( request );
@@ -320,6 +273,7 @@
Set<Artifact> resolved = new LinkedHashSet<Artifact>();
+ //TODO: this is also assuming artifacts in the reactor.
for ( Iterator<Artifact> it = result.getArtifacts().iterator(); it.hasNext(); )
{
Artifact artifact = it.next();
@@ -475,248 +429,57 @@
ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader( pluginRealm );
- try
- {
- logger.debug( "Looking up mojo " + mojoDescriptor.getRoleHint() + " in realm " + pluginRealm.getId() + " - descRealmId=" + mojoDescriptor.getRealm() );
-
- Mojo mojo;
-
- try
- {
- mojo = container.lookup( Mojo.class, mojoDescriptor.getRoleHint() );
- }
- catch ( ComponentLookupException e )
- {
- throw new PluginContainerException( mojoDescriptor, pluginRealm, "Unable to find the mojo '" + mojoDescriptor.getRoleHint() + "' in the plugin '"
- + pluginDescriptor.getPluginLookupKey() + "'", e );
- }
-
- if ( mojo instanceof ContextEnabled )
- {
- Map<String, Object> pluginContext = session.getPluginContext( pluginDescriptor, project );
-
- if ( pluginContext != null )
- {
- pluginContext.put( "project", project );
-
- pluginContext.put( "pluginDescriptor", pluginDescriptor );
-
- ( (ContextEnabled) mojo ).setPluginContext( pluginContext );
- }
- }
-
- mojo.setLog( new DefaultLog( logger ) );
-
- Xpp3Dom dom = mojoExecution.getConfiguration();
-
- PlexusConfiguration pomConfiguration;
-
- if ( dom == null )
- {
- pomConfiguration = new XmlPlexusConfiguration( "configuration" );
- }
- else
- {
- pomConfiguration = new XmlPlexusConfiguration( dom );
- }
-
- // Validate against non-editable (@readonly) parameters, to make sure users aren't trying to
- // override in the POM.
-
- ExpressionEvaluator expressionEvaluator = new PluginParameterExpressionEvaluator( session, mojoExecution );
-
- // This stuff is moved to the lifecycle executor
- //validatePomConfiguration( mojoDescriptor, pomConfiguration );
-
- checkDeprecatedParameters( mojoDescriptor, pomConfiguration );
- checkRequiredParameters( mojoDescriptor, pomConfiguration, expressionEvaluator );
- //
+ logger.debug( "Looking up mojo " + mojoDescriptor.getRoleHint() + " in realm " + pluginRealm.getId() + " - descRealmId=" + mojoDescriptor.getRealm() );
- populatePluginFields( mojo, mojoDescriptor, pomConfiguration, expressionEvaluator );
+ Mojo mojo;
- return mojo;
-
- }
- catch ( PlexusConfigurationException e )
+ try
{
- throw new PluginConfigurationException( pluginDescriptor, "Error checking parameters: " + e.getMessage() );
+ mojo = container.lookup( Mojo.class, mojoDescriptor.getRoleHint() );
}
- finally
+ catch ( ComponentLookupException e )
{
- Thread.currentThread().setContextClassLoader( oldClassLoader );
+ throw new PluginContainerException( mojoDescriptor, pluginRealm, "Unable to find the mojo '" + mojoDescriptor.getRoleHint() + "' in the plugin '" + pluginDescriptor.getPluginLookupKey()
+ + "'", e );
}
- }
- private void checkDeprecatedParameters( MojoDescriptor mojoDescriptor, PlexusConfiguration extractedMojoConfiguration )
- throws PlexusConfigurationException
- {
- if ( ( extractedMojoConfiguration == null ) || ( extractedMojoConfiguration.getChildCount() < 1 ) )
+ if ( mojo instanceof ContextEnabled )
{
- return;
- }
+ Map<String, Object> pluginContext = session.getPluginContext( pluginDescriptor, project );
- List<Parameter> parameters = mojoDescriptor.getParameters();
-
- if ( ( parameters != null ) && !parameters.isEmpty() )
- {
- for ( Parameter param : parameters )
+ if ( pluginContext != null )
{
- if ( param.getDeprecated() != null )
- {
- boolean warnOfDeprecation = false;
- PlexusConfiguration child = extractedMojoConfiguration.getChild( param.getName() );
-
- if ( ( child != null ) && ( child.getValue() != null ) )
- {
- warnOfDeprecation = true;
- }
- else if ( param.getAlias() != null )
- {
- child = extractedMojoConfiguration.getChild( param.getAlias() );
- if ( ( child != null ) && ( child.getValue() != null ) )
- {
- warnOfDeprecation = true;
- }
- }
-
- if ( warnOfDeprecation )
- {
- StringBuffer buffer = new StringBuffer();
- buffer.append( "In mojo: " ).append( mojoDescriptor.getGoal() ).append( ", parameter: " ).append( param.getName() );
-
- if ( param.getAlias() != null )
- {
- buffer.append( " (alias: " ).append( param.getAlias() ).append( ")" );
- }
+ pluginContext.put( "project", project );
- buffer.append( " is deprecated:" ).append( "\n\n" ).append( param.getDeprecated() ).append( "\n" );
+ pluginContext.put( "pluginDescriptor", pluginDescriptor );
- logger.warn( buffer.toString() );
- }
- }
+ ( (ContextEnabled) mojo ).setPluginContext( pluginContext );
}
}
- }
-
- private void checkRequiredParameters( MojoDescriptor goal, PlexusConfiguration configuration, ExpressionEvaluator expressionEvaluator )
- throws PluginConfigurationException
- {
- // TODO: this should be built in to the configurator, as we presently double process the expressions
-
- List<Parameter> parameters = goal.getParameters();
-
- if ( parameters == null )
- {
- return;
- }
-
- List<Parameter> invalidParameters = new ArrayList<Parameter>();
- for ( int i = 0; i < parameters.size(); i++ )
- {
- Parameter parameter = parameters.get( i );
-
- if ( parameter.isRequired() )
- {
- // the key for the configuration map we're building.
- String key = parameter.getName();
-
- Object fieldValue = null;
- String expression = null;
- PlexusConfiguration value = configuration.getChild( key, false );
- try
- {
- if ( value != null )
- {
- expression = value.getValue( null );
+ mojo.setLog( new DefaultLog( logger ) );
- fieldValue = expressionEvaluator.evaluate( expression );
+ Xpp3Dom dom = mojoExecution.getConfiguration();
- if ( fieldValue == null )
- {
- fieldValue = value.getAttribute( "default-value", null );
- }
- }
-
- if ( ( fieldValue == null ) && StringUtils.isNotEmpty( parameter.getAlias() ) )
- {
- value = configuration.getChild( parameter.getAlias(), false );
- if ( value != null )
- {
- expression = value.getValue( null );
- fieldValue = expressionEvaluator.evaluate( expression );
- if ( fieldValue == null )
- {
- fieldValue = value.getAttribute( "default-value", null );
- }
- }
- }
- }
- catch ( ExpressionEvaluationException e )
- {
- throw new PluginConfigurationException( goal.getPluginDescriptor(), e.getMessage(), e );
- }
-
- // only mark as invalid if there are no child nodes
- if ( ( fieldValue == null ) && ( ( value == null ) || ( value.getChildCount() == 0 ) ) )
- {
- parameter.setExpression( expression );
- invalidParameters.add( parameter );
- }
- }
- }
+ PlexusConfiguration pomConfiguration;
- if ( !invalidParameters.isEmpty() )
+ if ( dom == null )
{
- throw new PluginParameterException( goal, invalidParameters );
+ pomConfiguration = new XmlPlexusConfiguration( "configuration" );
}
- }
-
- private void validatePomConfiguration( MojoDescriptor goal, PlexusConfiguration pomConfiguration )
- throws PluginConfigurationException
- {
- List<Parameter> parameters = goal.getParameters();
-
- if ( parameters == null )
+ else
{
- return;
+ pomConfiguration = new XmlPlexusConfiguration( dom );
}
- for ( int i = 0; i < parameters.size(); i++ )
- {
- Parameter parameter = parameters.get( i );
-
- // the key for the configuration map we're building.
- String key = parameter.getName();
+ ExpressionEvaluator expressionEvaluator = new PluginParameterExpressionEvaluator( session, mojoExecution );
- PlexusConfiguration value = pomConfiguration.getChild( key, false );
+ populatePluginFields( mojo, mojoDescriptor, pomConfiguration, expressionEvaluator );
- if ( ( value == null ) && StringUtils.isNotEmpty( parameter.getAlias() ) )
- {
- key = parameter.getAlias();
- value = pomConfiguration.getChild( key, false );
- }
+ Thread.currentThread().setContextClassLoader( oldClassLoader );
- if ( value != null )
- {
- // Make sure the parameter is either editable/configurable, or else is NOT specified in the POM
- if ( !parameter.isEditable() )
- {
- StringBuffer errorMessage = new StringBuffer().append( "ERROR: Cannot override read-only parameter: " );
- errorMessage.append( key );
- errorMessage.append( " in goal: " ).append( goal.getFullGoalName() );
-
- throw new PluginConfigurationException( goal.getPluginDescriptor(), errorMessage.toString() );
- }
-
- String deprecated = parameter.getDeprecated();
- if ( StringUtils.isNotEmpty( deprecated ) )
- {
- logger.warn( "DEPRECATED [" + parameter.getName() + "]: " + deprecated );
- }
- }
- }
+ return mojo;
}
// ----------------------------------------------------------------------
@@ -814,23 +577,6 @@
}
}
- public static String createPluginParameterRequiredMessage( MojoDescriptor mojo, Parameter parameter, String expression )
- {
- StringBuffer message = new StringBuffer();
-
- message.append( "The '" );
- message.append( parameter.getName() );
- message.append( "' parameter is required for the execution of the " );
- message.append( mojo.getFullGoalName() );
- message.append( " mojo and cannot be null." );
- if ( expression != null )
- {
- message.append( " The retrieval expression was: " ).append( expression );
- }
-
- return message.toString();
- }
-
// ----------------------------------------------------------------------
// Artifact downloading
// ----------------------------------------------------------------------
@@ -862,8 +608,13 @@
ArtifactFilter filter = new ScopeArtifactFilter( scope );
- ArtifactResolutionRequest request = new ArtifactResolutionRequest().setArtifact( artifact ).setResolveRoot( false ).setArtifactDependencies( project.getDependencyArtifacts() )
- .setLocalRepository( session.getLocalRepository() ).setRemoteRepostories( new ArrayList( project.getRemoteArtifactRepositories() ) ).setManagedVersionMap( project.getManagedVersionMap() )
+ ArtifactResolutionRequest request = new ArtifactResolutionRequest()
+ .setArtifact( artifact )
+ .setResolveRoot( false )
+ .setArtifactDependencies( project.getDependencyArtifacts() )
+ .setLocalRepository( session.getLocalRepository() )
+ .setRemoteRepostories( project.getRemoteArtifactRepositories() )
+ .setManagedVersionMap( project.getManagedVersionMap() )
.setFilter( filter );
ArtifactResolutionResult result = repositorySystem.resolve( request );
@@ -873,7 +624,7 @@
project.setArtifacts( result.getArtifacts() );
ArtifactRepository localRepository = session.getLocalRepository();
- List<ArtifactRepository> remoteArtifactRepositories = new ArrayList( session.getCurrentProject().getRemoteArtifactRepositories() );
+ List<ArtifactRepository> remoteArtifactRepositories = session.getCurrentProject().getRemoteArtifactRepositories();
for ( Artifact projectArtifact : session.getCurrentProject().getArtifacts() )
{
@@ -943,21 +694,6 @@
plugin.setVersion( version );
}
- public void checkRequiredMavenVersion( Plugin plugin, MavenProject pluginProject, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
- throws PluginVersionResolutionException, InvalidPluginException
- {
- // if we don't have the required Maven version, then ignore an update
- if ( ( pluginProject.getPrerequisites() != null ) && ( pluginProject.getPrerequisites().getMaven() != null ) )
- {
- DefaultArtifactVersion requiredVersion = new DefaultArtifactVersion( pluginProject.getPrerequisites().getMaven() );
-
- if ( runtimeInformation.getApplicationInformation().getVersion().compareTo( requiredVersion ) < 0 )
- {
- throw new PluginVersionResolutionException( plugin.getGroupId(), plugin.getArtifactId(), "Plugin requires Maven version " + requiredVersion );
- }
- }
- }
-
public MojoDescriptor getMojoDescriptor( Plugin plugin, String goal, MavenProject project, ArtifactRepository localRepository )
throws PluginLoaderException
{
@@ -974,10 +710,6 @@
}
// ----------------------------------------------------------------------
- // Validate plugin
- // ----------------------------------------------------------------------
-
- // ----------------------------------------------------------------------
// Component Discovery
// ----------------------------------------------------------------------
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java Thu Apr 30 18:49:42 2009
@@ -22,9 +22,6 @@
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* Describes a single mojo invocation.
*
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java Thu Apr 30 18:49:42 2009
@@ -19,13 +19,13 @@
* under the License.
*/
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
import org.codehaus.plexus.util.StringUtils;
-import java.util.Iterator;
-import java.util.List;
-
public class PluginParameterException
extends PluginConfigurationException
{
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Thu Apr 30 18:49:42 2009
@@ -24,7 +24,6 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -204,23 +203,7 @@
return project;
}
-
- // private static void setRepositoriesOn(MavenProject project, )
-
- //!! This is used by the RR plugin
- public MavenProject buildFromRepository( Artifact artifact, List<ArtifactRepository> remoteArtifactRepositories, ArtifactRepository localRepository, boolean allowStubs )
- throws ProjectBuildingException
- {
- Artifact pomArtifact = artifact;
- if ( !artifact.getType().equals( "pom" ) )
- {
- pomArtifact = repositorySystem.createProjectArtifact( artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion() );
- }
-
- return buildFromRepository( pomArtifact, remoteArtifactRepositories, localRepository );
- }
-
public MavenProject buildFromRepository(Artifact artifact, ProjectBuilderConfiguration configuration )
throws ProjectBuildingException
{
@@ -310,23 +293,7 @@
hm.put( artifact.getId(), project );
return project;
- }
-
- //TODO: Get rid of this after merge of new PluginManager code
- public MavenProject buildFromRepository( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
- throws ProjectBuildingException
- {
- if(remoteRepositories == null)
- {
- throw new IllegalArgumentException("repositories: null");
- }
-
- ProjectBuilderConfiguration configuration = new DefaultProjectBuilderConfiguration()
- .setLocalRepository( localRepository )
- .setRemoteRepositories(remoteRepositories);
-
- return buildFromRepository(artifact, configuration);
- }
+ }
/**
* This is used for pom-less execution like running archetype:generate.
@@ -377,7 +344,8 @@
Artifact pomArtifact = repositorySystem.createProjectArtifact( project.getGroupId(), project.getArtifactId(), project.getVersion() );
pomArtifact.setFile( pomFile );
- ArtifactResolutionRequest request = new ArtifactResolutionRequest().setArtifact( pomArtifact ).setArtifactDependencies( project.getDependencyArtifacts() )
+ ArtifactResolutionRequest request = new ArtifactResolutionRequest()
+ .setArtifact( pomArtifact ).setArtifactDependencies( project.getDependencyArtifacts() )
.setLocalRepository( configuration.getLocalRepository() )
.setRemoteRepostories( project.getRemoteArtifactRepositories() )
.setManagedVersionMap( project.getManagedVersionMap() );
@@ -420,12 +388,6 @@
Properties props = new Properties( config.getExecutionProperties() );
- //TODO: this magical property should not be placed in here in the middle of the project builder. move somewhere out to
- // the front-end where they can all be collected.
- if ( config.getBuildStartTime() != null )
- {
- props.put( "${build.timestamp}", new SimpleDateFormat( "yyyyMMdd-hhmm" ).format( config.getBuildStartTime() ) );
- }
try
{
model = interpolator.interpolateModel( model, props, domainModel.getProjectDirectory() );
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,11 @@
* under the License.
*/
+import java.io.File;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.InvalidArtifactRTException;
@@ -32,11 +37,6 @@
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import java.io.File;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
@Component(role = MavenProjectHelper.class)
public class DefaultMavenProjectHelper
extends AbstractLogEnabled
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java Thu Apr 30 18:49:42 2009
@@ -19,15 +19,12 @@
* under the License.
*/
-import java.util.Date;
-import java.util.HashSet;
import java.util.List;
import java.util.Properties;
-import java.util.Set;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.ModelEventListener;
-import org.apache.maven.model.Plugin;
import org.apache.maven.profiles.ProfileManager;
public class DefaultProjectBuilderConfiguration
@@ -39,17 +36,23 @@
private List<ArtifactRepository> remoteRepositories;
- private Properties userProperties;
-
//!!jvz Find out who added this. It's wrong, the execution properties are what come from the embedder setup not system properties.
private Properties executionProperties = System.getProperties();
- private Date buildStartTime;
-
private List<ModelEventListener> listeners;
private MavenProject topProject;
+ public DefaultProjectBuilderConfiguration()
+ {
+ }
+
+ public DefaultProjectBuilderConfiguration( ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
+ {
+ this.localRepository = localRepository;
+ this.remoteRepositories = remoteRepositories;
+ }
+
public MavenProject getTopLevelProjectFromReactor()
{
return topProject;
@@ -104,17 +107,6 @@
return this;
}
- public Date getBuildStartTime()
- {
- return buildStartTime;
- }
-
- public ProjectBuilderConfiguration setBuildStartTime( Date buildStartTime )
- {
- this.buildStartTime = buildStartTime;
- return this;
- }
-
public List<ModelEventListener> getModelEventListeners()
{
return listeners;
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java Thu Apr 30 18:49:42 2009
@@ -19,12 +19,12 @@
* under the License.
*/
+import java.io.File;
+
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.project.validation.ModelValidationResult;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.File;
-
public class InvalidProjectModelException
extends ProjectBuildingException
{
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java Thu Apr 30 18:49:42 2009
@@ -19,10 +19,10 @@
* under the License.
*/
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-
import java.io.File;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+
public class InvalidProjectVersionException
extends ProjectBuildingException
{
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProject.java Thu Apr 30 18:49:42 2009
@@ -69,8 +69,8 @@
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.project.artifact.ActiveProjectArtifact;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.MavenRepositoryWrapper;
+import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.VersionNotFoundException;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -363,6 +363,7 @@
}
catch ( ProjectBuildingException e )
{
+ //TODO: awful
e.printStackTrace();
}
}
@@ -370,10 +371,11 @@
{
try
{
- parent = mavenProjectBuilder.buildFromRepository( getParentArtifact(), this.remoteArtifactRepositories, projectBuilderConfiguration.getLocalRepository() );
+ parent = mavenProjectBuilder.buildFromRepository( getParentArtifact(), projectBuilderConfiguration );
}
catch ( ProjectBuildingException e )
{
+ // TODO: awful
e.printStackTrace();
}
}
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java Thu Apr 30 18:49:42 2009
@@ -16,7 +16,6 @@
*/
import java.io.File;
-import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -28,20 +27,13 @@
MavenProject build( File project, ArtifactRepository localRepository, ProfileManager profileManager )
throws ProjectBuildingException;
- // remote resources plugin
- MavenProject buildFromRepository( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository, boolean allowStub )
- throws ProjectBuildingException;
-
MavenProject build( File project, ProjectBuilderConfiguration configuration )
throws ProjectBuildingException;
MavenProjectBuildingResult buildProjectWithDependencies( File project, ProjectBuilderConfiguration configuration )
throws ProjectBuildingException;
-
- MavenProject buildFromRepository( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
- throws ProjectBuildingException;
- MavenProject buildFromRepository(Artifact artifact, ProjectBuilderConfiguration configuration )
+ MavenProject buildFromRepository( Artifact artifact, ProjectBuilderConfiguration configuration )
throws ProjectBuildingException;
MavenProject buildStandaloneSuperProject( ProjectBuilderConfiguration configuration )
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java Thu Apr 30 18:49:42 2009
@@ -1,13 +1,10 @@
package org.apache.maven.project;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.profiles.ProfileManager;
-
-import java.util.Date;
import java.util.List;
import java.util.Properties;
-import java.util.Set;
+
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.profiles.ProfileManager;
public interface ProjectBuilderConfiguration
{
@@ -26,11 +23,6 @@
ProjectBuilderConfiguration setRemoteRepositories( List<ArtifactRepository> remoteRepositories );
ProjectBuilderConfiguration setExecutionProperties( Properties executionProperties );
-
- //TODO: these do not belong here, we can profile things else where
- Date getBuildStartTime();
-
- ProjectBuilderConfiguration setBuildStartTime( Date buildStartTime );
MavenProject getTopLevelProjectFromReactor();
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java Thu Apr 30 18:49:42 2009
@@ -1,5 +1,8 @@
package org.apache.maven.project;
+import java.io.File;
+import java.io.IOException;
+
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
@@ -8,9 +11,6 @@
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.File;
-import java.io.IOException;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,10 @@
* under the License.
*/
+import java.io.File;
+import java.util.Collection;
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
@@ -29,10 +33,6 @@
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.project.MavenProject;
-import java.io.File;
-import java.util.Collection;
-import java.util.List;
-
/**
* Wraps an active project instance to be able to receive updates from its artifact without affecting the original
* attributes of this artifact.
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java Thu Apr 30 18:49:42 2009
@@ -1,12 +1,12 @@
package org.apache.maven.project.artifact;
+import java.io.File;
+
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.model.Dependency;
import org.apache.maven.project.InvalidProjectVersionException;
-import java.io.File;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Thu Apr 30 18:49:42 2009
@@ -43,6 +43,7 @@
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DistributionManagement;
import org.apache.maven.model.Relocation;
+import org.apache.maven.project.DefaultProjectBuilderConfiguration;
import org.apache.maven.project.InvalidProjectModelException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
@@ -182,7 +183,7 @@
{
try
{
- project = mavenProjectBuilder.buildFromRepository( pomArtifact, remoteRepositories, localRepository );
+ project = mavenProjectBuilder.buildFromRepository( pomArtifact, new DefaultProjectBuilderConfiguration( localRepository, remoteRepositories ) );
}
catch ( InvalidProjectModelException e )
{
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,9 @@
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.AbstractArtifactMetadata;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
@@ -26,9 +29,6 @@
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataStoreException;
import org.codehaus.plexus.util.FileUtils;
-import java.io.File;
-import java.io.IOException;
-
/**
* Attach a POM to an artifact.
*
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,10 @@
* under the License.
*/
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Build;
import org.apache.maven.model.Dependency;
@@ -33,10 +37,6 @@
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java Thu Apr 30 18:49:42 2009
@@ -19,11 +19,11 @@
* under the License.
*/
-import org.apache.maven.project.ProjectBuildingException;
-
import java.io.File;
import java.io.IOException;
+import org.apache.maven.project.ProjectBuildingException;
+
/**
* @author Jason van Zyl
* @version $Id$
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java Thu Apr 30 18:49:42 2009
@@ -19,11 +19,11 @@
* under the License.
*/
+import java.io.IOException;
+
import org.apache.maven.execution.MavenExecutionRequest;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.IOException;
-
/**
* @author jdcasey
* @author Jason van Zyl
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java Thu Apr 30 18:49:42 2009
@@ -19,15 +19,15 @@
* under the License.
*/
-import org.apache.maven.model.ActivationFile;
-import org.codehaus.plexus.util.StringUtils;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.maven.model.ActivationFile;
+import org.codehaus.plexus.util.StringUtils;
+
/**
* Several convenience methods to handle settings
*
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java Thu Apr 30 18:49:42 2009
@@ -19,14 +19,14 @@
* under the License.
*/
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.maven.settings.Profile;
import org.apache.maven.settings.Repository;
import org.apache.maven.settings.Settings;
import org.codehaus.plexus.component.annotations.Component;
-import java.util.Iterator;
-import java.util.List;
-
/**
* @author Milos Kleint
*/
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java Thu Apr 30 18:49:42 2009
@@ -9,7 +9,6 @@
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Model;
-import org.apache.maven.plugin.DefaultPluginManager;
import org.apache.maven.plugin.PluginManager;
import org.apache.maven.project.DefaultProjectBuilderConfiguration;
import org.apache.maven.project.MavenProject;
@@ -19,8 +18,6 @@
import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.component.discovery.ComponentDiscoverer;
-import org.codehaus.plexus.component.discovery.ComponentDiscoveryListener;
import org.codehaus.plexus.util.FileUtils;
public abstract class AbstractCoreMavenComponentTestCase
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java Thu Apr 30 18:49:42 2009
@@ -3,15 +3,12 @@
import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
import org.apache.maven.AbstractCoreMavenComponentTestCase;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.MojoExecution;
-import org.apache.maven.plugin.PluginManager;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.util.xml.Xpp3Dom;
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java Thu Apr 30 18:49:42 2009
@@ -8,11 +8,8 @@
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.execution.ReactorManager;
-import org.apache.maven.model.Build;
-import org.apache.maven.model.Extension;
import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.wagon.Wagon;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.dag.CycleDetectedException;
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,9 @@
* under the License.
*/
+import java.util.List;
+import java.util.Properties;
+
import org.apache.maven.model.Activation;
import org.apache.maven.model.ActivationProperty;
import org.apache.maven.model.Profile;
@@ -27,9 +30,6 @@
import org.apache.maven.profiles.ProfileManager;
import org.codehaus.plexus.PlexusTestCase;
-import java.util.List;
-import java.util.Properties;
-
public class DefaultProfileManagerTest
extends PlexusTestCase
{
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/profiles/matchers/JdkMatcherTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/profiles/matchers/JdkMatcherTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/profiles/matchers/JdkMatcherTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/profiles/matchers/JdkMatcherTest.java Thu Apr 30 18:49:42 2009
@@ -2,11 +2,11 @@
import java.util.Properties;
+import junit.framework.TestCase;
+
import org.apache.maven.model.Activation;
import org.apache.maven.model.Profile;
-import junit.framework.TestCase;
-
public class JdkMatcherTest extends TestCase
{
public void testJdkMatch()
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java Thu Apr 30 18:49:42 2009
@@ -15,14 +15,6 @@
* the License.
*/
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.profiles.DefaultProfileManager;
-import org.apache.maven.profiles.ProfileActivationContext;
-import org.apache.maven.project.validation.ModelValidationResult;
-import org.codehaus.plexus.PlexusTestCase;
-
import java.io.File;
import java.io.FileNotFoundException;
import java.net.URI;
@@ -31,6 +23,14 @@
import java.util.Arrays;
import java.util.Properties;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.DefaultArtifactRepository;
+import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.profiles.DefaultProfileManager;
+import org.apache.maven.profiles.ProfileActivationContext;
+import org.apache.maven.project.validation.ModelValidationResult;
+import org.codehaus.plexus.PlexusTestCase;
+
/**
* @author Jason van Zyl
* @version $Id$
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java Thu Apr 30 18:49:42 2009
@@ -19,22 +19,16 @@
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.model.Build;
import org.apache.maven.model.Plugin;
-import org.apache.maven.model.Resource;
-import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.WriterFactory;
-
-import java.io.File;
-import java.io.ByteArrayOutputStream;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
public class DefaultMavenProjectBuilderTest
extends AbstractMavenProjectTestCase
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/ModelUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/ModelUtilsTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/ModelUtilsTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/ModelUtilsTest.java Thu Apr 30 18:49:42 2009
@@ -19,15 +19,6 @@
* under the License.
*/
-import org.apache.maven.model.Build;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.model.PluginContainer;
-import org.apache.maven.model.PluginExecution;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
import java.io.IOException;
import java.io.StringReader;
import java.util.Arrays;
@@ -38,6 +29,15 @@
import junit.framework.TestCase;
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.PluginContainer;
+import org.apache.maven.model.PluginExecution;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
public class ModelUtilsTest
extends TestCase
{
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java Thu Apr 30 18:49:42 2009
@@ -6,7 +6,6 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ResolutionGroup;
import org.apache.maven.artifact.repository.ArtifactRepository;