maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject git commit: [SUREFIRE-1046] Make surefire work with jdk 8 on inproc running (forkMode=never)
Date Wed, 18 Dec 2013 17:28:27 GMT
Updated Branches:
  refs/heads/master 75f05d794 -> 88a05af56


[SUREFIRE-1046] Make surefire work with jdk 8 on inproc running (forkMode=never)

The forking mode (default mode) should work for prior versions of surefire


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/88a05af5
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/88a05af5
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/88a05af5

Branch: refs/heads/master
Commit: 88a05af56e470a6262b1ce1f542f4d68f20adee6
Parents: 75f05d7
Author: Kristian Rosenvold <krosenvold@apache.org>
Authored: Wed Dec 18 18:28:05 2013 +0100
Committer: Kristian Rosenvold <krosenvold@apache.org>
Committed: Wed Dec 18 18:28:05 2013 +0100

----------------------------------------------------------------------
 .../apache/maven/plugin/surefire/AbstractSurefireMojo.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/88a05af5/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 d436f83..37863d0 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
@@ -1433,7 +1433,9 @@ public abstract class AbstractSurefireMojo
 
             }
             Artifact surefireArtifact = getCommonArtifact();
-            Classpath inprocClassPath = providerClasspath.addClassPathElementUrl( surefireArtifact.getFile().getAbsolutePath()
);
+            Classpath inprocClassPath = providerClasspath.
+                    addClassPathElementUrl( surefireArtifact.getFile().getAbsolutePath()
)
+                    .addClassPathElementUrl( getApiArtifact().getFile().getAbsolutePath());
 
             final Classpath testClasspath = generateTestClasspath();
 
@@ -1470,6 +1472,11 @@ public abstract class AbstractSurefireMojo
         return getPluginArtifactMap().get( "org.apache.maven.surefire:maven-surefire-common"
);
     }
 
+    private Artifact getApiArtifact()
+    {
+        return getPluginArtifactMap().get( "org.apache.maven.surefire:surefire-api" );
+    }
+
     private StartupReportConfiguration getStartupReportConfiguration( String configChecksum
)
     {
         return new StartupReportConfiguration( isUseFile(), isPrintSummary(), getReportFormat(),


Mime
View raw message