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/07/15 21:24:29 UTC
svn commit: r794373 [9/9] - in /maven/components/branches/MNG-4221:
maven-compat/ maven-compat/src/main/java/org/apache/maven/artifact/
maven-compat/src/main/java/org/apache/maven/artifact/deployer/
maven-compat/src/main/java/org/apache/maven/artifact/...
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java Wed Jul 15 19:24:20 2009
@@ -4,9 +4,8 @@
import java.util.List;
import java.util.Properties;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Profile;
-import org.apache.maven.model.building.ModelBuildingRequest;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
public interface ProjectBuildingRequest
{
@@ -37,18 +36,20 @@
/**
* Controls the level of validation to perform on processed models. By default, models are validated in strict mode.
*
- * @param validationLevel The level of validation to perform on processed models, e.g.
- * {@link ModelBuildingRequest#VALIDATION_LEVEL_STRICT}.
+ * @param lenientValidation A flag whether validation should be lenient instead of strict. For building of projects,
+ * strict validation should be used to ensure proper building. For the mere retrievel of dependencies
+ * during artifact resolution, lenient validation should be used to account for models of poor quality.
* @return This configuration, never {@code null}.
*/
- ProjectBuildingRequest setValidationLevel( int validationLevel );
+ ProjectBuildingRequest setLenientValidation( boolean lenientValidation );
/**
* Gets the level of validation to perform on processed models.
*
- * @return The level of validation to perform on processed models.
+ * @return {@code true} if lenient validation is enabled and only the dependency information is to be validated,
+ * {@code false} if strict validation is enabled and the entire model is validated.
*/
- int getValidationLevel();
+ boolean istLenientValidation();
// Profiles
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java Wed Jul 15 19:24:20 2009
@@ -24,11 +24,9 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.artifact.resolver.ResolutionErrorHandler;
import org.apache.maven.model.Repository;
import org.apache.maven.model.building.FileModelSource;
import org.apache.maven.model.building.ModelSource;
@@ -36,6 +34,8 @@
import org.apache.maven.model.resolution.ModelResolver;
import org.apache.maven.model.resolution.UnresolvableModelException;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.resolver.ResolutionErrorHandler;
/**
* Implements a model resolver backed by the Maven Repository API.
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java Wed Jul 15 19:24:20 2009
@@ -25,9 +25,9 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.metadata.ResolutionGroup;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.ArtifactUtils;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.codehaus.plexus.component.annotations.Component;
@Component( role = MavenMetadataCache.class )
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java Wed Jul 15 19:24:20 2009
@@ -2,10 +2,10 @@
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 org.apache.maven.repository.legacy.ArtifactUtils;
+import org.apache.maven.repository.legacy.versioning.InvalidVersionSpecificationException;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java Wed Jul 15 19:24:20 2009
@@ -3,8 +3,8 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.metadata.ResolutionGroup;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Wed Jul 15 19:24:20 2009
@@ -28,19 +28,7 @@
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.metadata.ResolutionGroup;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Metadata;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException;
-import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.building.ModelBuildingRequest;
@@ -49,6 +37,18 @@
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.metadata.ArtifactRepositoryMetadata;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadata;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadataManager;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadataResolutionException;
+import org.apache.maven.repository.legacy.resolver.filter.AndArtifactFilter;
+import org.apache.maven.repository.legacy.resolver.filter.ArtifactFilter;
+import org.apache.maven.repository.legacy.resolver.filter.ExcludesArtifactFilter;
+import org.apache.maven.repository.legacy.versioning.ArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.DefaultArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.repository.legacy.versioning.VersionRange;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java Wed Jul 15 19:24:20 2009
@@ -23,9 +23,9 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
-import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
+import org.apache.maven.repository.legacy.handler.ArtifactHandler;
public class PluginArtifact
extends DefaultArtifact
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java Wed Jul 15 19:24:20 2009
@@ -22,9 +22,9 @@
import java.util.List;
import org.apache.maven.artifact.DefaultArtifact;
-import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.repository.legacy.handler.ArtifactHandler;
public class ProjectArtifact
extends DefaultArtifact
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java Wed Jul 15 19:24:20 2009
@@ -25,8 +25,8 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.AbstractArtifactMetadata;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataStoreException;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadataStoreException;
import org.codehaus.plexus.util.FileUtils;
/**
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java Wed Jul 15 19:24:20 2009
@@ -19,9 +19,9 @@
package org.apache.maven.toolchain;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.repository.legacy.versioning.DefaultArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.repository.legacy.versioning.VersionRange;
/**
*
Modified: maven/components/branches/MNG-4221/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml Wed Jul 15 19:24:20 2009
@@ -16,9 +16,9 @@
| POM
|-->
<component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role>org.apache.maven.repository.legacy.handler.ArtifactHandler</role>
<role-hint>pom</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler
+ <implementation>org.apache.maven.repository.legacy.handler.DefaultArtifactHandler
</implementation>
<configuration>
<type>pom</type>
@@ -47,9 +47,9 @@
| JAR
|-->
<component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role>org.apache.maven.repository.legacy.handler.ArtifactHandler</role>
<role-hint>jar</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler
+ <implementation>org.apache.maven.repository.legacy.handler.DefaultArtifactHandler
</implementation>
<configuration>
<type>jar</type>
@@ -86,9 +86,9 @@
| EJB
|-->
<component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role>org.apache.maven.repository.legacy.handler.ArtifactHandler</role>
<role-hint>ejb</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler
+ <implementation>org.apache.maven.repository.legacy.handler.DefaultArtifactHandler
</implementation>
<configuration>
<type>ejb</type>
@@ -134,9 +134,9 @@
</configuration>
</component>
<component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role>org.apache.maven.repository.legacy.handler.ArtifactHandler</role>
<role-hint>ejb-client</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler
+ <implementation>org.apache.maven.repository.legacy.handler.DefaultArtifactHandler
</implementation>
<configuration>
<type>ejb-client</type>
@@ -148,9 +148,9 @@
</configuration>
</component>
<component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role>org.apache.maven.repository.legacy.handler.ArtifactHandler</role>
<role-hint>ejb3</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler
+ <implementation>org.apache.maven.repository.legacy.handler.DefaultArtifactHandler
</implementation>
<configuration>
<type>ejb3</type>
@@ -188,9 +188,9 @@
| TEST JAR
|-->
<component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role>org.apache.maven.repository.legacy.handler.ArtifactHandler</role>
<role-hint>test-jar</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler
+ <implementation>org.apache.maven.repository.legacy.handler.DefaultArtifactHandler
</implementation>
<configuration>
<classifier>tests</classifier>
@@ -206,9 +206,9 @@
| MAVEN PLUGIN
|-->
<component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role>org.apache.maven.repository.legacy.handler.ArtifactHandler</role>
<role-hint>maven-plugin</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler
+ <implementation>org.apache.maven.repository.legacy.handler.DefaultArtifactHandler
</implementation>
<configuration>
<type>maven-plugin</type>
@@ -247,9 +247,9 @@
| SOURCE JAR
|-->
<component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role>org.apache.maven.repository.legacy.handler.ArtifactHandler</role>
<role-hint>java-source</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler
+ <implementation>org.apache.maven.repository.legacy.handler.DefaultArtifactHandler
</implementation>
<configuration>
<classifier>sources</classifier>
@@ -264,9 +264,9 @@
| JAVADOC JAR
|-->
<component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role>org.apache.maven.repository.legacy.handler.ArtifactHandler</role>
<role-hint>javadoc</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler
+ <implementation>org.apache.maven.repository.legacy.handler.DefaultArtifactHandler
</implementation>
<configuration>
<classifier>javadoc</classifier>
@@ -281,9 +281,9 @@
| WAR
|-->
<component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role>org.apache.maven.repository.legacy.handler.ArtifactHandler</role>
<role-hint>war</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler
+ <implementation>org.apache.maven.repository.legacy.handler.DefaultArtifactHandler
</implementation>
<configuration>
<type>war</type>
@@ -323,9 +323,9 @@
| EAR
|-->
<component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role>org.apache.maven.repository.legacy.handler.ArtifactHandler</role>
<role-hint>ear</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler
+ <implementation>org.apache.maven.repository.legacy.handler.DefaultArtifactHandler
</implementation>
<configuration>
<type>ear</type>
@@ -362,9 +362,9 @@
| RAR
|-->
<component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role>org.apache.maven.repository.legacy.handler.ArtifactHandler</role>
<role-hint>rar</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler
+ <implementation>org.apache.maven.repository.legacy.handler.DefaultArtifactHandler
</implementation>
<configuration>
<type>rar</type>
@@ -404,9 +404,9 @@
| PAR
|-->
<component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role>org.apache.maven.repository.legacy.handler.ArtifactHandler</role>
<role-hint>par</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler
+ <implementation>org.apache.maven.repository.legacy.handler.DefaultArtifactHandler
</implementation>
<configuration>
<type>par</type>
Modified: maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java Wed Jul 15 19:24:20 2009
@@ -6,8 +6,6 @@
import java.util.Properties;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.InvalidRepositoryException;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.DefaultMavenExecutionResult;
import org.apache.maven.execution.MavenExecutionRequest;
@@ -22,6 +20,8 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.InvalidRepositoryException;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.component.annotations.Requirement;
Modified: maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java Wed Jul 15 19:24:20 2009
@@ -29,13 +29,6 @@
import org.apache.maven.AbstractCoreMavenComponentTestCase;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.DefaultMavenExecutionResult;
import org.apache.maven.execution.DuplicateProjectException;
@@ -46,6 +39,13 @@
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.repository.legacy.ArtifactUtils;
+import org.apache.maven.repository.legacy.factory.ArtifactFactory;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepositoryFactory;
+import org.apache.maven.repository.legacy.repository.DefaultArtifactRepository;
+import org.apache.maven.repository.legacy.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.repository.legacy.versioning.VersionRange;
import org.codehaus.plexus.MutablePlexusContainer;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
Modified: maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java Wed Jul 15 19:24:20 2009
@@ -22,11 +22,11 @@
import java.net.URL;
import java.util.Arrays;
-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.validation.ModelValidationResult;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.DefaultArtifactRepository;
+import org.apache.maven.repository.legacy.repository.layout.ArtifactRepositoryLayout;
import org.codehaus.plexus.PlexusTestCase;
/**
Modified: maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java Wed Jul 15 19:24:20 2009
@@ -24,9 +24,9 @@
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.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.DefaultArtifactRepository;
+import org.apache.maven.repository.legacy.repository.layout.ArtifactRepositoryLayout;
import org.codehaus.plexus.util.FileUtils;
public class DefaultMavenProjectBuilderTest
Modified: maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java Wed Jul 15 19:24:20 2009
@@ -24,7 +24,6 @@
import java.util.List;
import java.util.Set;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.lifecycle.LifecycleExecutor;
@@ -36,6 +35,7 @@
import org.apache.maven.plugin.PluginDescriptorParsingException;
import org.apache.maven.plugin.PluginNotFoundException;
import org.apache.maven.plugin.PluginResolutionException;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
Modified: maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java Wed Jul 15 19:24:20 2009
@@ -24,10 +24,10 @@
import java.util.List;
import java.util.Map;
-import org.apache.maven.artifact.versioning.ManagedVersionMap;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
+import org.apache.maven.repository.legacy.versioning.ManagedVersionMap;
public class MavenProjectTest
extends AbstractMavenProjectTestCase
Modified: maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java Wed Jul 15 19:24:20 2009
@@ -25,11 +25,11 @@
import java.util.Map;
import java.util.Properties;
-import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.model.PluginExecution;
-import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.project.harness.PomTestWrapper;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.repository.DefaultArtifactRepository;
+import org.apache.maven.repository.legacy.repository.layout.DefaultRepositoryLayout;
import org.codehaus.plexus.PlexusTestCase;
public class PomConstructionTest
@@ -1678,8 +1678,7 @@
config.setLocalRepository( repositorySystem.createArtifactRepository( "local", localRepoUrl, new DefaultRepositoryLayout(), null, null ) );
config.setActiveProfileIds( Arrays.asList( profileIds ) );
config.setExecutionProperties( executionProperties );
- config.setValidationLevel( lenientValidation ? ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0
- : ModelBuildingRequest.VALIDATION_LEVEL_STRICT );
+ config.setLenientValidation( lenientValidation );
return new PomTestWrapper( pomFile, projectBuilder.build( pomFile, config ) );
}
Modified: maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestArtifactResolver.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestArtifactResolver.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestArtifactResolver.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestArtifactResolver.java Wed Jul 15 19:24:20 2009
@@ -1,8 +1,8 @@
package org.apache.maven.project;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.resolver.DefaultArtifactResolver;
+import org.apache.maven.repository.legacy.resolver.ArtifactResolver;
+import org.apache.maven.repository.legacy.resolver.DefaultArtifactResolver;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
Modified: maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java Wed Jul 15 19:24:20 2009
@@ -1,8 +1,8 @@
package org.apache.maven.project;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.repository.LegacyRepositorySystem;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.resolver.ArtifactResolver;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
Modified: maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java Wed Jul 15 19:24:20 2009
@@ -9,9 +9,9 @@
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.metadata.ResolutionGroup;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.project.artifact.MavenMetadataSource;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.resolver.filter.ArtifactFilter;
import org.apache.maven.repository.metadata.MetadataSource;
import org.codehaus.plexus.component.annotations.Component;
Modified: maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java Wed Jul 15 19:24:20 2009
@@ -8,7 +8,7 @@
import java.util.Collections;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.codehaus.plexus.component.annotations.Component;
@Component(role=ProjectBuilder.class,hint="classpath")
Modified: maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java Wed Jul 15 19:24:20 2009
@@ -23,11 +23,11 @@
import java.util.Collections;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
import org.apache.maven.project.artifact.DefaultMavenMetadataCache.CacheKey;
import org.apache.maven.repository.DelegatingLocalArtifactRepository;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.resolver.filter.ExcludesArtifactFilter;
import org.codehaus.plexus.PlexusTestCase;
/**
Modified: maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/IdeWorkspaceRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/IdeWorkspaceRepositoryTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/IdeWorkspaceRepositoryTest.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/IdeWorkspaceRepositoryTest.java Wed Jul 15 19:24:20 2009
@@ -4,10 +4,10 @@
import java.util.ArrayList;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.repository.DelegatingLocalArtifactRepository;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.codehaus.plexus.PlexusTestCase;
public class IdeWorkspaceRepositoryTest
Modified: maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java Wed Jul 15 19:24:20 2009
@@ -4,8 +4,6 @@
import java.io.IOException;
import java.io.Reader;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
-import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.model.Profile;
import org.apache.maven.project.DefaultProjectBuilder;
import org.apache.maven.project.DefaultProjectBuildingRequest;
@@ -13,6 +11,8 @@
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.project.harness.PomTestWrapper;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.repository.DefaultArtifactRepository;
+import org.apache.maven.repository.legacy.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.IOUtil;
Modified: maven/components/branches/MNG-4221/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/branches/MNG-4221/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Wed Jul 15 19:24:20 2009
@@ -27,7 +27,6 @@
import org.apache.maven.Maven;
import org.apache.maven.MavenExecutionException;
import org.apache.maven.MissingModuleException;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.embedder.execution.MavenExecutionRequestPopulator;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.DefaultMavenExecutionResult;
@@ -41,6 +40,7 @@
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.SettingsConfigurationException;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
Modified: maven/components/branches/MNG-4221/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java (original)
+++ maven/components/branches/MNG-4221/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java Wed Jul 15 19:24:20 2009
@@ -21,13 +21,13 @@
import java.util.Set;
import org.apache.maven.Maven;
-import org.apache.maven.artifact.InvalidRepositoryException;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.embedder.Configuration;
import org.apache.maven.embedder.MavenEmbedder;
import org.apache.maven.embedder.MavenEmbedderException;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.InvalidRepositoryException;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.apache.maven.settings.MavenSettingsBuilder;
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Settings;
Modified: maven/components/branches/MNG-4221/maven-embedder/src/test/extensions/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-embedder/src/test/extensions/META-INF/plexus/components.xml?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-embedder/src/test/extensions/META-INF/plexus/components.xml (original)
+++ maven/components/branches/MNG-4221/maven-embedder/src/test/extensions/META-INF/plexus/components.xml Wed Jul 15 19:24:20 2009
@@ -20,7 +20,7 @@
<component-set>
<components>
<component>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+ <role>org.apache.maven.repository.legacy.factory.ArtifactFactory</role>
<role-hint>default</role-hint>
<implementation>org.apache.maven.embedder.CustomArtifactFactory</implementation>
</component>
Modified: maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/CustomArtifactFactory.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/CustomArtifactFactory.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/CustomArtifactFactory.java (original)
+++ maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/CustomArtifactFactory.java Wed Jul 15 19:24:20 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.maven.artifact.factory.DefaultArtifactFactory;
+import org.apache.maven.repository.legacy.factory.DefaultArtifactFactory;
/**
*
Modified: maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java (original)
+++ maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java Wed Jul 15 19:24:20 2009
@@ -22,13 +22,13 @@
import java.io.File;
import java.util.Map;
-import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.PluginManagerException;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.repository.legacy.handler.ArtifactHandler;
import org.codehaus.plexus.component.repository.ComponentDescriptor;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.logging.Logger;
Modified: maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/MyArtifactHandler.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/MyArtifactHandler.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/MyArtifactHandler.java (original)
+++ maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/MyArtifactHandler.java Wed Jul 15 19:24:20 2009
@@ -1,6 +1,6 @@
package org.apache.maven.embedder;
-import org.apache.maven.artifact.handler.ArtifactHandler;
+import org.apache.maven.repository.legacy.handler.ArtifactHandler;
/** @author Jason van Zyl */
public class MyArtifactHandler
Modified: maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java (original)
+++ maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java Wed Jul 15 19:24:20 2009
@@ -21,7 +21,7 @@
import java.io.File;
-import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.repository.legacy.factory.ArtifactFactory;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
Modified: maven/components/branches/MNG-4221/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java (original)
+++ maven/components/branches/MNG-4221/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java Wed Jul 15 19:24:20 2009
@@ -26,8 +26,8 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.model.Plugin;
+import org.apache.maven.repository.legacy.ArtifactUtils;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.repository.ComponentSetDescriptor;