svn commit: r597174 - in /maven/plugins/branches/MNG-468/maven-surefire-plugin: pom.xml src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java

[mkleint]

Author: mkleint
Date: Wed Nov 21 10:35:21 2007
New Revision: 597174

URL: http://svn.apache.org/viewvc?rev=597174&view=rev
Log:
use MavenSession for ToolchainManager calls, plugin requires 2.1-SNAPSHOT now

Modified:
    maven/plugins/branches/MNG-468/maven-surefire-plugin/pom.xml
    
maven/plugins/branches/MNG-468/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java

Modified: maven/plugins/branches/MNG-468/maven-surefire-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/MNG-468/maven-surefire-plugin/pom.xml?rev=597174&r1=597173&r2=597174&view=diff
==============================================================================
--- maven/plugins/branches/MNG-468/maven-surefire-plugin/pom.xml (original)
+++ maven/plugins/branches/MNG-468/maven-surefire-plugin/pom.xml Wed Nov 21 
10:35:21 2007
@@ -30,7 +30,7 @@
   <packaging>maven-plugin</packaging>
   <name>Maven Surefire Plugin</name>
   <prerequisites>
-    <maven>2.0</maven>
+    <maven>2.1-SNAPSHOT</maven>
   </prerequisites>
   <mailingLists>
     <!-- duplication from maven-plugins pom - temporary until they inherit 
properly -->
@@ -112,7 +112,7 @@
       <artifactId>maven-toolchain</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
-  </dependencies>
+</dependencies>
 
   <profiles>
     <!-- Force JDK 1.4 for this one, plugins can never be built on 1.3 -->

Modified: 
maven/plugins/branches/MNG-468/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/MNG-468/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=597174&r1=597173&r2=597174&view=diff
==============================================================================
--- 
maven/plugins/branches/MNG-468/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
 (original)
+++ 
maven/plugins/branches/MNG-468/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
 Wed Nov 21 10:35:21 2007
@@ -56,7 +56,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import org.apache.maven.context.BuildContextManager;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.toolchain.Toolchain;
 import org.apache.maven.toolchain.ToolchainManager;
 
@@ -396,10 +396,14 @@
     private ToolchainManager toolchainManager;
     
     /**
+     * The current build session instance. This is used for
+     * toolchain manager API calls.
      *
-     * @component
+     * @parameter expression="${session}"
+     * @required
+     * @readonly
      */
-    private BuildContextManager buildContextManager;
+    private MavenSession session;
     
 
     public void execute()
@@ -676,8 +680,8 @@
             surefireBooter.addClassPathUrl( classpathElement );
         }
         
-        Toolchain tc = toolchainManager.getToolchainFromBuildContext("jdk",  
//NOI18N
-                                buildContextManager.readBuildContext(true));
+        Toolchain tc = toolchainManager.getToolchainFromBuildContext( "jdk",  
//NOI18N
+                                session );
         if (tc != null) {
             getLog().info("Toolchain in surefire-plugin: " + tc);
             if (ForkConfiguration.FORK_NEVER.equals( forkMode ) ) {