Author: krosenvold
Date: Sat Jun 13 09:56:28 2015
New Revision: 1685231
URL: http://svn.apache.org/r1685231
Log:
Moved maven-compat to test-scope
Its probably possible to get rid of it totally
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1685231&r1=1685230&r2=1685231&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Sat Jun 13 09:56:28 2015
@@ -19,7 +19,8 @@ specific language governing permissions
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -92,6 +93,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java?rev=1685231&r1=1685230&r2=1685231&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
Sat Jun 13 09:56:28 2015
@@ -24,7 +24,6 @@ import org.apache.maven.artifact.factory
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
@@ -39,6 +38,7 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.utils.FilterUtils;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
+import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -65,7 +65,7 @@ public class DefaultDependencyResolver
{
@Requirement
- private ArtifactResolver resolver;
+ private RepositorySystem resolver;
@Requirement
@@ -77,7 +77,7 @@ public class DefaultDependencyResolver
// for plexus init
}
- protected DefaultDependencyResolver( final ArtifactResolver resolver,
final ArtifactFactory factory,
+ protected DefaultDependencyResolver( final RepositorySystem resolver,
final ArtifactFactory factory,
final Logger logger )
{
this.resolver = resolver;
@@ -253,8 +253,6 @@ public class DefaultDependencyResolver
req.setMirrors(
configSource.getMavenSession().getRequest().getMirrors() );
req.setProxies(
configSource.getMavenSession().getRequest().getProxies() );
-
-
ArtifactResolutionResult result;
result = resolver.resolve( req );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java?rev=1685231&r1=1685230&r2=1685231&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
Sat Jun 13 09:56:28 2015
@@ -24,7 +24,6 @@ import org.apache.maven.artifact.factory
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.model.Model;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.model.Assembly;
@@ -34,6 +33,7 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.model.Repository;
import org.apache.maven.plugin.assembly.resolved.AssemblyId;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
@@ -57,7 +57,7 @@ public class DefaultDependencyResolverTe
private ArtifactRepositoryLayout layout;
- private ArtifactResolver resolver;
+ private RepositorySystem resolver;
private ConsoleLogger logger;
@@ -67,7 +67,7 @@ public class DefaultDependencyResolverTe
{
super.setUp();
- resolver = (ArtifactResolver) lookup( ArtifactResolver.ROLE );
+ resolver = lookup( RepositorySystem.class );
factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
repoFactory = (ArtifactRepositoryFactory) lookup(
ArtifactRepositoryFactory.ROLE );
layout = (ArtifactRepositoryLayout) lookup(
ArtifactRepositoryLayout.ROLE, "default" );
