[FIXED JENKINS-6795] Maven agent needs a fix for the 'hardcoded' socket...

[FIXED JENKINS-6795] Maven agent needs a fix for the 'hardcoded' socket connection to localhost, perhaps a fallback mechanism when it fails to connect through the loopback interface can solve this pesky issue?

maven-plugin/pom.xml

@@ -39,7 +39,7 @@ THE SOFTWARE.
   <url>http://wiki.jenkins-ci.org/display/JENKINS/Maven+2+Project+Plugin</url>
   
   <properties>
-    <mavenInterceptorsVersion>1.1</mavenInterceptorsVersion>
+    <mavenInterceptorsVersion>1.2</mavenInterceptorsVersion>
     <mavenVersion>3.0.3</mavenVersion>
     <maven.version>${mavenVersion}</maven.version>
     <aetherVersion>1.11</aetherVersion>

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

@@ -209,6 +209,9 @@ public abstract class AbstractMavenProcessFactory
 
             MavenConsoleAnnotator mca = new MavenConsoleAnnotator(out,charset);
 
+            if ( mavenRemoteUseInet ) {
+                envVars.put(MAVEN_REMOTE_USEINET_ENV_VAR_NAME , "true" );
+            }
             final ArgumentListBuilder cmdLine = buildMavenAgentCmdLine( listener,acceptor.getPort());
             String[] cmds = cmdLine.toCommandArray();
             final Proc proc = launcher.launch().cmds(cmds).envs(envVars).stdout(mca).pwd(workDir).start();
@@ -315,6 +318,10 @@ public abstract class AbstractMavenProcessFactory
     protected EnvVars getEnvVars() {
         return envVars;
     }
+
+    public static boolean mavenRemoteUseInet = Boolean.getBoolean("maven.remote.useinet");
+
+    public static final String MAVEN_REMOTE_USEINET_ENV_VAR_NAME = "MAVEN_REMOTE_USEINET";
     
     
 }

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

@@ -239,7 +239,6 @@ final class MavenProcessFactory extends AbstractMavenProcessFactory implements P
     }
     
     public static int socketTimeOut = Integer.parseInt( System.getProperty( "hudson.maven.socketTimeOut", Integer.toString( 30*1000 ) ) );
-       
 
     private static final Logger LOGGER = Logger.getLogger(MavenProcessFactory.class.getName());
 }