[MPLUGINTESTING-70] Move maven-compat to test scope

maven-plugin-testing-harness/pom.xml

@@ -44,7 +44,7 @@ under the License.
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-compat</artifactId>
       <version>${mavenVersion}</version>
-      <scope>provided</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>

maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java

@@ -38,6 +38,7 @@
 
 import org.apache.commons.io.input.XmlStreamReader;
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.execution.DefaultMavenExecutionRequest;
 import org.apache.maven.execution.DefaultMavenExecutionResult;
@@ -56,7 +57,6 @@
 import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.repository.RepositorySystem;
 import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
 import org.codehaus.plexus.ContainerConfiguration;
 import org.codehaus.plexus.DefaultContainerConfiguration;
@@ -154,9 +154,8 @@ protected void setUp()
         {
 
             PluginDescriptor pluginDescriptor = new PluginDescriptorBuilder().build( interpolationReader );
-
-            Artifact artifact =
-                lookup( RepositorySystem.class ).createArtifact( pluginDescriptor.getGroupId(),
+
+            Artifact artifact = lookup( ArtifactFactory.class ).createBuildArtifact( pluginDescriptor.getGroupId(),
                                                                  pluginDescriptor.getArtifactId(),
                                                                  pluginDescriptor.getVersion(), ".jar" );
 

maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/ResolverExpressionEvaluatorStub.java

@@ -21,10 +21,11 @@
 
 import java.io.File;
 
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.repository.MavenArtifactRepository;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
 import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
 import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
 
 /**
@@ -101,9 +102,11 @@ else if ( expression.startsWith( "basedir" ) || expression.startsWith( "project.
         }
         else if ( "localRepository".equals( expression ) )
         {
-            File localRepo = new File( PlexusTestCase.getBasedir(), "target/local-repo" );
-            return new DefaultArtifactRepository( "localRepository", "file://" + localRepo.getAbsolutePath(),
-                                                  new DefaultRepositoryLayout() );
+            return new MavenArtifactRepository( "localRepository",
+            "file://" + new File( PlexusTestCase.getBasedir(), "target/local-repo" ).getAbsolutePath(),
+            new DefaultRepositoryLayout(),
+            new ArtifactRepositoryPolicy( true, "release", "always" ),
+            new ArtifactRepositoryPolicy( true, "snapshot", "never" ) );
         }
         else
         {