Author: rfscholte
Date: Sat Jul 4 22:41:11 2015
New Revision: 1689199
URL: http://svn.apache.org/r1689199
Log:
[MDEP-494] Remove/replace Maven2 specific code
remove unused components
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java?rev=1689199&r1=1689198&r2=1689199&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
Sat Jul 4 22:41:11 2015
@@ -26,7 +26,6 @@ import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
@@ -61,18 +60,6 @@ public abstract class AbstractDependency
protected ArtifactFactory factory;
/**
- *
- */
- @Component( role = ArtifactMetadataSource.class, hint = "maven" )
- protected ArtifactMetadataSource artifactMetadataSource;
-
- /**
- * Location of the local repository.
- */
- @Parameter( defaultValue = "${localRepository}", readonly = true, required
= true )
- private ArtifactRepository local;
-
- /**
* List of Remote Repositories used by the resolver
*/
@Parameter( defaultValue = "${project.remoteArtifactRepositories}",
readonly = true, required = true )
@@ -385,22 +372,6 @@ public abstract class AbstractDependency
this.archiverManager = archiverManager;
}
- /**
- * @return Returns the artifactMetadataSource.
- */
- public ArtifactMetadataSource getArtifactMetadataSource()
- {
- return this.artifactMetadataSource;
- }
-
- /**
- * @param theArtifactMetadataSource The artifactMetadataSource to set.
- */
- public void setArtifactMetadataSource( ArtifactMetadataSource
theArtifactMetadataSource )
- {
- this.artifactMetadataSource = theArtifactMetadataSource;
- }
-
public boolean isUseJvmChmod()
{
return useJvmChmod;
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java?rev=1689199&r1=1689198&r2=1689199&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
Sat Jul 4 22:41:11 2015
@@ -84,12 +84,6 @@ public class GetMojo
private Map<String, ArtifactRepositoryLayout> repositoryLayouts;
/**
- *
- */
- @Parameter( defaultValue = "${localRepository}", readonly = true )
- private ArtifactRepository localRepository;
-
- /**
* The groupId of the artifact to download. Ignored if {@link #artifact}
is used.
*/
@Parameter( property = "groupId" )
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java?rev=1689199&r1=1689198&r2=1689199&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
Sat Jul 4 22:41:11 2015
@@ -25,7 +25,6 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.dependency.AbstractDependencyMojo;
import org.apache.maven.plugin.dependency.utils.DependencyStatusSets;
@@ -234,12 +233,6 @@ public abstract class AbstractDependency
@Parameter( property = "mdep.prependGroupId", defaultValue = "false" )
protected boolean prependGroupId = false;
- /**
- * Location of the local repository.
- */
- @Parameter( defaultValue = "${localRepository}", readonly = true, required
= true )
- private ArtifactRepository local;
-
@Component
private ProjectBuilder projectBuilder;
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java?rev=1689199&r1=1689198&r2=1689199&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java
Sat Jul 4 22:41:11 2015
@@ -21,14 +21,12 @@ package org.apache.maven.plugin.dependen
import java.io.File;
-import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
import org.sonatype.aether.util.DefaultRepositorySystemSession;
@@ -48,25 +46,6 @@ public class TestGetMojo
mojo = (GetMojo) lookupMojo( "get", testPom );
assertNotNull( mojo );
- setVariableValueToObject( mojo, "localRepository", new
StubArtifactRepository( testDir.getAbsolutePath() ){
- @Override
- public String pathOf( Artifact artifact )
- {
- StringBuilder pathOf = new StringBuilder();
- pathOf.append( artifact.getGroupId() )
- .append( '_' )
- .append( artifact.getArtifactId() )
- .append( '-' )
- .append( artifact.getVersion() );
- if ( artifact.getClassifier() != null )
- {
- pathOf.append( '-' )
- .append( artifact.getClassifier() );
- }
- pathOf.append( '.' ).append(
artifact.getArtifactHandler().getExtension() );
- return pathOf.toString();
- }
- } );
LegacySupport legacySupport = lookup( LegacySupport.class );
legacySupport.setSession( newMavenSession( new MavenProjectStub() ) );
