[MNG-3714] Allow specification of the toolchains.xml location on the command line

o Extended IT to check propagation of toolchain via session

git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@761443 13f79535-47bb-0310-9956-ffa450edef68

its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java

@@ -66,7 +66,7 @@ public void testitMNG3714()
         List cliOptions = new ArrayList();
         cliOptions.add( "--toolchains toolchains.xml" );
         verifier.setCliOptions( cliOptions );
-        verifier.executeGoal( "validate" );
+        verifier.executeGoal( "initialize" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
@@ -78,6 +78,11 @@ public void testitMNG3714()
             tool = tool.substring( 0, tool.length() - 4 );
         }
         assertEquals( new File( javaHome, "bin/javac" ).getAbsolutePath(), tool );
+
+        verifier.assertFilePresent( "target/tool.properties" );
+        Properties toolProps = verifier.loadProperties( "target/tool.properties" );
+        String path = toolProps.getProperty( "tool.javac", "" );
+        assertEquals( results.getProperty( "tool.1", "" ), path );
     }
 
 }

its/core-it-suite/src/test/resources/mng-3714/pom.xml

@@ -1,10 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <name>Maven Integration Test :: MNG-3714</name> 
+
   <groupId>org.apache.maven.its.mng3714</groupId>
-  <artifactId>maven-it-mng3714</artifactId>
+  <artifactId>test</artifactId>
-  <description>Test --toolchains CLI option</description>
   <version>1.0-SNAPSHOT</version>
+
+  <name>Maven Integration Test :: MNG-3714</name> 
+  <description>Test --toolchains CLI option</description>
+
   <build>
     <plugins>
       <plugin>
@@ -13,9 +37,29 @@
         <version>2.1-SNAPSHOT</version>
         <executions>
           <execution>
+            <id>select-toolchain</id>
+            <phase>validate</phase>
             <goals>
               <goal>toolchain</goal>
             </goals>
+            <configuration>
+              <outputFile>target/toolchains.properties</outputFile>
+              <type>jdk</type>
+              <tool>javac</tool>
+              <selected>0</selected>
+            </configuration>
+          </execution>
+          <execution>
+            <id>find-tool</id>
+            <phase>initialize</phase>
+            <goals>
+              <goal>find-tool</goal>
+            </goals>
+            <configuration>
+              <outputFile>target/tool.properties</outputFile>
+              <type>jdk</type>
+              <tool>javac</tool>
+            </configuration>
           </execution>
         </executions>
       </plugin>