You are viewing a plain text version of this content. The canonical link for it is here.
Posted to surefire-commits@maven.apache.org by kr...@apache.org on 2011/02/15 08:24:30 UTC
svn commit: r1070793 - in
/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire:
AbstractSurefireMojo.java ProviderInfo.java
Author: krosenvold
Date: Tue Feb 15 07:24:30 2011
New Revision: 1070793
URL: http://svn.apache.org/viewvc?rev=1070793&view=rev
Log:
[SUREFIRE-699] Removed testng from system classpath
This changed was merged in from the collab2 branch in r541168
and no-one seems to know the reason for it.
It is probably related to some given version of TestNG escaping
the confines of the IsolatedClassLoader.
Removing this logic since our current IT's run fine without it
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderInfo.java
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java?rev=1070793&r1=1070792&r2=1070793&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java Tue Feb 15 07:24:30 2011
@@ -391,7 +391,6 @@ public abstract class AbstractSurefireMo
addArtifact( forkConfiguration.getBootClasspath(), surefireArtifact );
provider.addProviderProperties();
- provider.addProviderArtifactToBootClasspath( forkConfiguration.getBootClasspath() );
provider.addProviderArtifactToSurefireClasspath( classpathConfiguration );
providerName = provider.getProviderName();
}
@@ -1066,13 +1065,6 @@ public abstract class AbstractSurefireMo
convertTestNGParameters();
}
- public void addProviderArtifactToBootClasspath( Classpath bootclasspath )
- throws ArtifactResolutionException, ArtifactNotFoundException
- {
-
- dependencyResolver.addResolvedArtifactToClasspath( bootclasspath, testNgArtifact );
- }
-
public void addProviderArtifactToSurefireClasspath( ClasspathConfiguration bootclasspath )
throws ArtifactResolutionException, ArtifactNotFoundException
{
@@ -1100,10 +1092,6 @@ public abstract class AbstractSurefireMo
{
}
- public void addProviderArtifactToBootClasspath( Classpath bootclasspath )
- {
- }
-
public void addProviderArtifactToSurefireClasspath( ClasspathConfiguration classpathConfiguration )
throws ArtifactResolutionException, ArtifactNotFoundException
{
@@ -1143,10 +1131,6 @@ public abstract class AbstractSurefireMo
{
}
- public void addProviderArtifactToBootClasspath( Classpath bootclasspath )
- {
- }
-
public void addProviderArtifactToSurefireClasspath( ClasspathConfiguration classpathConfiguration )
throws ArtifactResolutionException, ArtifactNotFoundException
{
@@ -1191,10 +1175,6 @@ public abstract class AbstractSurefireMo
convertJunitCoreParameters();
}
- public void addProviderArtifactToBootClasspath( Classpath bootclasspath )
- {
- }
-
public void addProviderArtifactToSurefireClasspath( ClasspathConfiguration classpathConfiguration )
throws ArtifactResolutionException, ArtifactNotFoundException
{
@@ -1236,10 +1216,6 @@ public abstract class AbstractSurefireMo
convertTestNGParameters();
}
- public void addProviderArtifactToBootClasspath( Classpath bootclasspath )
- {
- }
-
public void addProviderArtifactToSurefireClasspath( ClasspathConfiguration classpathConfiguration )
throws ArtifactResolutionException, ArtifactNotFoundException
{
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderInfo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderInfo.java?rev=1070793&r1=1070792&r2=1070793&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderInfo.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderInfo.java Tue Feb 15 07:24:30 2011
@@ -21,7 +21,6 @@ package org.apache.maven.plugin.surefire
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.surefire.booter.Classpath;
import org.apache.maven.surefire.booter.ClasspathConfiguration;
/**
@@ -33,9 +32,6 @@ public interface ProviderInfo
boolean isApplicable();
- void addProviderArtifactToBootClasspath( Classpath bootclasspath )
- throws ArtifactResolutionException, ArtifactNotFoundException;
-
void addProviderArtifactToSurefireClasspath( ClasspathConfiguration bootclasspath )
throws ArtifactResolutionException, ArtifactNotFoundException;