You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2016/02/07 02:03:51 UTC
maven-surefire git commit: [SUREFIRE] preparation for 3.0
Repository: maven-surefire
Updated Branches:
refs/heads/3.0-rc1 faed057e8 -> 40f99bb9e
[SUREFIRE] preparation for 3.0
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/40f99bb9
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/40f99bb9
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/40f99bb9
Branch: refs/heads/3.0-rc1
Commit: 40f99bb9e64f8aba4267793f0c5ac5bf3ea00da4
Parents: faed057
Author: Tibor17 <ti...@lycos.com>
Authored: Sun Feb 7 02:03:15 2016 +0100
Committer: Tibor17 <ti...@lycos.com>
Committed: Sun Feb 7 02:03:15 2016 +0100
----------------------------------------------------------------------
.../plugin/surefire/AbstractSurefireMojo.java | 47 ++++++++++++++++----
1 file changed, 38 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40f99bb9/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index f1f706c..8e3876d 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -98,6 +98,7 @@ import org.apache.maven.surefire.util.DefaultScanResult;
import org.apache.maven.surefire.util.RunOrder;
import org.apache.maven.toolchain.Toolchain;
import org.apache.maven.toolchain.ToolchainManager;
+import org.sonatype.aether.RepositorySystemSession;
import javax.annotation.Nonnull;
@@ -670,6 +671,12 @@ public abstract class AbstractSurefireMojo
@Component
private RepositorySystem repositorySystem;
+ /**
+ * The current repository configuration.
+ */
+ @Parameter( defaultValue = "${repositorySystemSession}", readonly = true )
+ private RepositorySystemSession repoSession;
+
private Artifact surefireBooterArtifact;
private Toolchain toolchain;
@@ -906,8 +913,8 @@ public abstract class AbstractSurefireMojo
private void createDependencyResolver()
{
dependencyResolver =
- new SurefireDependencyResolver( repositorySystem, getArtifactFactory(), getLog(), getLocalRepository(),
- getRemoteRepositories(), getPluginName() );
+ new SurefireDependencyResolver( getRepositorySystem(), getArtifactFactory(), getLog(),
+ getLocalRepository(), getRemoteRepositories(), getPluginName() );
}
protected List<ProviderInfo> createProviders()
@@ -1085,6 +1092,26 @@ public abstract class AbstractSurefireMojo
StringUtils.capitalizeFirstLetter( getPluginName() ) + " report directory: " + getReportsDirectory() );
}
+ public RepositorySystem getRepositorySystem()
+ {
+ return repositorySystem;
+ }
+
+ public void setRepositorySystem( RepositorySystem repositorySystem )
+ {
+ this.repositorySystem = repositorySystem;
+ }
+
+ public RepositorySystemSession getRepoSession()
+ {
+ return repoSession;
+ }
+
+ public void setRepoSession( RepositorySystemSession repoSession )
+ {
+ this.repoSession = repoSession;
+ }
+
final Toolchain getToolchain()
{
Toolchain tc = null;
@@ -2180,10 +2207,12 @@ public abstract class AbstractSurefireMojo
for ( Artifact artifact : extraTestNgArtifacts )
{
- ProjectBuildingRequest request = new DefaultProjectBuildingRequest();
- request.setLocalRepository( getLocalRepository() );
- request.setRemoteRepositories( getRemoteRepositories() );
- getArtifactResolver().resolveArtifact( request, artifact );
+ ProjectBuildingRequest request = new DefaultProjectBuildingRequest()
+ .setLocalRepository( getLocalRepository() )
+ .setRemoteRepositories( getRemoteRepositories() )
+ .setRepositorySession( getRepoSession() )
+ .setResolveDependencies( true );
+ artifact = getArtifactResolver().resolveArtifact( request, artifact ).getArtifact();
String path = artifact.getFile().getPath();
classpath.add( path );
}
@@ -2225,9 +2254,9 @@ public abstract class AbstractSurefireMojo
{
ArtifactResolutionRequest request = new ArtifactResolutionRequest()
.setArtifact( providerArtifact )
- .setRemoteRepositories( remoteRepositories )
- .setLocalRepository( localRepository );
- return repositorySystem.resolve( request );
+ .setRemoteRepositories( getRemoteRepositories() )
+ .setLocalRepository( getLocalRepository() );
+ return getRepositorySystem().resolve( request );
}
private Classpath getArtifactClasspath( Artifact surefireArtifact )