Author: rfscholte
Date: Sun Jul 5 21:14:19 2015
New Revision: 1689289
URL: http://svn.apache.org/r1689289
Log:
[MDEP-494] Remove/replace Maven2 specific code
prefer field access via getters (over direct access)
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/PropertiesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.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/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/AbstractResolveMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.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=1689289&r1=1689288&r2=1689289&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
Sun Jul 5 21:14:19 2015
@@ -57,19 +57,19 @@ public abstract class AbstractDependency
* Used to look up Artifacts in the remote repository.
*/
@Component
- protected ArtifactFactory factory;
+ private ArtifactFactory factory;
/**
* List of Remote Repositories used by the resolver
*/
@Parameter( defaultValue = "${project.remoteArtifactRepositories}",
readonly = true, required = true )
- protected List<ArtifactRepository> remoteRepos;
+ private List<ArtifactRepository> remoteRepos;
/**
* To look up Archiver/UnArchiver implementations
*/
@Component
- protected ArchiverManager archiverManager;
+ private ArchiverManager archiverManager;
/**
* <p>
@@ -79,7 +79,7 @@ public abstract class AbstractDependency
* @since 2.5.1
*/
@Parameter( property = "dependency.useJvmChmod", defaultValue = "true" )
- protected boolean useJvmChmod = true;
+ private boolean useJvmChmod = true;
/**
* ignore to set file permissions when unpacking a dependency
@@ -92,7 +92,7 @@ public abstract class AbstractDependency
* POM
*/
@Parameter( defaultValue = "${project}", readonly = true, required = true )
- protected MavenProject project;
+ private MavenProject project;
/**
* Contains the full list of projects in the reactor.
@@ -357,14 +357,6 @@ public abstract class AbstractDependency
}
/**
- * @param remoteRepos The remoteRepos to set.
- */
- public void setRemoteRepos( List<ArtifactRepository> remoteRepos )
- {
- this.remoteRepos = remoteRepos;
- }
-
- /**
* @param archiverManager The archiverManager to set.
*/
public void setArchiverManager( ArchiverManager archiverManager )
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PropertiesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PropertiesMojo.java?rev=1689289&r1=1689288&r2=1689289&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PropertiesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PropertiesMojo.java
Sun Jul 5 21:14:19 2015
@@ -49,7 +49,7 @@ public class PropertiesMojo
* The current Maven project
*/
@Parameter( defaultValue = "${project}", readonly = true, required = true )
- protected MavenProject project;
+ private MavenProject project;
/**
* Skip plugin execution completely.
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java?rev=1689289&r1=1689288&r2=1689289&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
Sun Jul 5 21:14:19 2015
@@ -25,7 +25,6 @@ import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Dependency;
@@ -98,12 +97,6 @@ public abstract class AbstractFromConfig
private List<ArtifactItem> artifactItems;
/**
- * To look up ArtifactRepository implementation
- */
- @Component
- private ArtifactRepositoryFactory artifactRepositoryManager;
-
- /**
* Path to override default local repository during plugin's execution. To
remove all downloaded artifacts as part
* of the build, set this value to a location under your project's target
directory
*
@@ -118,11 +111,6 @@ public abstract class AbstractFromConfig
@Component
private RepositoryManager repositoryManager;
- /**
- * To host and cache localRepositoryDirectory
- */
- private ArtifactRepository overrideLocalRepository;
-
abstract ArtifactItemFilter getMarkedArtifactFilter( ArtifactItem item );
// artifactItems is filled by either field injection or by setArtifact()
@@ -232,14 +220,16 @@ public abstract class AbstractFromConfig
if ( StringUtils.isEmpty( artifactItem.getClassifier() ) )
{
- artifact = factory.createDependencyArtifact(
artifactItem.getGroupId(), artifactItem.getArtifactId(), vr,
-
artifactItem.getType(), null, Artifact.SCOPE_COMPILE );
+ artifact =
+ getFactory().createDependencyArtifact(
artifactItem.getGroupId(), artifactItem.getArtifactId(), vr,
+ artifactItem.getType(),
null, Artifact.SCOPE_COMPILE );
}
else
{
- artifact = factory.createDependencyArtifact(
artifactItem.getGroupId(), artifactItem.getArtifactId(), vr,
-
artifactItem.getType(), artifactItem.getClassifier(),
-
Artifact.SCOPE_COMPILE );
+ artifact =
+ getFactory().createDependencyArtifact(
artifactItem.getGroupId(), artifactItem.getArtifactId(), vr,
+ artifactItem.getType(),
artifactItem.getClassifier(),
+ Artifact.SCOPE_COMPILE
);
}
// Maven 3 will search the reactor for the artifact but Maven 2 does
not
@@ -275,7 +265,7 @@ public abstract class AbstractFromConfig
buildingRequest = new DefaultProjectBuildingRequest(
session.getProjectBuildingRequest() );
}
- buildingRequest.setRemoteRepositories( remoteRepos );
+ buildingRequest.setRemoteRepositories( getRemoteRepos() );
artifact = artifactResolver.resolveArtifact( buildingRequest,
artifact );
}
@@ -297,7 +287,7 @@ public abstract class AbstractFromConfig
private Artifact getArtifactFomReactor( Artifact artifact )
{
// check project dependencies first off
- for ( Artifact a : project.getArtifacts() )
+ for ( Artifact a : getProject().getArtifacts() )
{
if ( equals( artifact, a ) && hasFile( a ) )
{
@@ -368,6 +358,7 @@ public abstract class AbstractFromConfig
private void fillMissingArtifactVersion( ArtifactItem artifact )
throws MojoExecutionException
{
+ MavenProject project = getProject();
List<Dependency> deps = project.getDependencies();
List<Dependency> depMngt = project.getDependencyManagement() == null
? Collections.<Dependency>emptyList()
@@ -527,8 +518,8 @@ public abstract class AbstractFromConfig
}
Artifact toUnpack = classifier == null
- ? factory.createBuildArtifact( groupId, artifactId, version,
packaging )
- : factory.createArtifactWithClassifier( groupId, artifactId,
version, packaging, classifier );
+ ? getFactory().createBuildArtifact( groupId, artifactId, version,
packaging )
+ : getFactory().createArtifactWithClassifier( groupId, artifactId,
version, packaging, classifier );
setArtifactItems( Collections.singletonList( new ArtifactItem(
toUnpack ) ) );
}
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=1689289&r1=1689288&r2=1689289&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
Sun Jul 5 21:14:19 2015
@@ -280,7 +280,8 @@ public abstract class AbstractDependency
// add filters in well known order, least specific to most specific
FilterArtifacts filter = new FilterArtifacts();
- filter.addFilter( new ProjectTransitivityFilter(
project.getDependencyArtifacts(), this.excludeTransitive ) );
+ filter.addFilter( new ProjectTransitivityFilter(
getProject().getDependencyArtifacts(),
+
this.excludeTransitive ) );
filter.addFilter( new ScopeFilter(
DependencyUtil.cleanToBeTokenizedString( this.includeScope ),
DependencyUtil.cleanToBeTokenizedString( this.excludeScope ) ) );
@@ -298,7 +299,7 @@ public abstract class AbstractDependency
DependencyUtil.cleanToBeTokenizedString( this.excludeArtifactIds ) ) );
// start with all artifacts.
- Set<Artifact> artifacts = project.getArtifacts();
+ Set<Artifact> artifacts = getProject().getArtifacts();
if ( includeParents )
{
@@ -309,7 +310,7 @@ public abstract class AbstractDependency
}
// add current project parent
- addParentArtifacts( project, artifacts );
+ addParentArtifacts( getProject(), artifacts );
}
// perform filtering
@@ -366,7 +367,7 @@ public abstract class AbstractDependency
ProjectBuildingRequest buildingRequest =
new DefaultProjectBuildingRequest(
session.getProjectBuildingRequest() );
- buildingRequest.setRemoteRepositories( this.remoteRepos );
+ buildingRequest.setRemoteRepositories( getRemoteRepos() );
Artifact resolvedArtifact = artifactResolver.resolveArtifact(
buildingRequest, project.getArtifact() );
@@ -400,7 +401,7 @@ public abstract class AbstractDependency
if ( StringUtils.isNotEmpty( classifier ) )
{
ArtifactTranslator translator =
- new ClassifierTypeTranslator( this.classifier, this.type,
this.factory, repositoryManager,
+ new ClassifierTypeTranslator( this.classifier, this.type,
this.getFactory(), repositoryManager,
session.getProjectBuildingRequest() );
artifacts = translator.translate( artifacts, getLog() );
@@ -412,7 +413,7 @@ public abstract class AbstractDependency
ProjectBuildingRequest buildingRequest =
new DefaultProjectBuildingRequest(
session.getProjectBuildingRequest() );
- buildingRequest.setRemoteRepositories( this.remoteRepos );
+ buildingRequest.setRemoteRepositories( getRemoteRepos() );
// resolve the rest of the artifacts
ArtifactsResolver artifactsResolver =
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java?rev=1689289&r1=1689288&r2=1689289&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java
Sun Jul 5 21:14:19 2015
@@ -226,7 +226,7 @@ public class BuildClasspathMojo
if ( outputProperty != null )
{
- project.getProperties().setProperty( outputProperty, cpString );
+ getProject().getProperties().setProperty( outputProperty, cpString
);
if ( getLog().isDebugEnabled() )
{
getLog().debug( outputProperty + " = " + cpString );
@@ -256,10 +256,10 @@ public class BuildClasspathMojo
protected void attachFile( String cpString )
throws MojoExecutionException
{
- File attachedFile = new File( project.getBuild().getDirectory(),
"classpath" );
+ File attachedFile = new File( getProject().getBuild().getDirectory(),
"classpath" );
storeClasspathFile( cpString, attachedFile );
- projectHelper.attachArtifact( project, attachedFile, "classpath" );
+ projectHelper.attachArtifact( getProject(), attachedFile, "classpath"
);
}
/**
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java?rev=1689289&r1=1689288&r2=1689289&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java
Sun Jul 5 21:14:19 2015
@@ -194,8 +194,8 @@ public class CopyDependenciesMojo
if ( artifact.isSnapshot() && !artifact.getBaseVersion().equals(
artifact.getVersion() ) )
{
Artifact baseArtifact =
- this.factory.createArtifact( artifact.getGroupId(),
artifact.getArtifactId(), artifact.getBaseVersion(),
- artifact.getScope(),
artifact.getType() );
+ this.getFactory().createArtifact( artifact.getGroupId(),
artifact.getArtifactId(),
+ artifact.getBaseVersion(),
artifact.getScope(), artifact.getType() );
baseArtifact.setFile( artifact.getFile() );
installer.install( buildingRequest, Collections.singletonList(
baseArtifact ) );
}
@@ -292,15 +292,15 @@ public class CopyDependenciesMojo
protected Artifact getResolvedPomArtifact( Artifact artifact )
{
Artifact pomArtifact =
- this.factory.createArtifact( artifact.getGroupId(),
artifact.getArtifactId(), artifact.getVersion(), "",
- "pom" );
+ this.getFactory().createArtifact( artifact.getGroupId(),
artifact.getArtifactId(), artifact.getVersion(),
+ "", "pom" );
// Resolve the pom artifact using repos
try
{
ProjectBuildingRequest buildingRequest =
new DefaultProjectBuildingRequest(
session.getProjectBuildingRequest() );
- buildingRequest.setRemoteRepositories( this.remoteRepos );
+ buildingRequest.setRemoteRepositories( getRemoteRepos() );
pomArtifact = getArtifactResolver().resolveArtifact(
buildingRequest, pomArtifact );
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/AbstractResolveMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/AbstractResolveMojo.java?rev=1689289&r1=1689288&r2=1689289&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/AbstractResolveMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/AbstractResolveMojo.java
Sun Jul 5 21:14:19 2015
@@ -158,13 +158,13 @@ public abstract class AbstractResolveMoj
throws ArtifactResolverException, ArtifactNotFoundException,
InvalidDependencyVersionException
{
final Set<Artifact> artifacts =
- theProject.createArtifacts( this.factory, Artifact.SCOPE_TEST,
+ theProject.createArtifacts( this.getFactory(), Artifact.SCOPE_TEST,
new ScopeArtifactFilter(
Artifact.SCOPE_TEST ) );
ProjectBuildingRequest buildingRequest =
new DefaultProjectBuildingRequest(
session.getProjectBuildingRequest() );
- buildingRequest.setRemoteRepositories( this.remoteRepos );
+ buildingRequest.setRemoteRepositories( getRemoteRepos() );
for ( final Artifact artifact : artifacts )
{
@@ -190,8 +190,8 @@ public abstract class AbstractResolveMoj
InvalidDependencyVersionException
{
final Artifact pomArtifact =
- this.factory.createArtifact( artifact.getGroupId(),
artifact.getArtifactId(), artifact.getVersion(), "",
- "pom" );
+ this.getFactory().createArtifact( artifact.getGroupId(),
artifact.getArtifactId(), artifact.getVersion(),
+ "", "pom" );
final MavenProject pomProject =
projectBuilder.build( pomArtifact,
session.getProjectBuildingRequest() ).getProject();
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java?rev=1689289&r1=1689288&r2=1689289&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java
Sun Jul 5 21:14:19 2015
@@ -53,7 +53,7 @@ public class GoOfflineMojo
protected void doExecute()
throws MojoExecutionException
{
- Set<Artifact> artifacts = project.getArtifacts();
+ Set<Artifact> artifacts = getProject().getArtifacts();
if ( !silent )
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java?rev=1689289&r1=1689288&r2=1689289&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
Sun Jul 5 21:14:19 2015
@@ -59,7 +59,8 @@ public class ListRepositoriesMojo
try
{
CollectorResult collectResult =
- dependencyCollector.collectDependencies(
session.getProjectBuildingRequest(), project.getArtifact() );
+ dependencyCollector.collectDependencies(
session.getProjectBuildingRequest(),
+
getProject().getArtifact() );
this.getLog().info( "Repositories Used by this build:" );
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java?rev=1689289&r1=1689288&r2=1689289&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
Sun Jul 5 21:14:19 2015
@@ -163,8 +163,8 @@ public class ResolvePluginsMojo
protected Set<Artifact> resolvePluginArtifacts()
throws ArtifactFilterException, ArtifactResolverException
{
- final Set<Artifact> plugins = project.getPluginArtifacts();
- final Set<Artifact> reports = project.getReportArtifacts();
+ final Set<Artifact> plugins = getProject().getPluginArtifacts();
+ final Set<Artifact> reports = getProject().getReportArtifacts();
Set<Artifact> artifacts = new HashSet<Artifact>();
artifacts.addAll( reports );
