Author: rfscholte
Date: Sat Jun 20 12:59:02 2015
New Revision: 1686607
URL: http://svn.apache.org/r1686607
Log:
[MDEP-494] Remove/replace Maven2 specific code
Replace deprecated MavenProjectBuilder with ProjectBuilder
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/fromDependencies/AbstractDependencyFilterMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/AbstractResolveMojo.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=1686607&r1=1686606&r2=1686607&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 Jun 20 12:59:02 2015
@@ -19,12 +19,18 @@ package org.apache.maven.plugin.dependen
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+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.artifact.resolver.ArtifactCollector;
import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -42,11 +48,6 @@ import org.codehaus.plexus.util.FileUtil
import org.codehaus.plexus.util.ReflectionUtils;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.List;
-
/**
* @author <a href="mailto:bri...@apache.org";>Brian Fox</a>
* @version $Id: AbstractDependencyMojo.java 552528
@@ -127,6 +128,12 @@ public abstract class AbstractDependency
protected List<MavenProject> reactorProjects;
/**
+ * The Maven session
+ */
+ @Parameter( defaultValue = "${session}", readonly = true, required = true )
+ protected MavenSession session;
+
+ /**
* If the plugin should be silent.
*
* @since 2.0
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=1686607&r1=1686606&r2=1686607&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 Jun 20 12:59:02 2015
@@ -19,6 +19,11 @@ package org.apache.maven.plugin.dependen
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
@@ -33,7 +38,7 @@ import org.apache.maven.plugin.dependenc
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import
org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException;
import org.apache.maven.shared.artifact.filter.collection.ArtifactIdFilter;
@@ -46,11 +51,6 @@ import org.apache.maven.shared.artifact.
import org.apache.maven.shared.artifact.filter.collection.TypeFilter;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-
/**
* Class that encapsulates the plugin parameters, and contains methods that
* handle dependency filtering
@@ -225,7 +225,7 @@ public abstract class AbstractDependency
protected boolean prependGroupId = false;
@Component
- MavenProjectBuilder projectBuilder;
+ private ProjectBuilder projectBuilder;
/**
* Return an {@link ArtifactsFilter} indicating which artifacts must be
filtered out.
@@ -332,7 +332,7 @@ public abstract class AbstractDependency
{
try
{
- return projectBuilder.buildFromRepository( artifact, remoteRepos,
getLocal() );
+ return projectBuilder.build( artifact,
session.getProjectBuildingRequest() ).getProject();
}
catch ( ProjectBuildingException e )
{
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=1686607&r1=1686606&r2=1686607&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
Sat Jun 20 12:59:02 2015
@@ -31,7 +31,7 @@ import org.apache.maven.plugin.dependenc
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.shared.artifact.filter.collection.ArtifactIdFilter;
@@ -52,7 +52,7 @@ public abstract class AbstractResolveMoj
* Project builder -- builds a model from a pom.xml
*/
@Component
- protected MavenProjectBuilder mavenProjectBuilder;
+ private ProjectBuilder projectBuilder;
/**
* If specified, this parameter will cause the dependencies to be written
to the path specified, instead of writing
@@ -187,7 +187,7 @@ public abstract class AbstractResolveMoj
"pom" );
final MavenProject pomProject =
- mavenProjectBuilder.buildFromRepository( pomArtifact,
this.remoteRepos, this.getLocal() );
+ projectBuilder.build( pomArtifact,
session.getProjectBuildingRequest() ).getProject();
return resolveDependencyArtifacts( pomProject );
}
