really fix use of env var in pols tru ${env.xxxx}

maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java

@@ -661,7 +661,7 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
      * Check for "-N" or "--non-recursive" in the Maven goals/options.
      */
     public boolean isNonRecursive() {
-	return checkMavenOption("-N", "--non-recursive");
+        return checkMavenOption("-N", "--non-recursive");
     }
 
     /**

maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java

@@ -43,9 +43,12 @@ import hudson.model.Computer;
 import hudson.model.Environment;
 import hudson.model.Fingerprint;
 import hudson.model.Hudson;
+import hudson.model.ParameterDefinition;
 import hudson.model.ParametersAction;
+import hudson.model.ParametersDefinitionProperty;
 import hudson.model.Result;
 import hudson.model.Run;
+import hudson.model.StringParameterDefinition;
 import hudson.model.TaskListener;
 import hudson.remoting.Channel;
 import hudson.remoting.VirtualChannel;
@@ -1009,6 +1012,15 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
             this.rootPOM = project.getRootPOM();
             this.profiles = project.getProfiles();
             this.properties = project.getMavenProperties();
+            ParametersDefinitionProperty parametersDefinitionProperty = project.getProperty( ParametersDefinitionProperty.class );
+            if (parametersDefinitionProperty != null && parametersDefinitionProperty.getParameterDefinitions() != null) {
+                for (ParameterDefinition parameterDefinition : parametersDefinitionProperty.getParameterDefinitions()) {
+                    // those must used as env var
+                    if (parameterDefinition instanceof StringParameterDefinition) {
+                        this.properties.put( "env." + parameterDefinition.getName(), ((StringParameterDefinition)parameterDefinition).getDefaultValue() );
+                    }
+                }
+            }
             this.nonRecursive = project.isNonRecursive();
             this.workspaceProper = project.getLastBuild().getWorkspace().getRemote();
             if (project.usesPrivateRepository()) {

test/src/test/java/hudson/maven/Maven3BuildTest.java

 package hudson.maven;
 
 import hudson.Launcher;
-import hudson.maven.MavenBuildTest.TestReporter;
 import hudson.model.BuildListener;
 import hudson.model.ParametersDefinitionProperty;
 import hudson.model.Result;

test/src/test/java/hudson/maven/MavenBuildTest.java

@@ -128,7 +128,7 @@ public class MavenBuildTest extends HudsonTestCase {
     }    
 
     @Email("https://groups.google.com/d/msg/hudson-users/Xhw00UopVN0/FA9YqDAIsSYJ")
-    public void testMavenVersionWithEnvVar() throws Exception {
+    public void testMavenWithDependencyVersionInEnvVar() throws Exception {
         
         MavenModuleSet m = createMavenProject();
         MavenInstallation mavenInstallation = configureDefaultMaven();